summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-09-25 03:00:48 +0000
committerNorbert Preining <norbert@preining.info>2019-09-25 03:00:48 +0000
commitd232e1107d60e7689e706bee9705f26745ae8b9e (patch)
treef9ac3303fdb36c2eca1872286615c0931d952476 /macros
parent94c2e367c3690be2a3c715b4577c81200652ad81 (diff)
CTAN sync 201909250300
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/acro/README4
-rw-r--r--macros/latex/contrib/acro/acro.sty280
-rw-r--r--macros/latex/contrib/acro/acro_en.pdfbin567835 -> 563627 bytes
-rw-r--r--macros/latex/contrib/acro/acro_en.tex57
-rw-r--r--macros/latex/contrib/chemformula/README4
-rw-r--r--macros/latex/contrib/chemformula/chemformula.sty8
-rw-r--r--macros/latex/contrib/chemformula/chemformula_en.pdfbin957854 -> 950273 bytes
-rw-r--r--macros/latex/contrib/chemformula/chemformula_en.tex7
-rw-r--r--macros/latex/contrib/chemmacros/README4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.history6
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.acid-base.code.tex11
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.all.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.base.code.tex8
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.charges.code.tex2
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.chemformula.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.errorcheck.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.greek.code.tex2
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.isotopes.code.tex2
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.lang.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.mechanisms.code.tex2
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.newman.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.nomenclature.code.tex56
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.orbital.code.tex2
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.particles.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.phases.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.polymers.code.tex28
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex93
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.redox.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.scheme.code.tex57
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.spectroscopy.code.tex15
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.symbols.code.tex2
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.thermodynamics.code.tex2
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.tikz.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.units.code.tex4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.xfrac.code.tex2
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.sty8
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros4.sty4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros5.sty6
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros_en.pdfbin1042240 -> 1037667 bytes
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros_en.tex17
-rw-r--r--macros/latex/contrib/practicalreports/README18
-rw-r--r--macros/latex/contrib/practicalreports/practicalreports.pdfbin0 -> 179978 bytes
-rw-r--r--macros/latex/contrib/practicalreports/practicalreports.sty161
-rw-r--r--macros/latex/contrib/practicalreports/practicalreports.tex325
-rw-r--r--macros/latex/contrib/pythontex/NEWS.rst51
-rw-r--r--macros/latex/contrib/pythontex/README9
-rw-r--r--macros/latex/contrib/pythontex/depythontex2.py2
-rw-r--r--macros/latex/contrib/pythontex/depythontex3.py2
-rw-r--r--macros/latex/contrib/pythontex/pythontex.dtx183
-rw-r--r--macros/latex/contrib/pythontex/pythontex.ins4
-rw-r--r--macros/latex/contrib/pythontex/pythontex.pdfbin969134 -> 975950 bytes
-rw-r--r--macros/latex/contrib/pythontex/pythontex2.py157
-rw-r--r--macros/latex/contrib/pythontex/pythontex3.py157
-rw-r--r--macros/latex/contrib/pythontex/pythontex_engines.py235
-rw-r--r--macros/texinfo/latest/texi2dvi156
-rw-r--r--macros/texinfo/latest/texinfo.tex899
-rw-r--r--macros/texinfo/texinfo/ABOUT-NLS1380
-rw-r--r--macros/texinfo/texinfo/ChangeLog1685
-rw-r--r--macros/texinfo/texinfo/Makefile.in27
-rw-r--r--macros/texinfo/texinfo/NEWS38
-rw-r--r--macros/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/README-hacking13
-rw-r--r--macros/texinfo/texinfo/aclocal.m46
-rw-r--r--macros/texinfo/texinfo/build-aux/texinfo.tex1584
-rw-r--r--macros/texinfo/texinfo/config.in139
-rw-r--r--macros/texinfo/texinfo/configure1718
-rw-r--r--macros/texinfo/texinfo/configure.ac40
-rw-r--r--macros/texinfo/texinfo/doc/Makefile.am2
-rw-r--r--macros/texinfo/texinfo/doc/Makefile.in23
-rw-r--r--macros/texinfo/texinfo/doc/info-stnd.texi13
-rw-r--r--macros/texinfo/texinfo/doc/refcard/txirefcard.tex2
-rw-r--r--macros/texinfo/texinfo/doc/short-sample-ja.texi4
-rw-r--r--macros/texinfo/texinfo/doc/stamp-18
-rw-r--r--macros/texinfo/texinfo/doc/stamp-vti8
-rw-r--r--macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs224
-rw-r--r--macros/texinfo/texinfo/doc/texinfo-tex-test.texi1602
-rw-r--r--macros/texinfo/texinfo/doc/texinfo.tex899
-rw-r--r--macros/texinfo/texinfo/doc/texinfo.texi635
-rw-r--r--macros/texinfo/texinfo/doc/tp_api/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi8
-rw-r--r--macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi4
-rw-r--r--macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi11
-rw-r--r--macros/texinfo/texinfo/doc/txi-ja.tex22
-rw-r--r--macros/texinfo/texinfo/doc/version-stnd.texi8
-rw-r--r--macros/texinfo/texinfo/doc/version.texi8
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/Makefile.am57
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/Makefile.in58
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/_Noreturn.h25
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/alloca.in.h6
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/cdefs.h2
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/error.c2
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/getprogname.c11
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/gettext.h13
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/glthread/lock.c717
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/glthread/lock.h401
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/intprops.h167
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/localcharset.c188
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/mbrtowc.c442
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/mbsstr.c1
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/memchr.valgrind16
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/msvc-inval.h4
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/nl_langinfo.c10
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/regcomp.c20
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/regexec.c22
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/stdio.in.h7
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/stdlib.in.h95
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/str-two-way.h2
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/unistd.in.h48
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/vasnprintf.c11
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/verify.h99
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/wcrtomb.c15
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-initguard.h35
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-mutex.c95
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-mutex.h51
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-once.c62
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-once.h47
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-recmutex.c127
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-recmutex.h57
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-rwlock.c373
-rw-r--r--macros/texinfo/texinfo/gnulib/lib/windows-rwlock.h68
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/alloca.m49
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/gettext.m468
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/gnulib-common.m438
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/gnulib-comp.m488
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/intlmacosx.m426
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/malloc.m417
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/mbtowc.m411
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/memchr.m423
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/nls.m42
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/po.m459
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/printf.m4210
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/progtest.m42
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/stdlib_h.m415
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/strerror.m46
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/sys_socket_h.m428
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/threadlib.m4184
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/unistd_h.m44
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/wcrtomb.m445
-rw-r--r--macros/texinfo/texinfo/gnulib/m4/wcwidth.m418
-rw-r--r--macros/texinfo/texinfo/info/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/info/dribble.c6
-rw-r--r--macros/texinfo/texinfo/info/pcterm.c2
-rw-r--r--macros/texinfo/texinfo/info/session.c15
-rw-r--r--macros/texinfo/texinfo/info/signals.c50
-rw-r--r--macros/texinfo/texinfo/info/t/Init-test.inc3
-rw-r--r--macros/texinfo/texinfo/info/t/adjust-anchors.sh6
-rw-r--r--macros/texinfo/texinfo/info/t/all-only.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/anchor-positions.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/body-start.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/c-u-m-x-scroll-forward.sh6
-rw-r--r--macros/texinfo/texinfo/info/t/close-window-after-search.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/dir-3-menus.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-dangling-entry.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-entry-to-subdir.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/dir-file-index.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-file-menu.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-file-no-menu.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-file-node.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-file-sloppily.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-file.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-menus-sloppily.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-merge.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/dir-no-file.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir-nondir.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/dir.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/echo-area-no-completions.sh6
-rw-r--r--macros/texinfo/texinfo/info/t/empty-infopath.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/empty.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/end-of-line.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/file-file-with-dot.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/file-index-colons.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/file-index.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/file-node-with-dot.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/file-node.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/file-nodes.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/file-relative-path.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/file.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/gc-split.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/goal-column.sh8
-rw-r--r--macros/texinfo/texinfo/info/t/goto-quoted.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/help.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/inc-sea-bs.sh8
-rw-r--r--macros/texinfo/texinfo/info/t/inc-sea-forward-nonregex.sh6
-rw-r--r--macros/texinfo/texinfo/info/t/inc-sea-forward.sh6
-rw-r--r--macros/texinfo/texinfo/info/t/inc-sea-history.sh8
-rw-r--r--macros/texinfo/texinfo/info/t/inc-sea-insensitive.sh6
-rw-r--r--macros/texinfo/texinfo/info/t/index-apropos.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/index-completing.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/index-long-nodeline.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/index-search.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/index.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info15
-rw-r--r--macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info-18
-rw-r--r--macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info-2bin778 -> 0 bytes
-rw-r--r--macros/texinfo/texinfo/info/t/last-no-history.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/last-node-not-top-level.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/malformed-split.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/menu-sequence.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/multiple-completions.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/next-quoted.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/no-file.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/no-index.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/node-no-file.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/quoted-label-and-target.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/quoted-label-as-target.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/quoted-manual-in-label.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/quoted-manual-in-target.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/quoted-target.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/relative-path.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/relative-reference.sh6
-rw-r--r--macros/texinfo/texinfo/info/t/replace-viewed.sh6
-rw-r--r--macros/texinfo/texinfo/info/t/resize-in-completions.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/search-after-tag.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/search-empty.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/search-skip-screen.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/search-split-after-index.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/spec-file-node.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/spec-menu.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/spec-no-node.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/split-file-menu.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/split-footnotes.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/split-index.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/split.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/star-note-non-whitespace.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/tab-argument.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/tab-no-xref.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/tab-skip-node.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/tab.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/where-dir-file.sh2
-rw-r--r--macros/texinfo/texinfo/info/t/window-split-dir.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/xref-across-lines-2.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/xref-across-lines.sh4
-rw-r--r--macros/texinfo/texinfo/info/t/xref-to-anchor.sh6
-rw-r--r--macros/texinfo/texinfo/info/termdep.h29
-rw-r--r--macros/texinfo/texinfo/info/terminal.c159
-rw-r--r--macros/texinfo/texinfo/install-info/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/install-info/install-info.c18
-rw-r--r--macros/texinfo/texinfo/install-info/tests/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/man/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/man/info.14
-rw-r--r--macros/texinfo/texinfo/man/install-info.14
-rw-r--r--macros/texinfo/texinfo/man/makeinfo.14
-rw-r--r--macros/texinfo/texinfo/man/texi2dvi.19
-rw-r--r--macros/texinfo/texinfo/man/texindex.18
-rw-r--r--macros/texinfo/texinfo/po/ChangeLog9
-rw-r--r--macros/texinfo/texinfo/po/LINGUAS1
-rw-r--r--macros/texinfo/texinfo/po/Makefile.in.in124
-rw-r--r--macros/texinfo/texinfo/po/Makevars5
-rw-r--r--macros/texinfo/texinfo/po/POTFILES.in24
-rw-r--r--macros/texinfo/texinfo/po/Rules-quot6
-rw-r--r--macros/texinfo/texinfo/po/ca.gmobin84108 -> 83296 bytes
-rw-r--r--macros/texinfo/texinfo/po/ca.po1309
-rw-r--r--macros/texinfo/texinfo/po/cs.gmobin94044 -> 97628 bytes
-rw-r--r--macros/texinfo/texinfo/po/cs.po1135
-rw-r--r--macros/texinfo/texinfo/po/da.gmobin88888 -> 88030 bytes
-rw-r--r--macros/texinfo/texinfo/po/da.po1202
-rw-r--r--macros/texinfo/texinfo/po/de.gmobin81438 -> 80664 bytes
-rw-r--r--macros/texinfo/texinfo/po/de.po1347
-rw-r--r--macros/texinfo/texinfo/po/de_AT.gmobin408 -> 0 bytes
-rw-r--r--macros/texinfo/texinfo/po/de_AT.po3261
-rw-r--r--macros/texinfo/texinfo/po/el.gmobin7977 -> 7936 bytes
-rw-r--r--macros/texinfo/texinfo/po/el.po1116
-rw-r--r--macros/texinfo/texinfo/po/en@boldquot.header2
-rw-r--r--macros/texinfo/texinfo/po/en@quot.header2
-rw-r--r--macros/texinfo/texinfo/po/eo.gmobin85465 -> 84749 bytes
-rw-r--r--macros/texinfo/texinfo/po/eo.po1239
-rw-r--r--macros/texinfo/texinfo/po/es.gmobin100167 -> 103817 bytes
-rw-r--r--macros/texinfo/texinfo/po/es.po1138
-rw-r--r--macros/texinfo/texinfo/po/fi.gmobin24393 -> 33201 bytes
-rw-r--r--macros/texinfo/texinfo/po/fi.po1304
-rw-r--r--macros/texinfo/texinfo/po/fr.gmobin95636 -> 99246 bytes
-rw-r--r--macros/texinfo/texinfo/po/fr.po1112
-rw-r--r--macros/texinfo/texinfo/po/he.gmobin17822 -> 17781 bytes
-rw-r--r--macros/texinfo/texinfo/po/he.po1596
-rw-r--r--macros/texinfo/texinfo/po/hr.gmobin91102 -> 90176 bytes
-rw-r--r--macros/texinfo/texinfo/po/hr.po1204
-rw-r--r--macros/texinfo/texinfo/po/hu.gmobin19326 -> 19285 bytes
-rw-r--r--macros/texinfo/texinfo/po/hu.po1511
-rw-r--r--macros/texinfo/texinfo/po/id.gmobin62441 -> 61722 bytes
-rw-r--r--macros/texinfo/texinfo/po/id.po1526
-rw-r--r--macros/texinfo/texinfo/po/insert-header.sin5
-rw-r--r--macros/texinfo/texinfo/po/it.gmobin64949 -> 64181 bytes
-rw-r--r--macros/texinfo/texinfo/po/it.po1526
-rw-r--r--macros/texinfo/texinfo/po/ja.gmobin37021 -> 36980 bytes
-rw-r--r--macros/texinfo/texinfo/po/ja.po1400
-rw-r--r--macros/texinfo/texinfo/po/nb.gmobin66274 -> 66042 bytes
-rw-r--r--macros/texinfo/texinfo/po/nb.po1275
-rw-r--r--macros/texinfo/texinfo/po/nl.gmobin90319 -> 93970 bytes
-rw-r--r--macros/texinfo/texinfo/po/nl.po1141
-rw-r--r--macros/texinfo/texinfo/po/pl.gmobin92384 -> 95925 bytes
-rw-r--r--macros/texinfo/texinfo/po/pl.po1107
-rw-r--r--macros/texinfo/texinfo/po/pt.gmobin89804 -> 93320 bytes
-rw-r--r--macros/texinfo/texinfo/po/pt.po1140
-rw-r--r--macros/texinfo/texinfo/po/pt_BR.gmobin88570 -> 87859 bytes
-rw-r--r--macros/texinfo/texinfo/po/pt_BR.po1211
-rw-r--r--macros/texinfo/texinfo/po/remove-potcdate.sin8
-rw-r--r--macros/texinfo/texinfo/po/ro.gmobin20429 -> 20388 bytes
-rw-r--r--macros/texinfo/texinfo/po/ro.po1640
-rw-r--r--macros/texinfo/texinfo/po/ru.gmobin115124 -> 119596 bytes
-rw-r--r--macros/texinfo/texinfo/po/ru.po1138
-rw-r--r--macros/texinfo/texinfo/po/rw.gmobin515 -> 474 bytes
-rw-r--r--macros/texinfo/texinfo/po/rw.po1176
-rw-r--r--macros/texinfo/texinfo/po/sl.gmobin28130 -> 28089 bytes
-rw-r--r--macros/texinfo/texinfo/po/sl.po1703
-rw-r--r--macros/texinfo/texinfo/po/sv.gmobin90291 -> 94134 bytes
-rw-r--r--macros/texinfo/texinfo/po/sv.po1229
-rw-r--r--macros/texinfo/texinfo/po/texinfo.pot1102
-rw-r--r--macros/texinfo/texinfo/po/tr.gmobin91113 -> 94648 bytes
-rw-r--r--macros/texinfo/texinfo/po/tr.po1142
-rw-r--r--macros/texinfo/texinfo/po/uk.gmobin115806 -> 120149 bytes
-rw-r--r--macros/texinfo/texinfo/po/uk.po1148
-rw-r--r--macros/texinfo/texinfo/po/vi.gmobin99614 -> 98792 bytes
-rw-r--r--macros/texinfo/texinfo/po/vi.po1210
-rw-r--r--macros/texinfo/texinfo/po/zh_CN.gmobin27677 -> 27636 bytes
-rw-r--r--macros/texinfo/texinfo/po/zh_CN.po1625
-rw-r--r--macros/texinfo/texinfo/po/zh_TW.gmobin14366 -> 14325 bytes
-rw-r--r--macros/texinfo/texinfo/po/zh_TW.po1410
-rw-r--r--macros/texinfo/texinfo/po_document/ChangeLog9
-rw-r--r--macros/texinfo/texinfo/po_document/LINGUAS3
-rw-r--r--macros/texinfo/texinfo/po_document/Makefile.in.in124
-rw-r--r--macros/texinfo/texinfo/po_document/Rules-quot6
-rw-r--r--macros/texinfo/texinfo/po_document/ca.gmobin12696 -> 12655 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/ca.po416
-rw-r--r--macros/texinfo/texinfo/po_document/ca.us-ascii.gmobin14717 -> 14676 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/ca.us-ascii.po396
-rw-r--r--macros/texinfo/texinfo/po_document/cs.gmobin14988 -> 14947 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/cs.po396
-rw-r--r--macros/texinfo/texinfo/po_document/da.gmobin457 -> 0 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/da.po3248
-rw-r--r--macros/texinfo/texinfo/po_document/de.gmobin12720 -> 12679 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/de.po416
-rw-r--r--macros/texinfo/texinfo/po_document/de.us-ascii.gmobin14753 -> 14712 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/de.us-ascii.po396
-rw-r--r--macros/texinfo/texinfo/po_document/el.gmobin464 -> 0 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/el.po1113
-rw-r--r--macros/texinfo/texinfo/po_document/en@boldquot.header2
-rw-r--r--macros/texinfo/texinfo/po_document/en@quot.header2
-rw-r--r--macros/texinfo/texinfo/po_document/eo.gmobin14701 -> 14660 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/eo.po396
-rw-r--r--macros/texinfo/texinfo/po_document/es.gmobin14841 -> 14800 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/es.po396
-rw-r--r--macros/texinfo/texinfo/po_document/fr.gmobin15025 -> 14984 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/fr.po396
-rw-r--r--macros/texinfo/texinfo/po_document/hr.gmobin15031 -> 14990 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/hr.po396
-rw-r--r--macros/texinfo/texinfo/po_document/hu.gmobin15168 -> 15127 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/hu.po396
-rw-r--r--macros/texinfo/texinfo/po_document/insert-header.sin5
-rw-r--r--macros/texinfo/texinfo/po_document/it.gmobin14840 -> 14799 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/it.po396
-rw-r--r--macros/texinfo/texinfo/po_document/nl.gmobin12653 -> 12612 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/nl.po414
-rw-r--r--macros/texinfo/texinfo/po_document/no.us-ascii.gmobin1092 -> 1051 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/no.us-ascii.po396
-rw-r--r--macros/texinfo/texinfo/po_document/pl.gmobin14845 -> 14804 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/pl.po396
-rw-r--r--macros/texinfo/texinfo/po_document/pt.gmobin14789 -> 14748 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/pt.po396
-rw-r--r--macros/texinfo/texinfo/po_document/pt.us-ascii.gmobin8589 -> 8548 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/pt.us-ascii.po396
-rw-r--r--macros/texinfo/texinfo/po_document/pt_BR.gmobin12988 -> 12947 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/pt_BR.po420
-rw-r--r--macros/texinfo/texinfo/po_document/pt_BR.us-ascii.gmobin9642 -> 9601 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/pt_BR.us-ascii.po396
-rw-r--r--macros/texinfo/texinfo/po_document/remove-potcdate.sin8
-rw-r--r--macros/texinfo/texinfo/po_document/sv.gmobin0 -> 14594 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/sv.po905
-rw-r--r--macros/texinfo/texinfo/po_document/texinfo_document.pot398
-rw-r--r--macros/texinfo/texinfo/po_document/uk.gmobin16303 -> 16262 bytes
-rw-r--r--macros/texinfo/texinfo/po_document/uk.po396
-rw-r--r--macros/texinfo/texinfo/system.h25
-rw-r--r--macros/texinfo/texinfo/texindex/ChangeLog105
-rw-r--r--macros/texinfo/texinfo/texindex/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/texindex/jrtangle24
-rw-r--r--macros/texinfo/texinfo/texindex/jrweave34
-rw-r--r--macros/texinfo/texinfo/texindex/texindex.awk856
-rw-r--r--macros/texinfo/texinfo/texindex/ti.twjr1940
-rw-r--r--macros/texinfo/texinfo/tp/Makefile.am8
-rw-r--r--macros/texinfo/texinfo/tp/Makefile.docstr29
-rw-r--r--macros/texinfo/texinfo/tp/Makefile.in63
-rw-r--r--macros/texinfo/texinfo/tp/Makefile.tres10
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Common.pm157
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm169
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm35
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm484
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/IXIN.pm6
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/IXINSXML.pm2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/Info.pm8
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm74
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/Texinfo.pm2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoSXML.pm2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoXML.pm2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/Text.pm8
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm36
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Documentlanguages.pm12
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/MiscXS.pm2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/ModulePath.pm.in75
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/ParserNonXS.pm185
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Report.pm4
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/Structuring.pm53
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.am12
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.in50
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/MiscXS.c2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.c12
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.xs5
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.c94
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.xs6
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/aclocal.m4497
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/compile13
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/config.guess679
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/config.in59
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/config.sub304
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/configure3467
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/configure.ac1
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/depcomp10
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.am2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.in26
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/alloca.in.h6
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/memchr.valgrind16
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/rawmemchr.valgrind16
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/stdio.in.h7
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/strchrnul.valgrind16
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/vasnprintf.c11
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/verify.h99
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/alloca.m49
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getdelim.m440
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getline.m438
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gettext.m4420
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gnulib-common.m438
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/libtool.m428
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/memchr.m423
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/nls.m432
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/po.m4453
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/printf.m4210
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/progtest.m491
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/install-sh47
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/ltmain.sh39
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/missing16
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parser-5556.pm2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.c178
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.pm58
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.xs7
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.c67
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.h2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.c3
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.txt24
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_ids.h3
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/end_line.c2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/errors.c4
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/handle_commands.c38
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/input.c37
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/parser.c25
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/separator.c16
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/xspara.c19
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XS/xspara.h2
-rw-r--r--macros/texinfo/texinfo/tp/Texinfo/XSLoader.pm8
-rw-r--r--macros/texinfo/texinfo/tp/init/chm.pm16
-rw-r--r--macros/texinfo/texinfo/tp/init/latex2html.pm48
-rw-r--r--macros/texinfo/texinfo/tp/init/tex4ht.pm43
-rw-r--r--macros/texinfo/texinfo/tp/maintain/language-subtag-registry216
-rw-r--r--macros/texinfo/texinfo/tp/t/09indices.t32
-rw-r--r--macros/texinfo/texinfo/tp/t/18itemize.t16
-rw-r--r--macros/texinfo/texinfo/tp/t/30sectioning.t21
-rw-r--r--macros/texinfo/texinfo/tp/t/92formatting.t7
-rw-r--r--macros/texinfo/texinfo/tp/t/converters_tests.t31
-rw-r--r--macros/texinfo/texinfo/tp/t/init/t2h_singular.init29
-rw-r--r--macros/texinfo/texinfo/tp/t/input_files/test_refs.texi2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/accent.pl88
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/accent_with_text.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_enable_encoding.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_no_entity.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_raw.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl2655
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl2080
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html91
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html61
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.infobin7906 -> 7998 bytes
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl2080
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html91
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html61
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.infobin8302 -> 8394 bytes
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html29
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html29
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html13
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/empty_accent.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number_separate.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/image_extension.pl8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl103
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/image_with_spaces.plbin6563 -> 6706 bytes
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/index_entry_in_preformatted.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html11
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/index.html17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl58
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref_keep_top.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/commands.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl52
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl37
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/def/all_commands_printindex.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/def/ref_in_def.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/docbook_tests/special_docbook_unnumbered.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/anchor_in_caption.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/comment_space_comand_in_float.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/complex_float.pl32
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/float_copying.pl35
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/float_with_at_commands.pl6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption_and_error.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl22
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/cond.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/cond_info.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/cond_xml.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split/res_info/direntry_dircategory.info5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info/res_info/documentlanguage_set.info5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_unknown.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/float_copying.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html22
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/index.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_date_in_header.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html47
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info/res_info/truc.info13
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying/res_info/split-nocopying.info5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split/res_info/split-nocopying.info5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/texi_bib_example.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/texi_cond.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/texi_glossary.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/unknown_nodes_renamed.pl128
-rw-r--r--macros/texinfo/texinfo/tp/t/results/formatting/unknown_nodes_renamed/res_html/unknown_nodes_renamed.html43
-rw-r--r--macros/texinfo/texinfo/tp/t/results/heading/heading_in_copying.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/check_htmlxref.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/commands_in_alt.pl6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/html_in_copying.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/image_link_prefix.pl3
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/index_and_node_same_name.pl3
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels.pl27
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/index.html5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/ref_in_preformatted.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/simple_menu.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/titles.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/html_tests/xml_protected_in_verb.pl1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/include/cpp_lines.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/include/include_with_setfilename.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl13
-rw-r--r--macros/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/include/value_expansion_in_include.pl15
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/complex_recursive_synindex.pl15
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/def_existing_index.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/def_syn_indices.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/double_index_entry.pl24
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/double_syncodeindex.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/empty_cindex_entry.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/empty_string_index_entry.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii/res_html/index.html1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1/res_html/index.html1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8/res_html/index.html1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html1
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/explicit_sort_key.pl111
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/ftable_vtable.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/image_lines_count.pl24
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/image_text_lines_count.pl24
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/index_entries_locations.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_first_node.plbin9535 -> 9323 bytes
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_node.pl24
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote.pl22
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl26
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl24
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/print_merged_index.pl15
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl25
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl25
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/printindex_with_space_before.plbin9103 -> 8893 bytes
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/same_index_entry_merged_indices.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/seeentry.pl339
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/subentries.pl676
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/subentry_and_sortas.pl475
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/syncode_index_print_both.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/indices/syncodeindex_to_plain.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/anchor_and_spaces.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/anchor_in_command.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/before_node_and_section.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/center_flush.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/def_in_copying.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/error_in_footnote.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/file_only_png.plbin6945 -> 6887 bytes
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/float_long_captions.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/image_and_punctuation.pl41
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/image_and_spaces_formatting.pl117
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/image_extension.pl29
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/image_in_paragraph.plbin6718 -> 6528 bytes
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/image_not_found.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/image_quotes.plbin5488 -> 5302 bytes
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/index_entry_at_end_node.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_no_warning.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_warning.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/known_encoding.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/multiline_image_and_align.pl69
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/nested_footnotes_separate.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/no_node_but_top.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/no_nodes.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/no_top_node.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong_end_of_line.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/novalidate_empty_refs.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_and_preamble.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_asis_first.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_none_first.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/pxref_test.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/ref_tests.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/space_at_menu_end.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/space_in_menu.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/space_in_setfilename.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/split_no_copying.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node/res_info/split_test_before_first_node.info5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line/res_info/split_test_before_first_node.info5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/test_index.pl29
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/text_before_node.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/top_node_normalization.pl28
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/unknown_encoding.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/info_tests/xref_test.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/footnote_in_ref.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/ignore_in_xref.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/in_table.pl15
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/menu_in_style_command.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/quotation_in_ref.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_anchor.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_ref.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/invalid_nestings/verbatim_in_ref.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/itemize/table_in_itemize.pl476
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/appendix_translated.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/command_translated.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/multiple.pl25
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html3
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters_texi2html.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/simple.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/unknown_language.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/languages/unknown_region.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_toc.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_abt.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_toc.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_toc.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl15
-rw-r--r--macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl84
-rw-r--r--macros/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/misc_commands/footnote_in_center.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/misc_commands/ref_in_center.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/misc_commands/setfilename.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl35
-rw-r--r--macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl43
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter.html16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index.html44
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split.pl41
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/first.html70
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index_split_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/second-chapter.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes.pl41
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/first.html62
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index.html76
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html76
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html60
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html58
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html56
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/index.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html48
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html28
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html38
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html56
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html20
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/first.html16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/index.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes_no_node.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/more_sections_than_nodes.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html26
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/node_footnote_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html48
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/index.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_explicit.pl8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_implicit.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/multitable/ref_in_multitable.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/paragraph/image_in_paragraph.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/paragraph/paragraph_command.pl6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl32
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl4
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/raw/verbatim_and_verbatiminclude.pl3
-rw-r--r--macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage_titlepage.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage_titlepage.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/regions/ref_in_copying.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/regions/today_in_copying.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote_separate.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/anchor_zero.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_node.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl37
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl31
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html10
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_document_begin.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document_after_node.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/contents_in_document.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/contents_no_section.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/contents_with_only_top_node.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/double_part.pl31
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/double_top.pl7
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/empty_ref_arg.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/empty_top_node_up.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_labels.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_nodes.pl9
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/explicit_node_directions.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/internal_top_node_up.pl30
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/lone_Top_node.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/loop_nodes.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/lowered_subsubsection.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/next_in_menu_is_below.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/next_no_prev_to_node.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/no_element.pl2
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/no_menu.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/node_nested_parentheses.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/node_too_much_args.pl8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/node_up_external_node.pl29
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl34
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl43
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl44
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_url.pl22
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/one_subsection_and_node.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_node_after_top.pl74
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl74
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl36
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_element.pl7
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_node.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/protected_node_parentheses.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/rec_nodes.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/ref_to_top.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl23
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl16
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/section_chapter_before_top_nodes.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_info.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/section_node_before_part.pl19
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/semi_auto.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/space_in_node.pl21
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_node.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_top_node.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/top_node_no_menu_direction.pl30
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/top_node_part_top.pl46
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/top_node_up_url.pl31
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_nodes.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_sections.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl27
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html7
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_at_the_end.pl29
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl31
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/unknown_node_in_menu.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_node_top_top.pl44
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_top_node.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl5
-rw-r--r--macros/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl17
-rw-r--r--macros/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl12
-rw-r--r--macros/texinfo/texinfo/tp/t/results/value/value_in_node.pl8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/value/value_node_directions.pl8
-rw-r--r--macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl18
-rw-r--r--macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl6
-rw-r--r--macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl85
-rw-r--r--macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl14
-rw-r--r--macros/texinfo/texinfo/tp/t/test_sort.t9
-rw-r--r--macros/texinfo/texinfo/tp/t/test_utils.pl30
-rw-r--r--macros/texinfo/texinfo/tp/tests/Makefile.am28
-rw-r--r--macros/texinfo/texinfo/tp/tests/Makefile.in83
-rw-r--r--macros/texinfo/texinfo/tp/tests/Makefile.onetst1
-rw-r--r--macros/texinfo/texinfo/tp/tests/README16
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_begin_info/contents_at_begin.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_end_info/contents_at_end.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_chapter_info/contents_in_middle_chapter.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_section_info/contents_in_middle_section.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/chapter.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_info/double_contents.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html10
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html10
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html22
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/double_contents_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/index.html10
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/section.html16
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/chapter.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/section.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/chapter.html20
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/section.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/formatting/Makefile.am2
-rw-r--r--macros/texinfo/texinfo/tp/tests/formatting/Makefile.in22
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html2
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_info/index_entry_in_footnote.infobin635 -> 674 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_separated_info/index_entry_in_footnote.infobin718 -> 757 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes/index_nodes.html6
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html40
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/another.html10
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/first.html22
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index.html40
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index_nodes_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/second.html20
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Chapter.html26
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html36
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index.html10
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Chapter.html34
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html36
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html16
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html20
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html24
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html24
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html28
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html20
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html24
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index.html6
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_abt.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html24
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html28
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_toc.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/indices-refs.html22
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html22
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-printindex.html26
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html38
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html30
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html2
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html2
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_and_node_same_name/index_and_node_same_name.infobin632 -> 671 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote/index_entry_in_footnote.infobin635 -> 674 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_info/index_entry_in_footnote.infobin635 -> 674 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_separated_info/index_entry_in_footnote.infobin718 -> 757 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_no_node_no_top/index_no_node_no_top.infobin6598 -> 6637 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes/index_nodesbin4122 -> 4161 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes_nodes/index_nodesbin4122 -> 4161 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_one_node/one_nodebin482 -> 521 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region/index_special_region.infobin2576 -> 2615 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html36
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/index.html15
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying/index_special_region-no_insertcopying.infobin1607 -> 1646 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html24
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html11
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region/index_special_region-no_section.infobin1582 -> 1621 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html24
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html11
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_table/index_table.infobin21223 -> 21262 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html2
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html2
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_node_section/printindex_between_node_section.infobin1761 -> 1800 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_part_chapter/printindex_between_part_chapter.infobin1785 -> 1824 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html28
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html2
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html380
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html90
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html22
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html392
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html52
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html18
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html28
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html28
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html28
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html16
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html400
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html30
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html20
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html78
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html20
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html18
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html16
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html400
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html8
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html30
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html12
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html20
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html78
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html20
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html18
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt782
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html34
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html28
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml2
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html14
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html4
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html2
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html6
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html2
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.am4
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.in24
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh11
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm35
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex.html53
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm33
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex.html80
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html44
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex95
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.22
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.html36
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex2
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h_images.tex99
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh10
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex.html43
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html50
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.aux0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.cp0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.fn0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.html16
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.ky0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.pg0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tp0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.vr0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_t4ht.23
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.aux0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.cp0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.fn0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.html25
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.ky0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.pg0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.texi2
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tp0
-rw-r--r--macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.vr0
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_cartouche/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_deffn/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_enumerate/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_example/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_group/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_itemize/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_menu/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_multitable/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_quotation/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_table/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.info5
-rw-r--r--macros/texinfo/texinfo/tp/tests/reference/stdout.txt2
-rw-r--r--macros/texinfo/texinfo/tp/tests/reference/stdout_split.txt3
-rw-r--r--macros/texinfo/texinfo/tp/tests/run_parser_all.sh25
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/Makefile.am4
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/Makefile.in24
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/equivalent_nodes.texi27
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/list-of-tests1
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/renamednodes.cnf-ref10
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/a-node-beginning-with-_0040c.html40
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.10
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.213
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html65
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/old-node.html40
-rw-r--r--macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/old-strong-node.html40
-rw-r--r--macros/texinfo/texinfo/tp/tests/t/stdout.sh14
-rw-r--r--macros/texinfo/texinfo/tp/tests/t/stdout_split.sh14
-rw-r--r--macros/texinfo/texinfo/tp/tests/test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh24
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/Makefile.in20
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/list-of-tests2
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.224
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html56
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL_l2h.html11
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html41
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html80
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html485
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/formatting.229
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm784
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html41
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html82
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm17
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm51
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm65
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html28
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex93
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm55
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm63
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html81
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html75
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html75
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/anchor.html643
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/chapter.html722
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/chapter2.html1029
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/formatting.1192
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/formatting.2219
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/index.htm3405
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/index.html643
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/s_002d_002dect_002cion.html721
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_abt.htm798
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_fot.htm703
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_ovr.htm695
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_math.log183
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_math.texi77
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.4ct2
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.4tc1
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.css42
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.dvibin0 -> 6880 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.html62
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.idvbin0 -> 905 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.lg55
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.log187
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.tex16
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.tmp2
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.xref1
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex0x.pngbin0 -> 939 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex1x.pngbin0 -> 939 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex2x.pngbin0 -> 939 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex3x.pngbin0 -> 939 bytes
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_toc.htm706
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsection.html716
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsubsection-_0060_0060simple_002ddouble_002d_002d.html708
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html708
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed-l2h_cache.pm13
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.25
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html36
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.html38
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.tex20
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h_images.tex134
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h_labels.pl13
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/simplest_httex/simplest.html27
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm35
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.22
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.html53
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.html36
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.tex2
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex99
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html24
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html24
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html11
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html50
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.aux0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.cp0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.fn0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html16
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.ky0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.pg0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tp0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.vr0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm33
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html80
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html44
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex95
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex.html43
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.aux0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.cp0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.fn0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.html25
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.ky0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.pg0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.texi2
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tp0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.vr0
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm14
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html69
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html25
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex89
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html27
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed_l2h.html11
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.22
-rw-r--r--macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.html28
-rw-r--r--macros/texinfo/texinfo/tp/texi2any.pl65
-rw-r--r--macros/texinfo/texinfo/util/Makefile.am2
-rw-r--r--macros/texinfo/texinfo/util/Makefile.in22
-rw-r--r--macros/texinfo/texinfo/util/README3
-rw-r--r--macros/texinfo/texinfo/util/htmlxref.cnf10
-rw-r--r--macros/texinfo/texinfo/util/pdftexi2dvi2
-rw-r--r--macros/texinfo/texinfo/util/texi2dvi156
-rw-r--r--macros/texinfo/texinfo/util/texi2html28
-rw-r--r--macros/texinfo/texinfo/util/texi2pdf2
1483 files changed, 75948 insertions, 53657 deletions
diff --git a/macros/latex/contrib/acro/README b/macros/latex/contrib/acro/README
index 89f9d59cdf..c9a69ddaee 100644
--- a/macros/latex/contrib/acro/README
+++ b/macros/latex/contrib/acro/README
@@ -1,9 +1,9 @@
--------------------------------------------------------------------------
-the ACRO package v2.9
+the ACRO package v2.10
Typeset Acronyms
-2019/02/17
+2019/09/23
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/acro
diff --git a/macros/latex/contrib/acro/acro.sty b/macros/latex/contrib/acro/acro.sty
index 21f721615e..2b5cde75b3 100644
--- a/macros/latex/contrib/acro/acro.sty
+++ b/macros/latex/contrib/acro/acro.sty
@@ -31,8 +31,8 @@
\RequirePackage{expl3,xparse,l3keys2e,xtemplate,etoolbox}
\ProvidesExplPackage
{acro}
- {2019/02/17}
- {2.9}
+ {2019/09/23}
+ {2.10}
{Typeset Acronyms}
% --------------------------------------------------------------------------
@@ -310,11 +310,13 @@
\bool_new:N \l__acro_hyperref_loaded_bool
\bool_new:N \l__acro_use_hyperref_bool
\bool_new:N \l__acro_xspace_bool
-\bool_new:N \l__acro_custom_format_bool
+\bool_new:N \l__acro_custom_short_format_bool
+\bool_new:N \l__acro_custom_alt_format_bool
\bool_new:N \l__acro_custom_long_format_bool
\bool_new:N \l__acro_strict_bool
\bool_new:N \l__acro_create_macros_bool
\bool_new:N \l__acro_first_upper_bool
+\bool_new:N \l__acro_upper_short_bool
\bool_new:N \l__acro_indefinite_bool
\bool_new:N \l__acro_upper_indefinite_bool
\bool_new:N \l__acro_foreign_bool
@@ -377,7 +379,7 @@
\tl_new:N \l__acro_list_name_tl
\tl_new:N \l__acro_list_before_tl
\tl_new:N \l__acro_list_after_tl
-\tl_new:N \l__acro_custom_format_tl
+\tl_new:N \l__acro_custom_short_format_tl
\tl_new:N \l__acro_first_between_tl
\tl_new:N \l__acro_citation_connect_tl
\tl_new:N \l__acro_between_group_connect_citation_tl
@@ -470,6 +472,8 @@
\tl_set_eq:NN \l__acro_alt_format_tl \l__acro_short_format_tl
\tl_set:Nn \l__acro_list_short_format_tl {#1} ,
short-format .value_required:n = true ,
+ alt-format .code:n =
+ \tl_set:Nn \l__acro_alt_format_tl {#1} ,
long-format .code:n =
\tl_set:Nn \l__acro_long_format_tl {#1}
\tl_set:Nn \l__acro_first_long_format_tl {#1}
@@ -574,7 +578,9 @@
index-cmd .value_required:n = true ,
uc-cmd .code:n =
\cs_set_eq:NN \__acro_first_upper_case:n #1 ,
- uc-cmd .value_required:n = true
+ uc-cmd .value_required:n = true ,
+ uppercase-short .bool_set:N = \l__acro_upper_short_bool ,
+ uppercase-short .initial:n = false
}
\AtBeginDocument
@@ -811,15 +817,18 @@
% #1: id
\cs_new_protected:Npn \__acro_print_foreign:n #1
{
- \bool_if:nT
- {
- \l__acro_foreign_bool &&
- !\l__acro_first_only_short_bool &&
- !\l__acro_first_only_long_bool
- }
+ \acro_if_foreign:nT {#1}
{
- \acro_write_foreign:n {#1}
- \acro_endings:nn {#1} {foreign}
+ \bool_if:nT
+ {
+ \l__acro_foreign_bool &&
+ !\l__acro_first_only_short_bool &&
+ !\l__acro_first_only_long_bool
+ }
+ {
+ \acro_write_foreign:n {#1}
+ \acro_endings:nn {#1} {foreign}
+ }
}
}
@@ -874,7 +883,10 @@
\__acro_open_bracket:
\__acro_print_foreign:n {#1}
\__acro_foreign_sep:n {#1}
- \__acro_print_form:nnn {long} {#1} {#2}
+ {
+ \bool_set_false:N \l__acro_first_upper_bool
+ \__acro_print_form:nnn {long} {#1} {#2}
+ }
\__acro_print_citation:n {#1}
\__acro_close_bracket:
\__acro_finalize_first:n {#1}
@@ -884,7 +896,10 @@
\__acro_open_bracket:
\__acro_print_foreign:n {#1}
\__acro_foreign_sep:n {#1}
- \__acro_print_form:nnn {short} {#1} {#2}
+ {
+ \bool_set_false:N \l__acro_first_upper_bool
+ \__acro_print_form:nnn {short} {#1} {#2}
+ }
\__acro_print_citation:n {#1}
\__acro_close_bracket:
\__acro_finalize_first:n {#1}
@@ -1394,11 +1409,8 @@
\acro_acc_supp:nn
{#1}
{
- \acro_write_short:nn {#1}
- {
- \l__acro_list_short_format_tl
- { \__acro_get_property:nn {short} {#1} }
- }
+ \l__acro_list_short_format_tl
+ \__acro_get_property:nn {short} {#1}
}
}
}
@@ -1528,18 +1540,20 @@
\tl_clear:N #1
\acro_for_all_acronyms_do:n
{% ##1: id; ##2: short form
- \acro_get:n {##1}
- \acro_if_entry:nnnT {##1} {#2} {#3}
- {
- \tl_put_right:Nn #1
- {
- \acro_print_list_entry:nnnn
- { \acro_list_entry:nn {short} {##1} }
- { \acro_list_entry:nn {long} {##1} }
- { \acro_list_entry:nn {extra} {##1} }
- { \acro_list_entry:nn {page} {##1} }
- }
- }
+ \group_begin:
+ \acro_get:n {##1}
+ \acro_if_entry:nnnT {##1} {#2} {#3}
+ {
+ \tl_gput_right:Nn #1
+ {
+ \acro_print_list_entry:nnnn
+ { \acro_list_entry:nn {short} {##1} }
+ { \acro_list_entry:nn {long} {##1} }
+ { \acro_list_entry:nn {extra} {##1} }
+ { \acro_list_entry:nn {page} {##1} }
+ }
+ }
+ \group_end:
}
}
@@ -1982,7 +1996,7 @@
\prop_get:NnNF \l__acro_short_prop {#1} \l__acro_tmpa_tl {}
\__acro_make_link:NnV \l__acro_short_tl {#1} \l__acro_tmpa_tl
% \acro_get_property:nn {#1} {short-format}
- % alt:
+ % alt:
\prop_get:NnNTF \l__acro_alt_prop {#1} \l__acro_tmpa_tl
{ \__acro_make_link:NnV \l__acro_alt_tl {#1} \l__acro_tmpa_tl }
{ \tl_set_eq:NN \l__acro_alt_tl \l__acro_short_tl }
@@ -2007,9 +2021,12 @@
{ \bool_set_true:N \l__acro_custom_long_format_bool }
{ \bool_set_false:N \l__acro_custom_long_format_bool }
\acro_get_property:nn {#1} {first-long-format}
- \prop_get:NnNTF \l__acro_format_prop {#1} \l__acro_custom_format_tl
- { \bool_set_true:N \l__acro_custom_format_bool }
- { \bool_set_false:N \l__acro_custom_format_bool }
+ \prop_get:NnNTF \l__acro_format_prop {#1} \l__acro_custom_short_format_tl
+ { \bool_set_true:N \l__acro_custom_short_format_bool }
+ { \bool_set_false:N \l__acro_custom_short_format_bool }
+ \prop_get:NnNTF \l__acro_alt_format_prop {#1} \l__acro_custom_alt_format_tl
+ { \bool_set_true:N \l__acro_custom_alt_format_bool }
+ { \bool_set_false:N \l__acro_custom_alt_format_bool }
\acro_get_property:nn {#1} {single-format}
\acro_for_endings_do:n
{
@@ -2104,31 +2121,50 @@
\cs_new_protected:Npn \__acro_endings:nn #1#2
{
- \bool_if:NTF \l__acro_include_endings_format_bool
+ \acro_for_endings_do:n
{
- \str_if_eq:nnTF {long} {#2}
- {
- \bool_if:NTF \l__acro_custom_long_format_bool
- { \l__acro_custom_long_format_tl }
- { \tl_use:c {l__acro_#2_format_tl} }
- }
- {
- \bool_if:NTF \l__acro_custom_format_bool
- { \l__acro_custom_format_tl }
- { \tl_use:c {l__acro_#2_format_tl} }
- }
+ \__acro_set_ending_for:nnn {##1} {#1} {#2}
+ \bool_if:cT {l__acro_##1_bool}
+ { \__acro_ending_format:nn {#2} { \tl_use:c {l__acro_#2_##1_tl} } }
}
- { \use:n }
+ }
+
+% #1: long|short|alt
+% #2: string
+\cs_new_protected:Npn \__acro_ending_format:nn #1#2
+ {
+ \bool_if:NTF \l__acro_include_endings_format_bool
{
- \acro_for_endings_do:n
+ \str_case:nn {#1}
{
- \__acro_set_ending_for:nnn {##1} {#1} {#2}
- \bool_if:cT {l__acro_##1_bool}
- { \tl_use:c {l__acro_#2_##1_tl} }
+ {long}
+ {
+ \bool_if:NTF \l__acro_custom_long_format_bool
+ { \l__acro_custom_long_format_tl }
+ {
+ \bool_if:NTF \l__acro_first_instance_bool
+ { \l__acro_first_long_format_tl }
+ { \l__acro_long_format_tl }
+ }
+ }
+ {short}
+ {
+ \bool_if:NTF \l__acro_custom_short_format_bool
+ { \l__acro_custom_short_format_tl }
+ { \l__acro_short_format_tl }
+ }
+ {alt}
+ {
+ \bool_if:NTF \l__acro_custom_alt_format_bool
+ { \l__acro_custom_alt_format_tl }
+ { \l__acro_alt_format_tl }
+ }
}
}
+ { \use:n }
+ {#2}
}
-
+
\prg_new_conditional:Npnn \acro_if_ending_exist:n #1 {p,T,F,TF}
{
\seq_if_in:NnTF \l__acro_endings_seq {#1}
@@ -2377,7 +2413,10 @@
}
\bool_gset_true:c { g__acro_#1_used_bool }
}
- { \__acro_aux_file:Nxxxx \acro@used@once {#1} {} {} {} }
+ {}
+ % I can't remember why I want an empty first use case for starred
+ % acronyms…
+ % { \__acro_aux_file:Nxxxx \acro@used@once {#1} {} {} {} }
\prg_return_false:
}
}
@@ -2475,18 +2514,34 @@
\fi
% --------------------------------------------------------------------------
+% #1: short|alt|long
+% #2: string to be typeset
+\cs_new_protected:Npn \__acro_typeset:nn #1#2
+ {
+ \mode_if_horizontal:F { \leavevmode }
+ \group_begin:
+ \use:x
+ {
+ \bool_if:cTF {l__acro_custom_#1_format_bool}
+ { \exp_not:v {l__acro_custom_#1_format_tl} }
+ { \exp_not:v {l__acro_#1_format_tl} }
+ {#2}
+ }
+ \group_end:
+ }
+
% typeset the short form:
% #1: ID
% #2: short form
\cs_new_protected:Npn \acro_write_short:nn #1#2
{
- \mode_if_horizontal:F { \leavevmode }
- \group_begin:
- \bool_if:NTF \l__acro_custom_format_bool
- { \l__acro_custom_format_tl }
- { \l__acro_short_format_tl }
- {#2}
- \group_end:
+ \__acro_typeset:nn {short}
+ {
+ \bool_if:nTF
+ { \l__acro_first_upper_bool && \l__acro_upper_short_bool }
+ { \exp_not:N \__acro_first_upper_case:n { \exp_not:n {#2} } }
+ { \exp_not:n {#2} }
+ }
}
\cs_generate_variant:Nn \acro_write_short:nn { nV , nv }
@@ -2495,13 +2550,13 @@
% #2: alt form
\cs_new_protected:Npn \acro_write_alt:nn #1#2
{
- \mode_if_horizontal:F { \leavevmode }
- \group_begin:
- \bool_if:NTF \l__acro_custom_format_bool
- { \l__acro_custom_format_tl }
- { \l__acro_alt_format_tl }
- {#2}
- \group_end:
+ \__acro_typeset:nn {alt}
+ {
+ \bool_if:nTF
+ { \l__acro_first_upper_bool && \l__acro_upper_short_bool }
+ { \exp_not:N \__acro_first_upper_case:n { \exp_not:n {#2} } }
+ { \exp_not:n {#2} }
+ }
}
\cs_generate_variant:Nn \acro_write_alt:nn { nV , nv }
@@ -2513,23 +2568,15 @@
% #2: long form
\cs_new_protected:Npn \acro_write_long:nn #1#2
{
- \mode_if_horizontal:F { \leavevmode }
- \group_begin:
- \bool_if:NTF \l__acro_custom_long_format_bool
- { \l__acro_custom_long_format_tl }
- { \use:n }
+ \__acro_typeset:nn {long}
{
- \use:x
- {
- \exp_not:n {#1}
- {
- \bool_if:NTF \l__acro_first_upper_bool
- { \exp_not:N \__acro_first_upper_case:n { \exp_not:n {#2} } }
- { \exp_not:n {#2} }
- }
- }
+ \exp_not:n {#1}
+ {
+ \bool_if:NTF \l__acro_first_upper_bool
+ { \exp_not:N \__acro_first_upper_case:n { \exp_not:n {#2} } }
+ { \exp_not:n {#2} }
+ }
}
- \group_end:
}
\cs_generate_variant:Nn \acro_write_long:nn { VV,Vo,Vf,V,v,vv }
@@ -3112,7 +3159,6 @@
{
activate-trailing-tokens .code:n =
\clist_map_inline:nn {#1} { \acro_activate_trailing_token:n {##1} } ,
- activate-trailing-tokens .initial:n = dot ,
deactivate-trailing-tokens .code:n =
\clist_map_inline:nn {#1} { \acro_deactivate_trailing_token:n {##1} }
}
@@ -3734,6 +3780,9 @@
% short format:
\acro_declare_property_alias:nn {short-format} {format}
+% alt format:
+\acro_declare_simple_property:n {alt-format}
+
% long format:
\acro_declare_simple_property:n {long-format}
@@ -4195,28 +4244,30 @@
\AcroRegisterTrailing - {dash}
\AcroRegisterTrailing \babelhyphen {babel-hyphen}
+\keys_set:nn {acro} { activate-trailing-tokens = dot }
+
% --------------------------------------------------------------------------
% the user commands
% automatic:
\NewAcroCommand \ac
{ \acro_use:n {#1} }
-\NewAcroCommand \iac
+\NewAcroCommand \Ac
{
- \acro_indefinite:
+ \acro_first_upper:
\acro_use:n {#1}
}
-\NewAcroCommand \Iac
+\NewAcroCommand \iac
{
- \acro_first_upper:
\acro_indefinite:
\acro_use:n {#1}
}
-\NewAcroCommand \Ac
+\NewAcroCommand \Iac
{
\acro_first_upper:
+ \acro_indefinite:
\acro_use:n {#1}
}
@@ -4250,6 +4301,12 @@
\NewAcroCommand \acs
{ \acro_short:n {#1} }
+\NewAcroCommand \Acs
+ {
+ \acro_first_upper:
+ \acro_short:n {#1}
+ }
+
\NewAcroCommand \iacs
{
\acro_indefinite:
@@ -4269,6 +4326,13 @@
\acro_short:n {#1}
}
+\NewAcroCommand \Acsp
+ {
+ \acro_first_upper:
+ \acro_plural:
+ \acro_short:n {#1}
+ }
+
% alt:
\NewAcroCommand \aca
{ \acro_alt:n {#1} }
@@ -4298,26 +4362,33 @@
\acro_alt:n {#1}
}
+\NewAcroCommand \Acap
+ {
+ \acro_first_upper:
+ \acro_plural:
+ \acro_alt:n {#1}
+ }
+
% long:
\NewAcroCommand \acl
{ \acro_long:n {#1} }
-\NewAcroCommand \iacl
+\NewAcroCommand \Acl
{
- \acro_indefinite:
+ \acro_first_upper:
\acro_long:n {#1}
}
-\NewAcroCommand \Iacl
+\NewAcroCommand \iacl
{
- \acro_first_upper:
\acro_indefinite:
\acro_long:n {#1}
}
-\NewAcroCommand \Acl
+\NewAcroCommand \Iacl
{
\acro_first_upper:
+ \acro_indefinite:
\acro_long:n {#1}
}
@@ -4338,22 +4409,22 @@
\NewAcroCommand \acf
{ \acro_first:n {#1} }
-\NewAcroCommand \iacf
+\NewAcroCommand \Acf
{
- \acro_indefinite:
+ \acro_first_upper:
\acro_first:n {#1}
}
-\NewAcroCommand \Iacf
+\NewAcroCommand \iacf
{
- \acro_first_upper:
\acro_indefinite:
\acro_first:n {#1}
}
-\NewAcroCommand \Acf
+\NewAcroCommand \Iacf
{
\acro_first_upper:
+ \acro_indefinite:
\acro_first:n {#1}
}
@@ -4690,6 +4761,15 @@
`foreign-sep' to be a &
- fix issue #116
- implemented issue #112
+2019/09/23 v2.10 - fix issue #120
+ - fix isuue #128
+ - fix issue #129
+ - fix issue #131
+ - new: \Acs \Acsp \Aca \Acap
+ - new: `alt-format'
+ - new: `uppercase-short'
+ - a change to how usage is determined (see def. of
+ \acro_is_used:nTF)
% --------------------------------------------------------------------------
% TODO:
diff --git a/macros/latex/contrib/acro/acro_en.pdf b/macros/latex/contrib/acro/acro_en.pdf
index a0cd8ab700..e816f76124 100644
--- a/macros/latex/contrib/acro/acro_en.pdf
+++ b/macros/latex/contrib/acro/acro_en.pdf
Binary files differ
diff --git a/macros/latex/contrib/acro/acro_en.tex b/macros/latex/contrib/acro/acro_en.tex
index ad807a43d0..c7caf4b7bc 100644
--- a/macros/latex/contrib/acro/acro_en.tex
+++ b/macros/latex/contrib/acro/acro_en.tex
@@ -1,8 +1,8 @@
-% !arara: pdflatex: { action: nonstopmode }
+% arara: pdflatex: { action: nonstopmode }
% !arara: biber
% !arara: pdflatex: { action: nonstopmode }
-% arara: pdflatex: { action: nonstopmode }
-% arara: pdflatex: { action: nonstopmode }
+% !arara: pdflatex: { action: nonstopmode }
+% !arara: pdflatex: { action: nonstopmode }
% --------------------------------------------------------------------------
% the ACRO package
%
@@ -322,7 +322,7 @@ documentation.
\keyval{foreign-plural}{text}\Default{s}
The\sinceversion{2.9} plural ending appended to the foreign form.
%% foreign-plural-form
- \keyval{long-plural-form}{text}
+ \keyval{foreign-plural-form}{text}
Plural\sinceversion{2.9} lforeign form of the acronym; replaces the
foreign form when used instead of appending the plural ending.
%% list
@@ -390,6 +390,10 @@ documentation.
%% long-format
\keyval{long-format}{\TeX{} code}
The format used for the long form of the acronym.
+ %% short-format
+ \keyval{alt-format}{\TeX{} code}
+ The\sinceversion{2.10} format used for the alternative form of the
+ acronym. If this is not given the short format will be used.
%% first-long-format
\keyval{first-long-format}{\TeX{} code}
The format used for the first long form of the acronym as set with \cs{ac},
@@ -521,36 +525,54 @@ This is an example of the logging info with \keyis{log}{true} or
\subsection{Using the Acronyms -- the Commands}\label{sec:using-acronyms-comm}
Acronyms are used with one of the following commands:
\begin{commands}
+ %%
\command{ac}[\sarg\marg{id}]
basic command; the first output is different from subsequent ones.
\command{Ac}[\sarg\marg{id}]
- same as \cs{ac} but capitalizes the first letter of the long form.
+ same as \cs{ac} but capitalizes the first letter.
+ %%
\command{acs}[\sarg\marg{id}]
\h{s}hort form; the actual acronym.
+ \command{Acs}[\sarg\marg{id}]
+ same\sinceversion{2.10} as \cs{acs} but capitalizes the first letter.
+ %%
\command{acl}[\sarg\marg{id}]
\h{l}ong form; the meaning of the acronym.
\command{Acl}[\sarg\marg{id}]
same as \cs{acl} but capitalizes first letter.
+ %%
\command{aca}[\sarg\marg{id}]
\h{a}lternative short form as specified in the \option{alt} key of
\cs{DeclareAcronym}; if it hasn't been specified this is identical to
\cs{acs}.
+ \command{Aca}[\sarg\marg{id}]
+ same\sinceversion{2.10} as \cs{aca} but capitalizes the first letter.
+ %%
\command{acf}[\sarg\marg{id}]
first form; output like the first time \cs{ac} is output.
\command{Acf}[\sarg\marg{id}]
- same as \cs{acf} but capitalizes first letter of the long form.
+ same as \cs{acf} but capitalizes first letter.
+ %%
\command{acp}[\sarg\marg{id}]
\h{p}lural form of \cs{ac};
\command{Acp}[\sarg\marg{id}]
- same as \cs{acp} but capitalizes first letter of the long form.
+ same as \cs{acp} but capitalizes first letter.
+ %%
\command{acsp}[\sarg\marg{id}]
plural form of \cs{acs};
+ \command{Acsp}[\sarg\marg{id}]
+ same\sinceversion{2.10} as \cs{acsp} but capitalizes the first letter.
+ %%
\command{aclp}[\sarg\marg{id}]
plural form of \cs{acl};
\command{Aclp}[\sarg\marg{id}]
same as \cs{aclp} but capitalizes first letter.
+ %%
\command{acap}[\sarg\marg{id}]
plural form of \cs{aca};
+ \command{Acap}[\sarg\marg{id}]
+ same\sinceversion{2.10} as \cs{acap} but capitalizes the first letter.
+ %%
\command{acfp}[\sarg\marg{id}]
plural form of \cs{acf};
\command{Acfp}[\sarg\marg{id}]
@@ -1104,10 +1126,16 @@ There are a few options which change the general behaviour of \acro.
then already existing macros will be overwritten.
%%
\keybool{sort}\Default{true}
- If set to \code{true} the acronym list will be sorted automatically. The
+ If set to \code{true} the acronym list will be sorted alphabetically. The
entries are sorted by their \acs{id} ignoring upper and lower case. This
option needs the experimental package \pkg{l3sort} (from the
\pkg{l3experimental} bundle) and can only be set in the preamble.
+ If set to \code{false} the acronyms are listed in order of their
+ declaration.
+ %%
+ \keybool{display-foreign}\Default{true}
+ When set to \code{false} any \option{foreign} option is ignored and
+ foreign forms are not displayed.
%%
\keychoice{cite}{\default{all},first,none}\Default{first}
\changedversion{2.4b}This option decides whether citations that are added
@@ -1167,15 +1195,20 @@ There are a few options which change the general behaviour of \acro.
the like commands. You can change it to another one like for example
\cs*{makefirstuc}\footnote{from the \pkg{mfirstuc} package} or
\cs*{MakeTextUppercase}\footnote{from the \pkg*{textcase} package}.
+ %%
+ \keybool{uppercase-short}\Default{false}
+ If\sinceversion{2.10} set to \code{true} commands like \cs{Ac}, \cs{Acs} or
+ \cs{Aca} will uppercase the first letter of the short or alternative
+ version.
\end{options}
-All options of this and the following sections can be set up either as package
-options or via the setup command:
+All options of this and the following sections can be set via the setup command:
\begin{commands}
\command{acsetup}[\marg{options}]
Set up \acro\ anywhere in the document. Or separate package loading from
setup.
\end{commands}
+They might work as package options as well but \emph{I do not recommend it}.
\begin{example}
% with \acsetup{macros}
@@ -1660,6 +1693,9 @@ commands\footnote{Which is why you need to use them inside an expl3
\command*{acro_add_action:n}[ \marg{code}]
Adds\sinceversion{2.7} code to \cs*{acro_get:n}. Inside of \meta{code}
you can refer to the \ac{id} of the acronym with \verbcode+#1+.
+ The \cs*{acro_get:n} command is called the first macro that is called by
+ \cs*{acro_use:n} which for example enables conditionals to test for
+ certain acronym properties.
\command*{acro_get_property:nn}[\TF\ \marg{id} \marg{property} \marg{true}
\marg{false}]
Fetches\sinceversion{2.7} the property \meta{property} of the acronym
@@ -2129,4 +2165,3 @@ letter (category code~11).
\printacronyms
\end{document}
-
diff --git a/macros/latex/contrib/chemformula/README b/macros/latex/contrib/chemformula/README
index b171813d7d..fda9482523 100644
--- a/macros/latex/contrib/chemformula/README
+++ b/macros/latex/contrib/chemformula/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the CHEMFORMULA package v4.15e 2017/03/23
+the CHEMFORMULA package v4.15f 2019/09/23
typeset chemical compounds and reactions
@@ -8,7 +8,7 @@ Clemens Niederberger
Web: http://www.mychemistry.eu/forums/forum/chemformula/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2011-2017 Clemens Niederberger
+Copyright 2011-2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemformula/chemformula.sty b/macros/latex/contrib/chemformula/chemformula.sty
index d909b17879..da9b6fe414 100644
--- a/macros/latex/contrib/chemformula/chemformula.sty
+++ b/macros/latex/contrib/chemformula/chemformula.sty
@@ -12,7 +12,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -30,9 +30,9 @@
\usetikzlibrary{arrows.meta}
\ExplSyntaxOn
-\tl_const:Nn \c_chemformula_date_tl {2017/03/23}
+\tl_const:Nn \c_chemformula_date_tl {2019/09/23}
\tl_const:Nn \c_chemformula_version_number_tl {4.15}
-\tl_const:Nn \c_chemformula_version_suffix_tl {e}
+\tl_const:Nn \c_chemformula_version_suffix_tl {f}
\tl_const:Nx \c_chemformula_version_tl
{ \c_chemformula_version_number_tl \c_chemformula_version_suffix_tl }
\tl_const:Nn \c_chemformula_info_tl
@@ -181,6 +181,8 @@
\seq_new:N \l__chemformula_tmpa_seq
+\bool_new:N \l__chemformula_tmpa_bool
+
% booleans:
% these are official:
\bool_new:N \l_chemformula_inside_ch_bool
diff --git a/macros/latex/contrib/chemformula/chemformula_en.pdf b/macros/latex/contrib/chemformula/chemformula_en.pdf
index f89c0d11e8..499a93ad74 100644
--- a/macros/latex/contrib/chemformula/chemformula_en.pdf
+++ b/macros/latex/contrib/chemformula/chemformula_en.pdf
Binary files differ
diff --git a/macros/latex/contrib/chemformula/chemformula_en.tex b/macros/latex/contrib/chemformula/chemformula_en.tex
index 0ff1bc0979..5dbb268e70 100644
--- a/macros/latex/contrib/chemformula/chemformula_en.tex
+++ b/macros/latex/contrib/chemformula/chemformula_en.tex
@@ -16,7 +16,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -65,7 +65,7 @@
addplot,
chemfig,
DeclareInstance, draw,
- sample, setatomsep, sfrac,
+ sample, setchemfig, sfrac,
usetikzlibrary
} ,
index-setup = { othercode=\footnotesize, level=\section , noclearpage } ,
@@ -89,6 +89,7 @@
\usepackage[biblatex]{embrac}
\ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
+\usepackage{csquotes}
\usepackage[accsupp]{acro}
\acsetup{
@@ -1128,7 +1129,7 @@ of the labels. What stays constant is the part that protrudes the labels.
\ch{A ->[abc] B} \par
\ch{A ->[abc~abc] B} \par
% needs the `chemfig' package:
- \setatomsep{15pt}
+ \setchemfig{atom sep =15pt}
\ch{A ->[ "\chemfig{-[:30]-[:-30]OH}" ] B} \par
\end{example}
diff --git a/macros/latex/contrib/chemmacros/README b/macros/latex/contrib/chemmacros/README
index d6b3a3a4cc..22ff8e700c 100644
--- a/macros/latex/contrib/chemmacros/README
+++ b/macros/latex/contrib/chemmacros/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the CHEMMACROS package v5.8b 2017/08/28
+the CHEMMACROS package v5.8d 2019/09/23
comprehensive support for typesetting chemistry documents
@@ -8,7 +8,7 @@ Clemens Niederberger
Web: https://github.com/cgnieder/chemmacros/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2011-2017 Clemens Niederberger
+Copyright 2011-2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.history b/macros/latex/contrib/chemmacros/chemmacros.history
index 505e43a72f..bebe40163e 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.history
+++ b/macros/latex/contrib/chemmacros/chemmacros.history
@@ -12,7 +12,7 @@ contact@mychemistry.eu
If you have any ideas, questions, suggestions or bugs to report, please
feel free to contact me.
--------------------------------------------------------------------------
-Copyright 2011-2017 Clemens Niederberger
+Copyright 2011-2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -375,3 +375,7 @@ Version history
\__chemmacros_break_point_insert:nnn so it does
nothing as last token in \iupac (nomenclature)
2017/08/28 - version 5.8b - fix missing hyperref check
+2018/03/02 - version 5.8c - fix bug in \chemmacros_p:n (acid/base)
+ - smash sub- and superscripts of polymer delimiters
+ (polymers)
+2019/09/23 - version 5.8d - add some Norwegian translations
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.acid-base.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.acid-base.code.tex
index fb998832c9..1024cd4fac 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.acid-base.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.acid-base.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\ChemModule{acid-base}{2016/05/31 acid/base}
+\ChemModule{acid-base}{2018/02/22 acid/base}
\chemmacros_load_modules:n {charges}
@@ -108,7 +108,9 @@
\cs_new_protected:Npn \chemmacros_p:n #1
{
\group_begin:
- \mbox
+ \chemmacros_if_compatibility:nnTF {<=} {5.8b}
+ { \mbox }
+ { \chemmacros_text:n }
{
\chemmacros_p_style:n {p}
\ensuremath {#1}
@@ -157,8 +159,9 @@
}
\EndChemCompatibility
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2016/02/04 - \NewChemEqConstant and family, new option `eq-constant'
2016/04/27 - moved translations from lang module to acid-base module
2016/05/31 - adapt to changes in `lang' module
+2018/02/22 - fix bug in \chemmacros_p:n (https://tex.stackexchange.com/q/416227/)
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.all.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.all.code.tex
index 599b659819..fa14ed3fdb 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.all.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.all.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -68,7 +68,7 @@
\msg_info:nn {chemmacros} {all-modules}
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/10/14 - add info message discouraging the usage of this module
- add `errorcheck' module
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.base.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.base.code.tex
index 6e6b98094a..5d2e66611d 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.base.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.base.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -272,7 +272,9 @@
{
\cs_if_exist:cF {cref@#1@name}
{
- \crefname {#1} {#2} {#3}
+ \chemmacros_tex_if:nnTF {@cref@capitalise} {}
+ { \crefname {#1} {#4} {#5} }
+ { \crefname {#1} {#2} {#3} }
\Crefname {#1} {#4} {#5}
}
}
@@ -471,7 +473,7 @@
{ \bool_set_true:N \l__chemmacros_hyperref_bool }
}
-\tex_endinput:D
+\file_input_stop:
2015/09/23 - new conditionals \chemmacros_if_preamble:TF and
\chemmacros_if_document:TF
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.charges.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.charges.code.tex
index 3429727aa2..981d9d272e 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.charges.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.charges.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.chemformula.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.chemformula.code.tex
index 9f54d9317f..6a6c45d1f2 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.chemformula.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.chemformula.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -230,7 +230,7 @@
}
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/09/22 - new general option `method' which allows a choice between
`chemformula' and `mhchem'
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.errorcheck.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.errorcheck.code.tex
index d7c70b5e9c..07499ef5f2 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.errorcheck.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.errorcheck.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -122,7 +122,7 @@
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/10/14 - first version
2016/03/08 - add `polymers' module
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.greek.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.greek.code.tex
index a9f96d7485..d3c9ee87ae 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.greek.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.greek.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.isotopes.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.isotopes.code.tex
index 0931c1579f..1d7ec5466c 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.isotopes.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.isotopes.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.lang.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.lang.code.tex
index b9dea089d2..7ae37a2f9f 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.lang.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.lang.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -162,7 +162,7 @@
\EndChemCompatibility
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/11/17 - remove options `german' and `ngerman', starting with v5.3
2016/02/03 - adapt to changes in `acid-base' module
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.mechanisms.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.mechanisms.code.tex
index 662d93fbb3..22624538b6 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.mechanisms.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.mechanisms.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.newman.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.newman.code.tex
index 79d5c16ff1..7c8caa10a5 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.newman.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.newman.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -207,6 +207,6 @@
\cs_generate_variant:Nn \chemmacros_newman_front_node:nn { nf }
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2016/04/23 - some changes on how \newman is processed internally
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.nomenclature.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.nomenclature.code.tex
index 5a347b66e9..596d36f65a 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.nomenclature.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.nomenclature.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -456,7 +456,7 @@
}
\EndChemCompatibility
-\ChemCompatibilityFrom{5.8a}
+\ChemCompatibility{5.8a}
\cs_new_protected:Npn \__chemmacros_break_point_insert:nnn #1#2#3
{
\mode_if_math:TF
@@ -473,6 +473,49 @@
}
\EndChemCompatibility
+\ChemCompatibilityFrom{5.8b}
+\cs_new_protected:Npn \__chemmacros_peek_if_dash:TF #1#2
+ {
+ \peek_charcode:NTF -
+ {#1}
+ {#2}
+ }
+
+\cs_new_protected:Npn \__chemmacros_peek_if_paren:TF #1#2
+ { % (
+ \peek_charcode:NTF )
+ {#1}
+ { % [
+ \peek_charcode:NTF ]
+ {#1}
+ {#2}
+ }
+ }
+
+\cs_new_protected:Npn \__chemmacros_break_point_insert:nnn #1#2#3
+ {
+ \mode_if_math:TF
+ {#3}
+ {
+ \peek_meaning:NTF \group_end:
+ {#3}
+ {
+ \__chemmacros_peek_if_dash:TF
+ {#3}
+ {
+ \__chemmacros_peek_if_paren:TF
+ {#3}
+ {
+ \chemmacros_nobreak:
+ \tex_discretionary:D {#1} {#2} {#3}
+ \chemmacros_allow_hyphens:
+ }
+ }
+ }
+ }
+ }
+\EndChemCompatibility
+
\dim_new:N \l__chemmacros_iupac_hyphen_pre_dim
\dim_set:Nn \l__chemmacros_iupac_hyphen_pre_dim { .01em }
\dim_new:N \l__chemmacros_iupac_hyphen_post_dim
@@ -528,7 +571,7 @@
{ \tex_kern:D \l__chemmacros_iupac_break_dim }
}
}
-
+
\cs_new_protected:Npn \chemmacros_break_point_opening_paren:
{ \__chemmacros_break_point_insert:nnn { - } { ( } { ( } }
@@ -642,6 +685,11 @@
\NewChemIUPACShorthand ' \chemprime
\EndChemCompatibility
+\ChemCompatibilityFrom{5.8c}
+\NewChemIUPAC \nonbreakinghyphen { \mbox{-} \nobreak \hspace{0pt} }
+\NewChemIUPACShorthand = \nonbreakinghyphen
+\EndChemCompatibility
+
\cs_new_protected:Npn \chemmacros_iupac:nn #1#2
{
\group_begin:
@@ -873,7 +921,7 @@
}
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/10/01 - use new function \chemmacros_if_document:TF for
\chemmacros_make_iupac:
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.orbital.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.orbital.code.tex
index d3f3a5a16f..79153b0d11 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.orbital.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.orbital.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.particles.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.particles.code.tex
index 44cde87840..9d68712f81 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.particles.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.particles.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -136,6 +136,6 @@
\EndChemCompatibility
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2016/01/13 - new option particles/space
2016/04/02 - adapt to formula methods `chemist' and `chemfig'
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.phases.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.phases.code.tex
index 5f2bcc1dcd..da3365c038 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.phases.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.phases.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -133,7 +133,7 @@
\EndChemCompatibility
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/06/09 - first version
2016/04/27 - moved translations from lang module to phases module
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.polymers.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.polymers.code.tex
index 8c93ff002c..f7d71c8565 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.polymers.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.polymers.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\ChemModule{polymers}{2016/03/08 polymers}
+\ChemModule{polymers}{2018/03/02 polymers}
\chemmacros_load_modules:n {nomenclature,tikz}
@@ -123,8 +123,24 @@
depth \l__chemmacros_polymer_delimiter_height_dim
width \c_zero_dim
\tex_right:D \l__chemmacros_polymer_delimiter_right_tl
- \c_math_subscript_token { \hbox_overlap_right:n {#5} }
- \c_math_superscript_token { \hbox_overlap_right:n {#6} }
+ \c_math_subscript_token
+ {
+ \hbox_overlap_right:n
+ {
+ \chemmacros_if_compatibility:nnTF {>} {5.8b}
+ { \smash {#5} }
+ {#5}
+ }
+ }
+ \c_math_superscript_token
+ {
+ \hbox_overlap_right:n
+ {
+ \chemmacros_if_compatibility:nnTF {>} {5.8b}
+ { \smash {#6} }
+ {#6}
+ }
+ }
\c_math_toggle_token
} ;
}
@@ -159,8 +175,8 @@
}
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2016/03/07 - first version
2016/03/08 - \makepolymerdelims
-
+2018/03/02 - smash sub- and superscripts of polymer delimiters
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex
index 35be8b3e90..6512123897 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\ChemModule{reactions}{2016/05/04 reaction environments}
+\ChemModule{reactions}{2019/09/23 reaction environments}
\chemmacros_load_module:n {chemformula}
@@ -349,60 +349,68 @@
% --------------------------------------------------------------------------
\ChemCompatibilityTo{5.6}
-\DeclareTranslationFallback {list-of-reactions} {List~ of~ Reactions}
-\DeclareTranslation {English} {list-of-reactions} {List~ of~ Reactions}
-\DeclareTranslation {German} {list-of-reactions} {Reaktionsverzeichnis}
-\DeclareTranslation {Italian} {list-of-reactions} {Elenco~ delle~ reazioni}
-\DeclareTranslation {French} {list-of-reactions} {Table~ des~ r\'{e}actions}
-\DeclareTranslation {Dutch} {list-of-reactions} {Lijst~ van~ reacties}
-
-\DeclareTranslationFallback {reaction} {Reaction}
-\DeclareTranslation {English} {reaction} {Reaction}
-\DeclareTranslation {German} {reaction} {Reaktion}
-\DeclareTranslation {Italian} {reaction} {Reazione}
-\DeclareTranslation {French} {reaction} {R\'{e}action}
-\DeclareTranslation {Dutch} {reaction} {Reactie}
+\DeclareTranslationFallback {list-of-reactions} {List~ of~ Reactions}
+\DeclareTranslation {English} {list-of-reactions} {List~ of~ Reactions}
+\DeclareTranslation {German} {list-of-reactions} {Reaktionsverzeichnis}
+\DeclareTranslation {Italian} {list-of-reactions} {Elenco~ delle~ reazioni}
+\DeclareTranslation {French} {list-of-reactions} {Table~ des~ r\'{e}actions}
+\DeclareTranslation {Dutch} {list-of-reactions} {Lijst~ van~ reacties}
+
+\DeclareTranslationFallback {reaction} {Reaction}
+\DeclareTranslation {English} {reaction} {Reaction}
+\DeclareTranslation {German} {reaction} {Reaktion}
+\DeclareTranslation {Italian} {reaction} {Reazione}
+\DeclareTranslation {French} {reaction} {R\'{e}action}
+\DeclareTranslation {Dutch} {reaction} {Reactie}
\EndChemCompatibility
\ChemCompatibilityFrom{5.6}
\chemmacros_declare_translations:nn {list-of-reactions}
{
- fallback = List~ of~ Reactions ,
- English = List~ of~ Reactions ,
- German = Reaktionsverzeichnis ,
- Italian = Elenco~ delle~ reazioni ,
- French = Table~ des~ r\'{e}actions ,
- Dutch = Lijst~ van~ reacties
+ fallback = List~ of~ Reactions ,
+ English = List~ of~ Reactions ,
+ German = Reaktionsverzeichnis ,
+ Italian = Elenco~ delle~ reazioni ,
+ French = Table~ des~ r\'{e}actions ,
+ Dutch = Lijst~ van~ reacties ,
+ Norwegian = Reaksjonsliste ,
+ Nynorsk = Reaksjonsliste
}
\chemmacros_declare_translations:nn {reaction}
{
- fallback = reaction ,
- English = reaction ,
- German = Reaktion ,
- Italian = reazione ,
- French = r\'{e}action ,
- Dutch = reactie
+ fallback = reaction ,
+ English = reaction ,
+ German = Reaktion ,
+ Italian = reazione ,
+ French = r\'{e}action ,
+ Dutch = reactie ,
+ Norwegian = reaksjon ,
+ Nynorsk = reaksjon
}
\chemmacros_declare_translations:nn {reactions}
{
- fallback = reactions ,
- English = reactions ,
- German = Reaktionen ,
- Italian = reazioni ,
- French = r\'{e}actions ,
- Dutch = reacties
+ fallback = reactions ,
+ English = reactions ,
+ German = Reaktionen ,
+ Italian = reazioni ,
+ French = r\'{e}actions ,
+ Dutch = reacties ,
+ Norwegian = reaksjoner ,
+ Nynorsk = reaksjonar
}
\chemmacros_declare_translations:nn {Reaction}
{
- fallback = Reaction ,
- English = Reaction ,
- German = Reaktion ,
- Italian = Reazione ,
- French = R\'{e}action ,
- Dutch = Reactie
+ fallback = Reaction ,
+ English = Reaction ,
+ German = Reaktion ,
+ Italian = Reazione ,
+ French = R\'{e}action ,
+ Dutch = Reactie ,
+ Norwegian = Reaksjon ,
+ Nynorsk = Reaksjon
}
\chemmacros_declare_translations:nn {Reactions}
@@ -412,11 +420,13 @@
German = Reaktionen ,
Italian = Reazioni ,
French = R\'{e}actions ,
- Dutch = Reacties
+ Dutch = Reacties ,
+ Norwegian = Reaksjoner ,
+ Nynorsk = Reaksjonar
}
\EndChemCompatibility
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/09/15 - adapt to `method' option => do not use chemformula's macros
directly
@@ -431,3 +441,4 @@
- add fancyref support
- moved translations from lang module to reactions module
2016/05/04 - options `tag-open', `tag-close' and `before-tag'
+2019/09/23 - added Norwegian translations
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.redox.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.redox.code.tex
index 9e95b9b076..01e629028f 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.redox.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.redox.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -435,6 +435,6 @@
}
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/09/30 - new option `explicit-zero-sign'
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.scheme.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.scheme.code.tex
index 1a07bd1c50..059741fe0c 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.scheme.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.scheme.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\ChemModule{scheme}{2016/04/25 a scheme floating environment}
+\ChemModule{scheme}{2019/09/23 a scheme floating environment}
\RequirePackage {chemnum}
@@ -102,7 +102,7 @@
\DeclareFloatingEnvironment[{
fileext = #2 ,
listname = {\exp_not:N \chemmacros_translate:n {#1-list}} ,
- name = #2
+ name = \chemmacros_translate:n {#1-name}
}]{#1}
}
@@ -248,13 +248,13 @@
% --------------------------------------------------------------------------
\ChemCompatibilityTo{5.6}
-\DeclareTranslationFallback {scheme-name} {Scheme}
-\DeclareTranslation {English} {scheme-name} {Scheme}
-\DeclareTranslation {German} {scheme-name} {Schema}
+\DeclareTranslationFallback {scheme-name} {Scheme}
+\DeclareTranslation {English} {scheme-name} {Scheme}
+\DeclareTranslation {German} {scheme-name} {Schema}
-\DeclareTranslationFallback {scheme-list} {List~ of~ Schemes}
-\DeclareTranslation {English} {scheme-list} {List~ of~ Schemes}
-\DeclareTranslation {German} {scheme-list} {Verzeichnis~ der~ Schemata}
+\DeclareTranslationFallback {scheme-list} {List~ of~ Schemes}
+\DeclareTranslation {English} {scheme-list} {List~ of~ Schemes}
+\DeclareTranslation {German} {scheme-list} {Verzeichnis~ der~ Schemata}
\EndChemCompatibility
\ChemCompatibilityFrom{5.6}
@@ -262,49 +262,62 @@
{
fallback = Scheme ,
English = Scheme ,
- German = Schema
+ German = Schema ,
+ Norwegian = Skjema ,
+ Nynorsk = Skjema
}
\chemmacros_declare_translations:nn {scheme-list}
{
- fallback = List~ of~ Schemes ,
- English = List~ of~ Schemes ,
- German = Verzeichnis~ der~ Schemata
+ fallback = List~ of~ Schemes ,
+ English = List~ of~ Schemes ,
+ German = Verzeichnis~ der~ Schemata,
+ Norwegian = Skjemaliste,
+ Nynorsk = Skjemaliste
}
\chemmacros_declare_translations:nn {scheme}
{
- fallback = scheme ,
- English = scheme ,
- German = Schema
+ fallback = scheme ,
+ English = scheme ,
+ German = Schema ,
+ Norwegian = skjema ,
+ Nynorsk = skjema
}
\chemmacros_declare_translations:nn {Scheme}
{
- fallback = Scheme ,
- English = Scheme ,
- German = Schema
+ fallback = Scheme ,
+ English = Scheme ,
+ German = Schema ,
+ Norwegian = Skjema ,
+ Nynorsk = Skjema
}
\chemmacros_declare_translations:nn {schemes}
{
fallback = schemes ,
English = schemes ,
- German = Schemata
+ German = Schemata ,
+ Norwegian = skjema ,
+ Nynorsk = skjema
}
\chemmacros_declare_translations:nn {Schemes}
{
fallback = Schemes ,
English = Schemes ,
- German = Schemata
+ German = Schemata ,
+ Norwegian = Skjema ,
+ Nynorsk = Skjema
}
\EndChemCompatibility
-\tex_endinput:D
+\file_input_stop:
% --------------------------------------------------------------------------
2015/09/19 - make the module compatible with floatrow
2015/10/23 - add info message to float method detection
2016/01/23 - make the module compatible with chemscheme
2016/04/25 - cleveref and fancyref support
2016/12/28 - bug fix: typo in \chemmacros_tex_if:nnTF usage
+2019/03/23 - added Norwegian translations
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.spectroscopy.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.spectroscopy.code.tex
index 30223fc583..87d53dd3ce 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.spectroscopy.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.spectroscopy.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -131,8 +131,8 @@
\tl_put_left:Nn \g__chemmacros_nmr_element_coupled_tl {#2}
\chemmacros_chemformula:n { ^{#1} }
\bool_if:NTF \l__chemmacros_nmr_parse_bool
- { \chemformula_ch:nV {} \g__chemmacros_nmr_element_coupled_tl }
{ \chemmacros_chemformula:V \g__chemmacros_nmr_element_coupled_tl }
+ { \g__chemmacros_nmr_element_coupled_tl }
\tl_use:N \l__chemmacros_nmr_element_method_connector_tl
\tl_use:N \l__chemmacros_nmr_method_tl
}
@@ -157,8 +157,8 @@
\tl_if_blank:VF \g__chemmacros_nmr_element_coupled_tl
{
\bool_if:NTF \l__chemmacros_nmr_parse_bool
- { \chemformula_ch:nV {} \g__chemmacros_nmr_element_coupled_tl }
{ \chemmacros_chemformula:V \g__chemmacros_nmr_element_coupled_tl }
+ { \g__chemmacros_nmr_element_coupled_tl }
}
\tl_use:N \l__chemmacros_nmr_element_method_connector_tl
\tl_use:N \l__chemmacros_nmr_method_tl
@@ -339,7 +339,7 @@
\bool_if:NT \l__chemmacros_nmr_solvent_bool
{
\bool_if:NTF \l__chemmacros_nmr_parse_bool
- { \chemformula_ch:nn { } {#4} }
+ { \chemmacros_chemformula:n {#4} }
{#4}
}
\bool_if:NT \l__chemmacros_nmr_delimiters_bool
@@ -404,7 +404,10 @@
\cs_new_protected:Npn \chemmacros_nmr_number:n #1
{
\__chemmacros_nmr_number:n {#1}
- \skip_horizontal:N \l__chemmacros_nmr_space_skip
+ \chemmacros_if_compatibility:nnTF {>=} {5.8c}
+ { \chemmacros_skip_nobreak:N }
+ { \skip_horizontal:N }
+ \l__chemmacros_nmr_space_skip
\chemmacros_chemformula:V \g__chemmacros_nmr_element_tl
}
@@ -509,6 +512,6 @@
}
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/12/31 - new option `atom-number-space'
2017/01/27 - new option `nmr-base-format'
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.symbols.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.symbols.code.tex
index dfbc812d6f..314eeda81a 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.symbols.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.symbols.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.thermodynamics.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.thermodynamics.code.tex
index cf49fd0695..82306cc0ea 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.thermodynamics.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.thermodynamics.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.tikz.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.tikz.code.tex
index 2e8dfd243c..a656e70e5e 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.tikz.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.tikz.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -182,6 +182,6 @@
\EndChemCompatibility
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/10/26 - add decoration `wave' (complete sines)
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.units.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.units.code.tex
index ce7142e3dd..18bf0e5b9e 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.units.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.units.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,7 +50,7 @@
}
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
2015/09/28 - change \AtBeginDocument into \AtEndPreamble
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.xfrac.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.xfrac.code.tex
index 6ad2fd7771..735632beb4 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.xfrac.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.xfrac.code.tex
@@ -11,7 +11,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/chemmacros/chemmacros.sty b/macros/latex/contrib/chemmacros/chemmacros.sty
index fb25545aad..badf8ddb9a 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.sty
+++ b/macros/latex/contrib/chemmacros/chemmacros.sty
@@ -12,7 +12,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,10 +31,10 @@
% --------------------------------------------------------------------------
% package information:
-\tl_const:Nn \c_chemmacros_date_tl {2017/08/28}
+\tl_const:Nn \c_chemmacros_date_tl {2019/09/24}
\tl_const:Nn \c_chemmacros_version_major_number_tl {5}
\tl_const:Nn \c_chemmacros_version_minor_number_tl {8}
-\tl_const:Nn \c_chemmacros_version_subrelease_tl {b}
+\tl_const:Nn \c_chemmacros_version_subrelease_tl {d}
\tl_const:Nx \c_chemmacros_version_number_tl
{
\c_chemmacros_version_major_number_tl .
@@ -268,5 +268,5 @@
{ \RequirePackage{chemmacros5} }
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
diff --git a/macros/latex/contrib/chemmacros/chemmacros4.sty b/macros/latex/contrib/chemmacros/chemmacros4.sty
index c47106a14b..ae86ebc47d 100644
--- a/macros/latex/contrib/chemmacros/chemmacros4.sty
+++ b/macros/latex/contrib/chemmacros/chemmacros4.sty
@@ -12,7 +12,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -4083,7 +4083,7 @@
\tl_set:Nn \reactionlistname
{ \chemmacros_translate:n {list-of-reactions} }
-\tex_endinput:D
+\file_input_stop:
% --------------------------------------------------------------------------
Version history
diff --git a/macros/latex/contrib/chemmacros/chemmacros5.sty b/macros/latex/contrib/chemmacros/chemmacros5.sty
index 6c267fe42c..c9578f737b 100644
--- a/macros/latex/contrib/chemmacros/chemmacros5.sty
+++ b/macros/latex/contrib/chemmacros/chemmacros5.sty
@@ -12,7 +12,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -231,7 +231,7 @@
\chemmacros_if_compatibility:nnF {>=} {#4}
{
\msg_warning:nnnn {chemmacros} {module-not-available} {#2} {#4}
- \tex_endinput:D
+ \file_input_stop:
}
\seq_gput_right:Nn \g__chemmacros_loaded_modules_seq {#2}
\prop_gput:Nnn \g__chemmacros_loaded_modules_prop {#2} {#3}
@@ -280,7 +280,7 @@
}
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_input_stop:
% --------------------------------------------------------------------------
Modules: (* = preloaded)
diff --git a/macros/latex/contrib/chemmacros/chemmacros_en.pdf b/macros/latex/contrib/chemmacros/chemmacros_en.pdf
index 0f621ee561..e3e43444c6 100644
--- a/macros/latex/contrib/chemmacros/chemmacros_en.pdf
+++ b/macros/latex/contrib/chemmacros/chemmacros_en.pdf
Binary files differ
diff --git a/macros/latex/contrib/chemmacros/chemmacros_en.tex b/macros/latex/contrib/chemmacros/chemmacros_en.tex
index d4928256f3..feb89102c4 100644
--- a/macros/latex/contrib/chemmacros/chemmacros_en.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros_en.tex
@@ -16,7 +16,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -114,7 +114,7 @@
ominus, oplus,
percent, pgfarrowsdeclarealias, pgfarrowsrenewalias,
renewtagform, rightarrow,
- sample, scriptscriptstyle, setatomsep, setbondoffset, sfrac, shade,
+ sample, scriptscriptstyle, setchemfig, sfrac, shade,
shadedraw, shorthandoff, si, SI, sisetup, square, subsection,
textcolor, textendash, textsuperscript, tikz, tikzpicture, tiny, toprule,
upbeta, upeta, upgamma, usetikzlibrary,
@@ -1032,6 +1032,8 @@ and \cs*{textsuperscript} instead of \sym{\textasciicircum} without
\item The characters \sym{(} and \sym{)} allow the word to be hyphenated and
don't prevent further hyphenation, likewise \sym{[} and \sym{]}.
\item \sinceversion{5.3}The character \sym{'} is printed as \cs{chemprime}.
+ \item \sinceversion{5.8c}The character \sym{=} is printed ad
+ \cs{nonbreakinghyphen}.
\end{itemize}
\begin{example}[side-by-side]
\huge\iupac{2,4-Di|chlor|pentan} \par
@@ -1041,6 +1043,9 @@ and \cs*{textsuperscript} instead of \sym{\textasciicircum} without
\command{chemprime}
Prints\sinceversion{5.3} a prime character in superscript position. It is
defined as \verbcode+\ensuremath{{}^{\prime}}+.
+ \command{nonbreakinghyphen}
+ Prints\sinceversion{5.8c} a hyphen which doesn't allow a linebreak after
+ it. It is defined as \verbcode+\mbox{-}\nobreak\hspace{0pt}+.
\end{commands}
The spaces inserted by \sym{-} and \sym{\textbar} can be
@@ -1983,7 +1988,7 @@ preamble:
% No error will be raised if a translation of \meta{key} already exists.
% This command can only be used in the preamble and is defined by the
% \pkg{translations} package.
- \command{DeclareChemTranslation}[\marg{language}\marg{key}\marg{translation}]
+ \command{DeclareChemTranslation}[\marg{key}\marg{language}\marg{translation}]
\sinceversion{5.6}A command which makes an abstraction from the
\pkg{translations} package. It should be used in documents for adding
missing translations that are needed. This command can only be used in
@@ -2262,7 +2267,7 @@ changed.
overlay,
p/color = black!70
}
- \setbondoffset{0pt}
+ \setchemfig{bond offset=0pt}
\chemfig{
?\orbital{p}
-[,1.3]{\orbital[phase=-]{p}}
@@ -2276,7 +2281,7 @@ changed.
\begin{example}
\vspace{7mm}
- \setbondoffset{0pt}
+ \setchemfig{bond offset = 0pt}
\chemsetup[orbital]{
overlay ,
opacity = .75 ,
@@ -2352,7 +2357,7 @@ implements the following macro based on the same idea:
\end{options}
\begin{example}
- \setatomsep{2em}
+ \setchemfig{atom sep=2em}
\chemfig{-[@{op,.75}]CH_2-CH(-[6]Cl)-[@{cl,0.25}]}
\makepolymerdelims{5pt}[27pt]{op}{cl}
\chemfig{-[@{op,.75}]CH_2-CH(-[6]Cl)-[@{cl,0.25}]}
diff --git a/macros/latex/contrib/practicalreports/README b/macros/latex/contrib/practicalreports/README
new file mode 100644
index 0000000000..24a20b25aa
--- /dev/null
+++ b/macros/latex/contrib/practicalreports/README
@@ -0,0 +1,18 @@
+%% practicalreports.zip
+%% Copyright 2019 J. Cawood
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is J. Cawood.
+%
+
+
+This package provides a handful of macros for writing up science practical reports. \ No newline at end of file
diff --git a/macros/latex/contrib/practicalreports/practicalreports.pdf b/macros/latex/contrib/practicalreports/practicalreports.pdf
new file mode 100644
index 0000000000..3846092595
--- /dev/null
+++ b/macros/latex/contrib/practicalreports/practicalreports.pdf
Binary files differ
diff --git a/macros/latex/contrib/practicalreports/practicalreports.sty b/macros/latex/contrib/practicalreports/practicalreports.sty
new file mode 100644
index 0000000000..3f81259621
--- /dev/null
+++ b/macros/latex/contrib/practicalreports/practicalreports.sty
@@ -0,0 +1,161 @@
+%%Author: Justin Cawood
+%%License: LPPL 1.3c
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{practicalreports}[25/09/2019 v2.0.0 Practical Report Package]
+\RequirePackage{mathtools, array, longtable, scrextend, float, fancyhdr, lastpage}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\shift}[2]{
+\begin{addmargin}[#1cm]{0cm}
+\begin{minipage}{\textwidth}
+#2
+\end{minipage}
+\end{addmargin}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%Create a new title page
+%\newtitlepage{Title}{Author}{Date}
+\newcommand*{\newtitlepage}[3]{
+\begin{titlepage}
+ \vspace*{\fill}
+ \begin{center}
+ {\Huge #1}\\[0.5cm]
+ {\Large #2}\\[0.4cm]
+ {\small #3}
+ \end{center}
+ \vspace*{\fill}
+ \end{titlepage}
+}
+
+%Add a new figure
+\newcommand*{\newfigure}[4]{
+\begin{figure}[H]
+ \centering \textbf{#1} \par\medskip
+ \center{\includegraphics[width=\textwidth]
+ {#3}}
+ \caption{#2}
+ \label{fig:#4}
+\end{figure}
+}
+
+%Add a new scalable figure
+\newcommand*{\newsfigure}[5]{
+\begin{figure}[H]
+ \centering \textbf{#1} \par\medskip
+ \center{\includegraphics[scale=#5]
+ {#3}}
+ \caption{#2}
+ \label{fig:#4}
+\end{figure}
+}
+
+%Reference a labeled figure
+\newcommand*{\reffigure}[1]{Figure~\ref{fig:#1}}
+
+%Create a table
+%\newtable{Caption}
+%{Columns and Alignment}
+%{Column Headings}
+%{Table Data}
+\newcommand*{\newtable}[5]{
+\begin{table}[H]
+\begin{center}
+\caption{#1}
+\vspace*{5mm}
+\begin{tabular}{#2}
+\hline
+#3\\
+\hline
+#4\\
+\hline
+\end{tabular}
+\label{table:#5}
+\end{center}
+\end{table}
+}
+
+%Create a long table
+%\newlongtable{Caption}
+%{Columns and Alignment}
+%{Column Headings}
+%{Table Data}
+\newcommand{\newlongtable}[5]{
+\begin{center}
+\begin{longtable}{#2}
+\label{table:#5} \\
+\caption{#1} \\
+\hline
+#3 \\
+\hline
+\endfirsthead
+\caption{\textit{Continued}} \\
+\hline
+#3 \\
+\hline
+\endhead
+\hline\\
+\endfoot
+\hline
+\endlastfoot
+#4
+\end{longtable}
+\end{center}
+}
+
+%Reference a labeled table
+\newcommand*{\reftable}[1]{Table~\ref{table:#1}}
+
+%Box and solotion or multiple lines of solutions
+\newcommand*{\boxanswer}[1]{
+\begin{equation*}
+ \addtolength{\fboxsep}{5pt}
+ \boxed{
+ \begin{gathered}
+ #1
+ \end{gathered}
+ }
+\end{equation*}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%Multipleys a number by 10^{user input}
+\newcommand*{\E}[1]{$\times10^{#1}$}
+
+%Multipleys a number by 10^{user input}
+\newcommand*{\e}[1]{\times10^{#1}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\setpagefancy}{
+\pagestyle{fancy}
+\fancyhf{}
+}
+
+%Add a header to all pages
+\newcommand*{\header}[3]{
+\lhead{#1}
+\chead{#2}
+\rhead{#3}
+}
+
+%Add a footer to all pages
+\newcommand*{\footer}[3]{
+\lfoot{#1}
+\cfoot{#2}
+\rfoot{#3}
+}
+
+%Add a footer to all pages
+\newcommand*{\goodfoot}{
+\cfoot{Page \thepage \ of \pageref{LastPage}}
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+} \ No newline at end of file
diff --git a/macros/latex/contrib/practicalreports/practicalreports.tex b/macros/latex/contrib/practicalreports/practicalreports.tex
new file mode 100644
index 0000000000..7b6e2e811e
--- /dev/null
+++ b/macros/latex/contrib/practicalreports/practicalreports.tex
@@ -0,0 +1,325 @@
+\documentclass[12pt]{article}
+
+\usepackage[right=1in, top=1in, left=1in, bottom=1in]{geometry}
+\usepackage{amssymb,amsmath, mathtools}
+
+\usepackage[parfill]{parskip}
+
+\usepackage{practicalreports}
+
+
+\begin{document}
+
+\begin{titlepage}
+\vspace*{\fill}
+\begin{center}
+{\Huge Practical Reports Documentation}\\[0.5cm]
+{\Large Version: 2.0.0}\\[0.4cm]
+{\Large Date: $25^{th}$ of September 2019}\\[0.2cm]
+{\small Author: Justin Cawood}
+\end{center}
+\vspace*{\fill}
+\end{titlepage}
+
+\tableofcontents
+\newpage
+
+\section{Practical Reports Package}
+This package provides macros for displaying scientific notation, simple title pages, tables, figures, headers footers.
+
+\section{Importing the Package}
+Import the package by typing $\backslash$usepackage\{practicalreports\} at the top of the tex file.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Exponent Macro}
+This macro is much quicker and easier than the rest of the scientific notation macros in this package.
+
+\subsection{How to use it}
+To use this macro simply type "\textbf{value} $\backslash$E\{Power\} \textbf{units}". eg. 2.997 $\backslash$E\{8\} m\$s\^\ \{-1\}\$ This will output 2.997\E{8} m$s^{-1}$. The \textbf{value} and \textbf{units} are not required, so the macro can be also used like this, $\backslash$E\{8\}, this will output \E{8}.
+
+\subsection{Useful tricks}
+\textbf{\!\!\! If you are already in math mode use $\backslash$e instead\!\!\! }
+
+If the power/exponent being use in the scientific notation is only 1 number or character, there is no need for the curly brackets \{\}. It is much quicker to simply type $\backslash$E8 than to type $\backslash$E\{8\}. They both output the same result \E8. However this wont work for powers with more than one number or character eq. $\backslash$E88 will output \E88. Instead this will have to be written as $\backslash$E\{88\}, this will output \E{88}.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Setting the page to fancy}
+Before any headers or footers can be used the pages need to be set to fancy. This can be done by typing $\backslash$setpagefancy just below the import statements but not inside the $\backslash$begin\{document\} $\backslash$end\{document\}. Once the page is set to fancy the page numbering will go away, this can be added back in with the macros from this package. Before the page is set to fancy is shown in \reffigure{normal_page} and after the page is set to fancy is shown in \reffigure{fancy_page}
+
+\newfigure{Normal Page}{Normal page}{normal_page.png}{normal_page}
+
+\newfigure{Setting the page to fancy}{Output of the macro $\backslash$setpagefancy}{fancy_page.png}{fancy_page}
+
+\subsection{Headers}
+To add a header use the macro $\backslash$header\{left header\}\{center header\}\{right header\}. An example is shown in below and in \reffigure{fancy_header}.
+
+$\backslash$header\{left header\}\{center header\}\{right header\} this will display
+
+\newfigure{Adding a fancy header}{Output of the macro $\backslash$header\{left header\}\{center header\}\{right header\}}{fancy_header.png}{fancy_header}
+
+\subsection{Footers}
+To add a footer use the macro $\backslash$footer\{left footer\}\{center footer\}\{right footer\}. An example is shown below and in \reffigure{fancy_footer}.
+
+$\backslash$footer\{left footer\}\{center footer\}\{right footer\} this will display
+
+\newfigure{Adding a fancy footer}{Output of the macro $\backslash$footer\{left footer\}\{center footer\}\{right footer\}}{fancy_footer.png}{fancy_footer}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Title Page}
+To create a title page, at the beginning of the document after the $\backslash$begin\{document\} type $\backslash$newtitlepage\{Title\}\{Author\}\{Date\}
+An example is shown below and the result is shown in \reffigure{new-title-page}
+
+
+\newfigure{New title page}{Result of $\backslash$newtitlepage\{Title\}\{Author\}\{Date\}}{new_title_page.png}{new-title-page}
+
+\section{Figures}
+These macros can include figures and reference them in a tex file.
+
+\subsection{Including a Figure}
+To include a figure type $\backslash$newfigure\{Caption\}\{Description\}\{file\_ name.jpg\}\{reference\}.\\ \LaTeX \ accepts the file types pdf, jpg and png for figures. \reffigure{example-figure} is an example of using this macro.
+
+\newfigure{Example Figure}{Result of using $\backslash$newfigure\{Caption\}\{Description\}\{file name\}\{reference\}}{example_figure.jpeg}{example-figure}
+
+\subsection*{Scaling Figures}
+This macro allows you to shrink figures that are two large or expand figures that are too small.
+The macro is in the form
+
+$\backslash$newsfigure\{Caption\}\{Description\}\{file\_ name.jpg\}\{reference\}\{scale factor\}
+
+\subsubsection{Shrink Example}
+\reffigure{example-shrink-figure}, shows an example of decreasing the size of a figure.
+
+\newsfigure{Example Figure}{Result of using $\backslash$newfigure\{Caption\}\{Description\}\{file name\}\{reference\}\{0.4\}}{example_figure.jpeg}{example-shrink-figure}{0.4}
+
+\subsubsection{Expand Example}
+\reffigure{example-expand-figure}, shows an example of increasing the size of a figure.
+
+\newsfigure{Example Figure}{Result of using $\backslash$newfigure\{Caption\}\{Description\}\{file name\}\{reference\}\{1.6\}}{example_figure.jpeg}{example-expand-figure}{1.6}
+
+\subsection{Referencing a Figure}
+This macro allows figures to be referenced by simply typing $\backslash$reffigure\{reference\}. If a figure is ever added or removed, this macro will take care of the numbering so the figures are always referenced correctly. An example is shown below.
+
+$\backslash$reffigure\{example-figure\} this will output "\reffigure{example-figure}". This is the from the section of how to include a figure. Sometimes instead of displaying "\reffigure{example-figure}", instead it might display Figure ??. This can be fixed by building the tex file a second time. If this does not work then the reference inside the \{\} is wrong.
+
+
+\section{Tables}
+These macros can create normal tables, long tables and reference tables.
+The difference be normal tables and long tables is, once a normal table becomes large than the size of an entire page the extra content will be cut off so the table fits the page. However a long table when is becomes larger than an entire page the extra content will be pushed to the next page.
+
+\subsection{Creating a Table}
+To create a normal table use the macro
+
+$\backslash$newtable\{Caption\}
+\{Column Data Positioning\}
+\{Column Headings\}
+\{Table Data\}\\
+\{Reference\}
+
+It is often more readable to type the macro in the form below.
+
+$\backslash$newtable\{Caption\} \\
+\{Column Data Positioning\} \\
+\{Column Headings\} \\
+\{Table Data\} \\
+\{Reference\}
+
+An example of a normal table is show below and the output is \reftable{Normal-Table}
+
+$\backslash$newtable\{Normal Table Example\} \\
+\{lcr\} \\
+\{Left Positioned Column \& Center Positioned Column \& Right Positioned Column\} \\
+\{1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3\} \\
+\{Normal-Table\}
+
+\newtable{Normal Table Example}
+{lcr}
+{Left Positioned Column & Center Positioned Column & Right Positioned Column} {1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3}
+{Normal-Table}
+
+The "Column Data Positioning" field is required. It accepts any of the three positioning values "l = left c = center r = right", each column need to have a positioning value eg. if there are two columns the possible positions are " ll, lc, lr, cl, cc, cr, rl, rc, or rr". The positioning field is required however the other fields aren't. But to display something in the table the each field will need something.
+
+\subsection{Creating a Long Table}
+The long table macro is very similar to the normal table macro
+To create a long table use the macro
+
+$\backslash$newlongtable\{Caption\}
+\{Column Data Positioning\}
+\{Column Headings\}
+\{Table Data\}
+\{Reference\}
+
+It is often more readable to type the macro in the form below.
+
+$\backslash$newlongtable\{Caption\} \\
+\{Column Data Positioning\} \\
+\{Column Headings\} \\
+\{Table Data\} \\
+\{Reference\}
+
+An example of a long table is show below and the output is \reftable{Long-Table}
+
+$\backslash$newlongtable\{Long Table Example\} \\
+\{lcr\} \\
+\{Left Positioned Column \& Center Positioned Column \& Right Positioned Column\} \\
+\{1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3 $\backslash$ $\backslash$ \\
+1 \& 2 \& 3\} \\
+\{Long-Table\}
+
+\newlongtable{Long Table Example}
+{lcr}
+{Left Positioned Column & Center Positioned Column & Right Positioned Column}
+{1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3 \\
+1 & 2 & 3}
+{Long-Table}
+
+Clearly this table was too long to fit on the previous page so the long table macro pushes the excess to the next page. A normal table would have cut off the excess and wouldn't have displayed it.
+
+The column positioning for a long table is the same as for a normal table.
+
+\subsection{Referencing a Table}
+To reference a table the macro $\backslash$reftable\{reference\} can be used. If a table is ever added or removed, this macro will take care of the numbering so the tables are always referenced correctly.
+Below is an example of referencing tables.
+
+$\backslash$reftable\{Normal-Table\} is the example normal table used in this manual.
+This will output "\reftable{Normal-Table} is the example normal table used in this manual."
+
+Another example is shown below
+
+$\backslash$reftable\{Long-Table\} is the example long table used in this manual.
+This will output "\reftable{Long-Table} is the example normal table used in this manual."
+
+\section{Boxing Content}
+To place a box around content simply use the macro $\backslash$boxanswer\{Content To be boxed\} this will output
+
+\boxanswer{Content To be boxed}
+
+The words are joined together and displayed differently because this macro is already in math mode. So to display normal text use the $\backslash$text\{\} macro. So the previous example an be written as
+
+$\backslash$boxanswer\{$\backslash$text\{Content To be boxed\}\}
+This will display
+
+\boxanswer{\text{Content To be boxed}}
+
+Most of the time this will be used to box an answer to a maths question. An example of this is shown below.
+
+$\backslash$boxanswer\{$y = mx + c \\
+E = mc^2\\
+E = hf$\}
+
+This will out put
+
+\boxanswer{y = mx + c \\
+E = mc^2\\
+E = hf}
+
+\section{Other Macros}
+
+\subsection{Shift}
+The shift macro allows you to shift content left or right. $\backslash$shift\{shift amount in cm\}\{content to be shifted\}.
+
+Tables can be shifted.
+
+\subsection{Good Footer}
+
+The $\backslash$goodfoot macro will do the footer for you in the form "Page x of n". The page mus be set to fancy first though using the $\backslash$setpagefancy macro.
+
+\section{Appendices}
+
+\subsection{Appendix A - List of Figures}
+
+\listoffigures
+
+\subsection{Appendix B - List of Tables}
+
+\listoftables
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/pythontex/NEWS.rst b/macros/latex/contrib/pythontex/NEWS.rst
index 016a740794..b0eccb7df5 100644
--- a/macros/latex/contrib/pythontex/NEWS.rst
+++ b/macros/latex/contrib/pythontex/NEWS.rst
@@ -7,6 +7,57 @@ Version History
===============
+v0.17 (2019/09/22)
+------------------
+
+* Pygments syntax highlighting for the Python console (``pycon`` lexer) now
+ uses the ``python3`` option, and the default Python lexer is now
+ ``python3`` (#156).
+
+* Added support for JavaScript (#147; thanks to Nathan Carter).
+
+* Updated Julia support for Julia versions 0.6 (#107), and 0.7 and 1.0 (#126,
+ #130).
+
+* There are now meaningful error messages for the Julia console when Weave.jl
+ is not installed or raises errors (#131).
+
+* ``pythontexcustomcode`` and ``\pythontexcustomc`` now set
+ ``pytex.context`` (#65).
+
+* Added support for R. The ``R`` family of commands and environments
+ (``\R``, ``\Rc``, ``Rcode``, ...) executes code as a script.
+ There is currently no utilities class or equivalent. The ``Rcon`` family
+ (``Rconsole``) executes code to emulate an interactive R session (#121).
+
+* ``fancyvrb`` settings from ``\setpythontexfv`` and console
+ environments now work with Julia and R consoles.
+
+* ``pythontexcustomcode`` now works with ``juliacon``. There are now proper
+ ``juliaconcode`` and ``Rconcode`` environments that execute code but
+ typeset nothing, to parallel ``pyconcode`` (#134).
+
+* Added support for Perl with the ``perl`` and ``pl`` families of commands
+ and environments. There is currently no utilities class or equivalent.
+
+* Added support for Perl 6 with the ``perlsix`` and ``psix`` families of
+ commands and environments (#104). There is currently no utilities class or
+ equivalent.
+
+* Updated Rust support by using ``dyn`` with traits in utilities object.
+
+* Under Windows, capitalization of script paths in ``stderr`` is now
+ preserved.
+
+* Fixed a bug that prevented the ``sub`` environment from working with
+ ``depythontex`` (#155).
+
+* Fixed a bug in checking mtime of dependencies to see if they have been
+ modified while ``pythontex`` is running. The check failed for dependencies
+ that do not exist or were deleted before ``pythontex`` can read them
+ (#136).
+
+
v0.16 (2017/07/20)
------------------
diff --git a/macros/latex/contrib/pythontex/README b/macros/latex/contrib/pythontex/README
index 5625993676..3994eca34c 100644
--- a/macros/latex/contrib/pythontex/README
+++ b/macros/latex/contrib/pythontex/README
@@ -3,15 +3,16 @@
===================================================================
:Author: Geoffrey Poore
-:Version: 0.16 (2017/07/20)
+:Version: 0.17 (2019/09/22)
:License: LPPL v1.3 or later (LaTeX code) and BSD 3-Clause (Python code)
:Development: https://github.com/gpoore/pythontex
:Requirements: Python 2.7 or 3.2+; Pygments
-The PythonTeX package allows you to enter Python code within a LaTeX
-document, execute the code, and access its output in the original document.
-It also supports the Ruby, Julia, Octave, Sage, Bash, and Rust languages.
+The PythonTeX package allows you to enter Python code within a LaTeX document,
+execute the code, and access its output in the original document. It also
+supports the Ruby, Julia, Octave, Sage, Bash, Rust, R, Perl, Perl 6, and
+JavaScript languages.
PythonTeX provides fast, user-friendly access to Python from within LaTeX.
Python code is only executed when it has been modified, or when it meets
diff --git a/macros/latex/contrib/pythontex/depythontex2.py b/macros/latex/contrib/pythontex/depythontex2.py
index 7687e0e724..f49fd22977 100644
--- a/macros/latex/contrib/pythontex/depythontex2.py
+++ b/macros/latex/contrib/pythontex/depythontex2.py
@@ -86,7 +86,7 @@ import codecs
# Script parameters
# Version
-__version__ = '0.16'
+__version__ = '0.17'
# Functions and parameters for customizing the script output
diff --git a/macros/latex/contrib/pythontex/depythontex3.py b/macros/latex/contrib/pythontex/depythontex3.py
index bdcea2185e..2d86edb591 100644
--- a/macros/latex/contrib/pythontex/depythontex3.py
+++ b/macros/latex/contrib/pythontex/depythontex3.py
@@ -86,7 +86,7 @@ import codecs
# Script parameters
# Version
-__version__ = '0.16'
+__version__ = '0.17'
# Functions and parameters for customizing the script output
diff --git a/macros/latex/contrib/pythontex/pythontex.dtx b/macros/latex/contrib/pythontex/pythontex.dtx
index d91e6e1eac..f18d8d3fae 100644
--- a/macros/latex/contrib/pythontex/pythontex.dtx
+++ b/macros/latex/contrib/pythontex/pythontex.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2012-2017 by Geoffrey M. Poore <gpoore@gmail.com>
+% Copyright (C) 2012-2019 by Geoffrey M. Poore <gpoore@gmail.com>
% ---------------------------------------------------------------------------
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{pythontex}
%<*package>
- [2017/07/20 v0.16 execute and typeset Python code and other languages]
+ [2019/09/22 v0.17 execute and typeset Python code and other languages]
%</package>
%
%<*driver>
@@ -40,6 +40,20 @@
\usepackage{environ}
\usepackage{enumitem}
\usepackage{fvextra}
+% The typesetting for macrocode doesn't use \@noligs, which upquote modifies.
+% So apply the upquote fix to \verbatim@nolig@list as well, which is in macrocode.
+\begingroup
+\catcode`'=\active
+\catcode``=\active
+\g@addto@macro\verbatim@nolig@list{%
+ \let'\textquotesingle
+ \let`\textasciigrave
+ \ifx\encodingdefault\upquote@OTone
+ \ifx\ttdefault\upquote@cmtt
+ \def'{\char13 }%
+ \def`{\char18 }%
+ \fi\fi}
+\endgroup
\usepackage{pythontex}
\usepackage{hyperref}
\hypersetup{
@@ -134,7 +148,7 @@
%</driver>
% \fi
%
-% \CheckSum{3218}
+% \CheckSum{3289}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -153,7 +167,27 @@
% Right brace \} Tilde \~}
%
%
-
+%
+% \begin{changelog}{v0.17}{2019/09/22}
+% \begin{itemize}
+% \item Pygments syntax highlighting for the Python console (\texttt{pycon} lexer) now uses the \texttt{python3} option, and the default Python lexer is now \texttt{python3} (\#156).
+% \item Added support for JavaScript (\#147; thanks to Nathan Carter).
+% \item Updated Julia support for Julia versions 0.6 (\#107), and 0.7 and 1.0 (\#126, \#130).
+% \item There are now meaningful error messages for the Julia console when Weave.jl is not installed or raises errors (\#131).
+% \item \texttt{pythontexcustomcode} and \texttt{\string\pythontexcustomc} now set \texttt{pytex.context} (\#65).
+% \item Added support for R. The \texttt{R} family of commands and environments (\texttt{\string\R}, \texttt{\string\Rc}, \texttt{Rcode}, ...) executes code as a script. There is currently no utilities class or equivalent. The \texttt{Rcon} family (\texttt{Rconsole}) executes code to emulate an interactive R session (\#121).
+% \item \texttt{fancyvrb} settings from \texttt{\string\setpythontexfv} and console environments now work with Julia and R consoles.
+% \item \texttt{pythontexcustomcode} now works with \texttt{juliacon}. There are now proper \texttt{juliaconcode} and \texttt{Rconcode} environments that execute code but typeset nothing, to parallel \texttt{pyconcode} (\#134).
+% \item Added support for Perl with the \texttt{perl} and \texttt{pl} families of commands and environments. There is currently no utilities class or equivalent.
+% \item Added support for Perl 6 with the \texttt{perlsix} and \texttt{psix} families of commands and environments (\#104). There is currently no utilities class or equivalent.
+% \item Updated Rust support by using \texttt{dyn} with traits in utilities object.
+% \item Under Windows, capitalization of script paths in \texttt{stderr} is now preserved.
+% \item Fixed a bug that prevented the \texttt{sub} environment from working with \texttt{depythontex} (\#155).
+% \item Fixed a bug in checking mtime of dependencies to see if they have been modified while \texttt{pythontex} is running. The check failed for dependencies that do not exist or were deleted before \texttt{pythontex} can read them (\#136).
+% \end{itemize}
+% \end{changelog}
+%
+%
% \begin{changelog}{v0.16}{2017/07/20}
% \begin{itemize}
% \item Added preliminary console support for Julia (\#98).
@@ -436,8 +470,9 @@
%
% Because documents that use \pytex\ mix \LaTeX\ and Python code, they are less suitable than plain \LaTeX\ documents for journal submission, sharing, and conversion to other formats. \pytex\ includes a |depythontex| utility that creates a copy of a document in which all \pytex\ content is replaced by its output.
%
-% While Python is the focus of \pytex, adding basic support for an additional language is usually as simple as creating a new class instance and a few templates, usually totaling less than 100 lines of code. The following languages already have built-in support: Ruby, Julia, and Octave.
+% While Python is the focus of \pytex, adding basic support for an additional language is usually as simple as creating a new class instance and a few templates, usually totaling less than 100 lines of code. The following languages already have built-in support: Ruby, Julia, Octave, Bash, Rust, R, Perl, Perl 6, and JavaScript.
% \end{abstract}
+%
%
%
% \section*{\centering Warning}
@@ -660,7 +695,7 @@
%
% \DescribeMacro{usefamily=\meta{basename}/\marg{basename1,~basename2,~...}}
%
-% By default, only the |py|, |sympy|, and |pylab| families of commands and environments are defined, to prevent possible package conflicts.\footnote{For example, a \texttt{\string\ruby} command for Ruby code, and the \texttt{\string\ruby} command defined by the Ruby package in the \href{http://www.ctan.org/pkg/cjk}{CJK package}.} This option defines preconfigured families for other available languages. It takes either a single language base name, or a list of comma-separated names enclosed in curly braces. Currently, the Ruby families |rb| and |ruby|, the Julia families |jl| and |julia|, and the Octave family |octave| may be created.
+% By default, only the |py|, |sympy|, and |pylab| families of commands and environments are defined, to prevent possible package conflicts.\footnote{For example, a \texttt{\string\ruby} command for Ruby code, and the \texttt{\string\ruby} command defined by the Ruby package in the \href{http://www.ctan.org/pkg/cjk}{CJK package}.} This option defines preconfigured families for other available languages. It takes either a single language base name, or a list of comma-separated names enclosed in curly braces. For example, the Ruby families |rb| and |ruby|, the Julia families |jl| and |julia|, and the Octave family |octave| may be enabled. For a full list of supported languages, see \Cref{sec:other-languages}.
%
%
% \DescribeMacro{gobble=none/auto default:none}
@@ -1519,11 +1554,13 @@
% \section{Support for additional languages}
% \label{sec:other-languages}
%
-% Beginning with v0.12, it is much simpler to add support for languages beyond Python. Support for several additional languages will be added in coming months.
+% Details about adding support for additional languages are in \Cref{sec:other-languages:adding}. This section begins with a brief overview of supported languages and available features.
%
-% In the immediate future, support for additional languages will be part of \pytex. Later, it may make sense to provide an alternative interface for other languages. For example, a package could be created that provides access to \pytex\ internals in a language-agnostic manner, without having the word ``python'' as part of the command names.
-%
-% Languages beyond Python will typically not be enabled by default, to prevent potential macro naming conflicts with other packages. At least two possible base names for commands and environments will be provided for each language. Typically these will be the name of the language and the language's file extension. For example, Ruby has the |ruby| and |rb| base names. You can choose which base name to use for creating a family of commands and environments based on personal preference and potential naming conflicts.
+% Languages beyond Python are typically not be enabled by default to prevent potential macro naming conflicts with other packages. Languages are enabled via the |usefamily| package option (\Cref{sec:usage}). For example,
+%\begin{verbatim}
+%\usepackage[usefamily=ruby]{pythontex}
+%\end{verbatim}
+% Usually at least two possible base names for commands and environments will be provided for each language. Typically these will be the name of the language and the language's file extension. For example, Ruby has the |ruby| and |rb| base names. You can choose which base name to use for creating a family of commands and environments based on personal preference and potential naming conflicts.
%
%
% \subsection{Ruby}
@@ -1549,7 +1586,7 @@
%
% \subsubsection*{Console}
%
-% Preliminary Julia console support was added in v0.16, under the base name |juliacon|. Unlike the Python console environments that allow invalid input, currently everything entered in a |juliaconsole| environment must be valid. The Julia console uses \href{https://github.com/mpastell/Weave.jl}{\textsf{Weave.jl}} internally to evaluate code, and it currently does not support invalid input.
+% Julia console support was added in v0.16. It may be enabled by loading \pytex\ with |usefamily=juliacon|. The |juliaconsole| environment uses \href{https://github.com/mpastell/Weave.jl}{\textsf{Weave.jl}} internally to evaluate code. There is also a |juliaconcode| environment that executes code but typesets nothing.
%
%
% \subsection{Octave}
@@ -1587,7 +1624,40 @@
% Additionally, when using |\rust| and |\rs|, keep in mind that these wrap code in a block, so you \emph{cannot} use |rstex| by value in these contexts (both shared and mutable references are still fine, though).
%
%
+% \subsection{R}
+%
+% Support for R was added in v0.17.
+%
+% Loading \pytex\ with |usefamily=R| enables the |R| family of commands and environments (|\R|, |\Rc|, |Rcode|, ...). These execute code with |Rscript|. The |methods| library is loaded automatically as part of the template code. Expressions passed to the |\R| command are converted into strings via |toString()|. There is currently no utilities class or related features. A null graphics device, |pdf(file=NULL)|, is created by default to avoid the automatic, unintentional creation of plot files with default names. Plots that are to be saved require explicit graphics commands.
+%
+% \subsubsection*{Console}
+%
+% Loading \pytex\ with |usefamily=Rcon| enables the |Rconsole| environment, which executes code to emulate an interactive R session. There is also an |Rconcode| environment that executes code but typesets nothing. Code is executed with |Rscript|. The |methods| library is loaded automatically as part of the template code. The option |echo=TRUE| is used to intersperse code with output, while |error=function(){}| is used to avoid halting on errors. A null graphics device, |pdf(file=NULL)|, is created by default to avoid the automatic, unintentional creation of plot files with default names. Plots that are to be saved require explicit graphics commands.
+%
+%
+% \subsection{Perl}
+%
+% Support for Perl was added in v0.17.
+%
+% Loading \pytex\ with |usefamily=perl| enables the |perl| family of commands and environments. Alternatively, |usefamily=pl| may be used to enable the |pl| family. There is currently no utilities class or related features.
+%
+%
+% \subsection{Perl 6}
+%
+% Support for Perl 6 was added in v0.17.
+%
+% Loading \pytex\ with |usefamily=perlsix| enables the |perlsix| family of commands and environments. Alternatively, |usefamily=psix| may be used to enable the |psix| family. There is currently no utilities class or related features.
+%
+%
+% \subsection{JavaScript}
+%
+% Support for JavaScript was added in v0.17.
+%
+% Loading \pytex\ with |usefamily=javascript| enables the |javascript| family of commands and environments. Alternatively, |usefamily=js| may be used to enable the |js| family. There is a utilities object |jstex|.
+%
+%
% \subsection{Adding support for a new language}
+% \label{sec:other-languages:adding}
%
% Adding support for an additional language involves creating two templates, creating a new instance of a class, and using a \pytex\ macro. In some cases, additional changes may be necessary for full support. The information below does not deal with creating |console| families; additional support for user-defined |console| families will be added in the future.
%
@@ -1794,6 +1864,8 @@
%
% Thanks to Alexander Altman for suggesting Rust support and providing template code.
%
+% Thanks to Nathan Carter for suggesting JavaScript support and providing template code.
+%
%
% \PrintChangelog
%
@@ -1813,7 +1885,7 @@
% We store the name of the package in a macro for later use in warnings and error messages.
% \begin{macrocode}
\newcommand{\pytx@packagename}{PythonTeX}
-\newcommand{\pytx@packageversion}{0.16}
+\newcommand{\pytx@packageversion}{0.17}
% \end{macrocode}
%
% \subsection{Required packages}
@@ -3349,7 +3421,7 @@
}%
\xdef\pytx@type{CC:#2:#1}%
\edef\pytx@cmd{c}%
- \def\pytx@context{}%
+ \pytx@SetContext
\def\pytx@group{none}%
\let\pytx@InlineShow\@empty
\let\pytx@InlineSave\pytx@InlineSaveCode
@@ -3683,6 +3755,22 @@
}%
{\end{VerbatimOut}%
\xdef\pytx@stdfile{\pytx@type_\pytx@session_\pytx@group_\arabic{\pytx@counter}}%
+ \ifcsname pytx@nonpyconsole@\pytx@type\endcsname
+ \ifcsname pytx@code@as@console\endcsname
+ \setcounter{FancyVerbLine}{\value{\pytx@linecount}}%
+ \pytx@FVSet
+ \ifdefstring{\pytx@fvopttmp}{}{}{\expandafter\fvset\expandafter{\pytx@fvopttmp}}%
+ \pytx@ConfigPygments
+ \InputIfFileExists{\pytx@outputdir/\pytx@stdfile.stdout}%
+ {\DepyFile{p:\pytx@outputdir/\pytx@stdfile.stdout}}%
+ {\par\textbf{??~\pytx@packagename~??}\par
+ \PackageWarning{\pytx@packagename}{Non-existent console content}}%
+ \setcounter{\pytx@linecount}{\value{FancyVerbLine}}%
+ \else
+ \fi
+ \let\pytx@EnvAutoprint\relax
+ \else
+ \fi
\setcounter{FancyVerbLine}{\value{pytx@FancyVerbLineTemp}}%
\stepcounter{\pytx@counter}%
\pytx@EnvAutoprint
@@ -3699,6 +3787,8 @@
\ifstrempty{#1}{\edef\pytx@session{default}}{\StrSubstitute{#1}{:}{-}[\pytx@session]}%
\xdef\pytx@counter{pytx@\pytx@type @\pytx@session @\pytx@group}%
\pytx@CheckCounter{\pytx@counter}%
+ \edef\pytx@linecount{\pytx@counter @line}%
+ \pytx@CheckCounter{\pytx@linecount}%
\pytx@WriteCodefileInfo
\begingroup
\obeylines
@@ -3712,6 +3802,8 @@
% As described above, this macro captures a second optional argument, if present, and then starts the |VerbatimOut| environment. Note that |VerbatimOut| does not have a mandatory argument, because we are invoking our custom |\pytx@FVB@VerbatimOut| macro. The default |fancyvrb| macro needs an argument to tell it the name of the file to which to save the verbatim content. But in our case, we are always writing to the same file, and the custom macro accounts for this by not having a mandatory file name argument. We must perform the typical |FancyVerbLine| trickery, to prevent the |fancyvrb| line counter from being affected by \textbf{writing} content!
% \begin{macrocode}
\def\pytx@BeginCodeEnv@i[#1]{%
+ \def\pytx@fvopttmp{#1}%
+ \def\pytx@argspprint{#1}%
\setcounter{pytx@FancyVerbLineTemp}{\value{FancyVerbLine}}%
\let\FVB@VerbatimOut\pytx@FVB@VerbatimOut
\let\FVE@VerbatimOut\pytx@FVE@VerbatimOut
@@ -3742,7 +3834,7 @@
}%
\xdef\pytx@type{CC:#2:#1}%
\edef\pytx@cmd{code}%
- \def\pytx@context{}%
+ \pytx@SetContext
\def\pytx@group{none}%
\pytx@BeginCodeEnv[none]}%
{\end{VerbatimOut}%
@@ -3763,7 +3855,7 @@
\newcommand{\pytx@MakeSubFV}[1]{%
\expandafter\newenvironment{#1sub}{%
\VerbatimEnvironment
- \Depythontex{env:#1sub:om|:p}%
+ \Depythontex{env:#1sub:oo|:p}%
\xdef\pytx@type{#1}%
\edef\pytx@cmd{sub}%
\pytx@SetContext
@@ -4000,6 +4092,34 @@
% \end{macrocode}
% \end{macro}
%
+%
+% \begin{macro}{\makepythontexfamily@con}
+% This macro creates |console| and |code| environments for non-Python consoles. \pytex\ was not designed with commands and environments for non-Python consoles. Non-Python consoles are currently created via specially customized |code| environments. Note that simply creating these |console| and |code| environments is typically not enough to create non-Python consoles; |pythontex2.py| and |pythontex3.py| usually also require customization. This macro's definition should not be treated as stable; it will change in the future. The ultimate long-term goal is to eliminate it entirely, by redesigning the code execution core of \pytex\ to accomodate non-Python consoles more easily.
+% \begin{macrocode}
+\newcommand{\makepythontexfamily@con}[2][text]{%
+ \pgfkeys{/PYTX/family, name=#2con, default, pyglexer=#1, console=true}%
+ \expandafter\xdef\csname pytx@macroformatter@#2con\endcsname{\pytx@tmp@pprinter}%
+ \expandafter\gdef\csname pytx@fvsettings@#2con\endcsname{}%
+ \expandafter\xdef\csname pytx@pyglexer@#2con\endcsname{\pytx@tmp@pyglexer}%
+ \expandafter\xdef\csname pytx@pygopt@#2con\endcsname{\pytx@tmp@pygopt}%
+ \expandafter\xdef\csname pytx@console@#2con\endcsname{\pytx@tmp@console}%
+ \AtEndDocument{\immediate\write\pytx@codefile{pygfamily=#2con|%
+ \csname pytx@pyglexer@#2con\endcsname|%
+ \csname pytx@pygopt@#2con\endcsname}%
+ }%
+ \pytx@MakeCodeFV{#2con}%
+ \expandafter\global\expandafter\let\csname pytx@nonpyconsole@#2con\endcsname\relax
+ \newenvironment{#2console}%
+ {\VerbatimEnvironment
+ \def\pytx@type{#2con}%
+ \let\pytx@code@as@console\relax
+ \begin{#2concode}}%
+ {\end{#2concode}}%
+}
+% \end{macrocode}
+% \end{macro}
+
+%
% \begin{macro}{\setpythontexpyglexer}
% We need to be able to reset the lexer associated with a family after the family has already been created.
% \begin{macrocode}
@@ -4068,11 +4188,11 @@
%
% All of these command and environment families are created conditionally, depending on whether the package option |pygments| is used, via |\makepythontexfamily|. We recommend that any custom families created by the user be constructed in the same manner.
% \begin{macrocode}
-\makepythontexfamily[pyglexer=python]{py}
+\makepythontexfamily[pyglexer=python3]{py}
\makepythontexfamily[pyglexer=pycon, console=true]{pycon}
-\makepythontexfamily[pyglexer=python]{sympy}
+\makepythontexfamily[pyglexer=python3]{sympy}
\makepythontexfamily[pyglexer=pycon, console=true]{sympycon}
-\makepythontexfamily[pyglexer=python]{pylab}
+\makepythontexfamily[pyglexer=python3]{pylab}
\makepythontexfamily[pyglexer=pycon, console=true]{pylabcon}
% \end{macrocode}
% We also need to create any additional families specified via the |usefamily| package option.\footnote{The loop here is accomplished via \texttt{etoolbox}. \texttt{pgffor} might be an alternative, but making definitions global requires trickery.}
@@ -4081,24 +4201,7 @@
\ifstrequal{#1}{ruby}{\makepythontexfamily[pyglexer=ruby]{ruby}}{}%
\ifstrequal{#1}{rb}{\makepythontexfamily[pyglexer=ruby]{rb}}{}%
\ifstrequal{#1}{julia}{\makepythontexfamily[pyglexer=julia]{julia}}{}%
- \ifstrequal{#1}{juliacon}{\pgfkeys{/PYTX/family, name=juliacon, default, pyglexer=jlcon}%
- \expandafter\xdef\csname pytx@macroformatter@juliacon\endcsname{\pytx@tmp@pprinter}%
- \expandafter\gdef\csname pytx@fvsettings@juliacon\endcsname{}%
- \expandafter\xdef\csname pytx@pyglexer@juliacon\endcsname{\pytx@tmp@pyglexer}%
- \expandafter\xdef\csname pytx@pygopt@juliacon\endcsname{\pytx@tmp@pygopt}%
- \expandafter\xdef\csname pytx@console@juliacon\endcsname{\pytx@tmp@console}%
- \AtEndDocument{\immediate\write\pytx@codefile{pygfamily=juliacon|%
- \csname pytx@pyglexer@juliacon\endcsname|%
- \csname pytx@pygopt@juliacon\endcsname}%
- }%
- \pytx@MakeCodeFV{juliacon}%
- \newenvironment{juliaconsole}%
- {\VerbatimEnvironment
- \def\pytx@type{juliacon}%
- \pytx@ConfigPygments
- \begin{juliaconcode}}%
- {\end{juliaconcode}%
- \ifbool{pytx@opt@autoprint}{}{\printpythontex{}}}}{}%
+ \ifstrequal{#1}{juliacon}{\makepythontexfamily@con[jlcon]{julia}}{}%
\ifstrequal{#1}{jl}{\makepythontexfamily[pyglexer=julia]{jl}}{}%
\ifstrequal{#1}{matlab}{\makepythontexfamily[pyglexer=matlab]{matlab}}{}%
\ifstrequal{#1}{octave}{\makepythontexfamily[pyglexer=octave]{octave}}{}%
@@ -4106,6 +4209,14 @@
\ifstrequal{#1}{sage}{\makepythontexfamily[pyglexer=sage]{sage}}{}%
\ifstrequal{#1}{rust}{\makepythontexfamily[pyglexer=rust]{rust}}{}%
\ifstrequal{#1}{rs}{\makepythontexfamily[pyglexer=rust]{rs}}{}%
+ \ifstrequal{#1}{R}{\makepythontexfamily[pyglexer=r]{R}}{}%
+ \ifstrequal{#1}{Rcon}{\makepythontexfamily@con[rconsole]{R}}{}%
+ \ifstrequal{#1}{perl}{\makepythontexfamily[pyglexer=perl]{perl}}{}%
+ \ifstrequal{#1}{pl}{\makepythontexfamily[pyglexer=perl]{pl}}{}%
+ \ifstrequal{#1}{perlsix}{\makepythontexfamily[pyglexer=perl6]{perlsix}}{}%
+ \ifstrequal{#1}{psix}{\makepythontexfamily[pyglexer=perl6]{psix}}{}%
+ \ifstrequal{#1}{javascript}{\makepythontexfamily[pyglexer=js]{javascript}}{}%
+ \ifstrequal{#1}{js}{\makepythontexfamily[pyglexer=js]{js}}{}%
}
\expandafter\docsvlist\expandafter{\pytx@families}
% \end{macrocode}
diff --git a/macros/latex/contrib/pythontex/pythontex.ins b/macros/latex/contrib/pythontex/pythontex.ins
index 605cf4cc9b..aab14011f7 100644
--- a/macros/latex/contrib/pythontex/pythontex.ins
+++ b/macros/latex/contrib/pythontex/pythontex.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2012-2016 by Geoffrey M. Poore <gpoore@gmail.com>
+%% Copyright (C) 2012-2019 by Geoffrey M. Poore <gpoore@gmail.com>
%% --------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
This is a generated file.
-Copyright (C) 2012-2016 by Geoffrey M. Poore <gpoore@gmail.com>
+Copyright (C) 2012-2019 by Geoffrey M. Poore <gpoore@gmail.com>
--------------------------------------------------------------------------
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/pythontex/pythontex.pdf b/macros/latex/contrib/pythontex/pythontex.pdf
index bd919b5a55..ad9183d3ac 100644
--- a/macros/latex/contrib/pythontex/pythontex.pdf
+++ b/macros/latex/contrib/pythontex/pythontex.pdf
Binary files differ
diff --git a/macros/latex/contrib/pythontex/pythontex2.py b/macros/latex/contrib/pythontex/pythontex2.py
index 871d394e37..34e151f417 100644
--- a/macros/latex/contrib/pythontex/pythontex2.py
+++ b/macros/latex/contrib/pythontex/pythontex2.py
@@ -13,7 +13,7 @@ should be in the same directory.
Licensed under the BSD 3-Clause License:
-Copyright (c) 2012-2017, Geoffrey M. Poore
+Copyright (c) 2012-2019, Geoffrey M. Poore
All rights reserved.
@@ -62,6 +62,7 @@ from pygments.styles import get_all_styles
from pythontex_engines import *
import textwrap
import platform
+import itertools
if sys.version_info[0] == 2:
try:
@@ -77,7 +78,7 @@ else:
# Script parameters
# Version
-__version__ = '0.16'
+__version__ = '0.17'
@@ -1213,9 +1214,13 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
# Must double-escape any backslashes so that they survive `shlex.split()`
script = basename
if os.path.isabs(os.path.expanduser(os.path.normcase(outputdir))):
- script_full = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(outputdir, basename))
else:
- script_full = os.path.expanduser(os.path.normcase(os.path.join(orig_cwd, outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(orig_cwd, outputdir, basename))
+ if platform.system() == 'Windows':
+ script_full = script_full.replace('/', '\\')
+ else:
+ script_full = script_full.replace('\\', '/')
# `shlex.split()` only works with Unicode after 2.7.2
if (sys.version_info.major == 2 and sys.version_info.micro < 3):
exec_cmd = shlex.split(bytes(command.format(file=script.replace('\\', '\\\\'), File=script_full.replace('\\', '\\\\'))))
@@ -1275,7 +1280,11 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
for key in code_dict:
family = key.split('#')[0]
# Uncomment the following for debugging, and comment out what follows
- '''run_code(encoding, outputdir, workingdir, code_dict[key],
+ '''run_code(encoding, outputdir,
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
engine_dict[family].language,
engine_dict[family].commands,
engine_dict[family].created,
@@ -1287,9 +1296,12 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
engine_dict[family].linenumbers,
engine_dict[family].lookbehind,
keeptemps, hashdependencies,
- pygments_settings)'''
+ pygments_settings]))'''
tasks.append(pool.apply_async(run_code, [encoding, outputdir,
- workingdir, code_dict[key],
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
engine_dict[family].language,
engine_dict[family].commands,
engine_dict[family].created,
@@ -1412,7 +1424,7 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
unresolved_sessions = []
for key in dependencies:
for dep, val in dependencies[key].items():
- if val[0] > start_time:
+ if val[0] is None or val[0] > start_time:
unresolved_dependencies = True
dependencies[key][dep] = (None, None)
unresolved_sessions.append(key.replace('#', ':'))
@@ -1474,7 +1486,8 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
-def run_code(encoding, outputdir, workingdir, code_list, language, commands,
+def run_code(encoding, outputdir, workingdir,
+ cc_begin_list, code_list, cc_end_list, language, commands,
command_created, extension, makestderr, stderrfilename,
code_index, errorsig, warningsig, linesig, stderrlookbehind,
keeptemps, hashdependencies, pygments_settings):
@@ -1512,11 +1525,19 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
err_file_name = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename + '.err')))
out_file = open(out_file_name, 'w', encoding=encoding)
err_file = open(err_file_name, 'w', encoding=encoding)
- script = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename)))
+ script = os.path.expanduser(os.path.join(outputdir, basename))
+ if platform.system() == 'Windows':
+ script = script.replace('/', '\\')
+ else:
+ script = script.replace('\\', '/')
if os.path.isabs(script):
script_full = script
else:
- script_full = os.path.expanduser(os.path.normcase(os.path.join(os.getcwd(), outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(os.getcwd(), outputdir, basename))
+ if platform.system() == 'Windows':
+ script_full = script_full.replace('/', '\\')
+ else:
+ script_full = script_full.replace('\\', '/')
# #### Need to revise so that intermediate files can be detected and cleaned up
for f in command_created:
files.append(f.format(file=script, File=script_full))
@@ -1535,7 +1556,10 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# Add any created files due to the command
# This needs to be done before attempts to execute, to prevent orphans
try:
- proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file)
+ if family != 'Rcon':
+ proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file)
+ else:
+ proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=subprocess.STDOUT)
except WindowsError as e:
if e.errno == 2:
# Batch files won't be found when called without extension. They
@@ -1546,7 +1570,10 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# under Windows; a list is not required.
exec_cmd_string = ' '.join(exec_cmd)
exec_cmd_string = 'cmd /C "@echo off & call {0} & if errorlevel 1 exit 1"'.format(exec_cmd_string)
- proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file)
+ if family != 'Rcon':
+ proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file)
+ else:
+ proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=subprocess.STDOUT)
else:
raise
@@ -1567,15 +1594,21 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
messages.append('* PythonTeX error')
messages.append(' Missing output file for ' + key_run.replace('#', ':'))
errors += 1
+ elif family == 'juliacon' and proc.returncode == 1:
+ messages.append('* PythonTeX error')
+ messages.append(' Running code for Julia console failed')
+ with open(err_file_name, encoding='utf8') as f:
+ messages.append(f.read())
+ errors += 1
else:
if family == 'juliacon':
with open(out_file_name.rsplit('.', 1)[0] + '.tex', 'r', encoding=encoding) as f:
tex_data_lines = f.readlines()
- inst = 0
+ code_iter = itertools.chain(cc_begin_list, code_list, cc_end_list)
for n, line in enumerate(tex_data_lines):
if line.rstrip() == '\\begin{juliaterm}':
- tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(inst)
- inst += 1
+ c = next(code_iter)
+ tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(c.instance)
if n != 0:
tex_data_lines[n-1] = ''
if line.rstrip() == '\\end{juliaterm}':
@@ -1583,6 +1616,29 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
tex_data_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n')
with open(out_file_name, 'w', encoding=encoding) as f:
f.write(''.join(tex_data_lines))
+ elif family == 'Rcon':
+ with open(out_file_name, 'r', encoding=encoding) as f:
+ stdout_lines = f.readlines()
+ for n, line in enumerate(stdout_lines):
+ if line.startswith('> =>PYTHONTEX:'):
+ stdout_lines[n] = line[2:]
+ elif '> write("=>PYTHONTEX:' in line:
+ if line.startswith('> write("=>PYTHONTEX:'):
+ stdout_lines[n] = ''
+ else:
+ # cat() and similar functions can result in the
+ # prompt not being at the start of a new line. In
+ # that case, preserve the prompt to accurately
+ # emulate the console. If there is a following
+ # console environment, this effectively amounts
+ # to adding an extra empty line (pressing ENTER)
+ # between the two.
+ stdout_lines[n] = line.split('write("=>PYTHONTEX:', 1)[0]
+ while stdout_lines and (stdout_lines[-1].startswith('>') and not stdout_lines[-1][1:].strip(' \n')):
+ stdout_lines.pop()
+ stdout_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n')
+ with open(out_file_name, 'w', encoding=encoding) as f:
+ f.write(''.join(stdout_lines))
f = open(out_file_name, 'r', encoding=encoding)
out = f.read()
@@ -1640,7 +1696,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
else:
dependencies[dep] = (os.path.getmtime(dep_file), '')
- if family == 'juliacon':
+ if family in ('juliacon', 'Rcon'):
from pygments import highlight
from pygments.lexers import get_lexer_by_name
from pygments.formatters import LatexFormatter
@@ -1655,16 +1711,21 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
for block in out.split('=>PYTHONTEX:STDOUT#')[1:]:
if block:
delims, content = block.split('#\n', 1)
+ if content and not content.endswith('\n'):
+ # Content might not end with a newline. For example,
+ # Rcon with something like cat() as the last function.
+ content += '\n'
instance, command = delims.split('#')
if content or command in ('s', 'sub'):
if instance.endswith('CC'):
- messages.append('* PythonTeX warning')
- messages.append(' Custom code for "' + family + '" attempted to print or write to stdout')
- messages.append(' This is not supported; use a normal code command or environment')
- messages.append(' The following content was written:')
- messages.append('')
- messages.extend([' ' + l for l in content.splitlines()])
- warnings += 1
+ if family not in ('juliacon', 'Rcon'):
+ messages.append('* PythonTeX warning')
+ messages.append(' Custom code for "' + family + '" attempted to print or write to stdout')
+ messages.append(' This is not supported; use a normal code command or environment')
+ messages.append(' The following content was written:')
+ messages.append('')
+ messages.extend([' ' + l for l in content.splitlines()])
+ warnings += 1
elif command == 'i':
content = r'\pytx@SVMCR{pytx@MCR@' + key_run.replace('#', '@') + '@' + instance + '}\n' + content.rstrip('\n') + '\\endpytx@SVMCR\n\n'
macros.append(content)
@@ -1682,7 +1743,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# Remove newline added by printing, prevent
# LaTeX from adding a space after content
content = content.rsplit('\n', 1)[0] + '\\endinput\n'
- if family == 'juliacon':
+ if family in ('juliacon', 'Rcon'):
content = highlight(content, lexer[family], formatter[family])
f.write(content)
f.close()
@@ -1693,7 +1754,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
messages.append('* PythonTeX error')
messages.append(' Missing stderr file for ' + key_run.replace('#', ':'))
errors += 1
- elif family == 'juliacon':
+ elif family in ('juliacon', 'Rcon'):
pass
else:
# Open error and code files.
@@ -1733,7 +1794,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
index_next = index_now
start_errgobble = None
for n, line in enumerate(err_ud):
- if basename in line:
+ if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
# Get the gobbleation. This is used to determine if
# other lines containing the basename are a continuation,
# or separate messages.
@@ -1779,7 +1840,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# both the error and warning patterns, default to
# error.
past_line = err_ud[index]
- if (index < n and basename in past_line):
+ if (index < n and basename in past_line and (family not in ('perlsix', 'psix') or '.p6:' in past_line or '.p6 line' in past_line)):
break
for pattern in warningsig:
if pattern in past_line:
@@ -1843,8 +1904,9 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
index_now_last = index_now
index_next_last = index_next
err_key_last_int = -1
+ p6_sorry_search = False
for n, line in enumerate(err_ud):
- if basename in line:
+ if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
# Determine the corresponding line number in the document
found = False
for pattern in linesig:
@@ -1906,6 +1968,35 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
line = line.replace(fullbasename + '.' + extension, '<file>')
elif stderrfilename == 'genericscript':
line = line.replace(fullbasename + '.' + extension, '<script>')
+ if family in ('perlsix', 'psix'):
+ # Perl 6 "SORRY!" errors during compiling
+ # (before execution) need special processing,
+ # since they lack stderr delims and must
+ # include lines before the current one.
+ if p6_sorry_search: # Already handled
+ pass
+ else:
+ p6_sorry_search = True
+ p6_sorry_index = n - 1
+ while p6_sorry_index >= 0:
+ if not err_ud[p6_sorry_index].startswith('===SORRY!==='):
+ p6_sorry_index -= 1
+ continue
+ if errlinenum > index_now[1].lines_total + index_now[1].lines_input:
+ p6_linenum_offset = index_now[1].lines_total
+ else:
+ p6_linenum_offset = index_now[1].lines_total - index_now[1].lines_user + index_now[1].inline_count
+ p6_preceding_err_lines = [sub(r'line ([1-9][0-9]*)', lambda m: 'line {0}'.format(int(m.group(1)) - p6_linenum_offset), x) for x in err_ud[p6_sorry_index:n]]
+ if stderrfilename == 'full':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename, basename)
+ elif stderrfilename == 'session':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename, session)
+ elif stderrfilename == 'genericfile':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename + '.' + extension, '<file>')
+ elif stderrfilename == 'genericscript':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename + '.' + extension, '<script>')
+ err_dict[err_key].extend(p6_preceding_err_lines)
+ break
err_dict[err_key].append(line)
elif process:
err_dict[err_key].append(line)
@@ -1967,7 +2058,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# Never process delimiting info until it is used
# Rather, store the index of the last delimiter
last_delim = line
- elif basename in line:
+ elif basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
found_basename = True
# Get the gobbleation. This is used to determine if
# other lines containing the basename are a continuation,
@@ -2122,7 +2213,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
else:
process = True
err_key = basename + '_' + instance
- elif process and basename in line:
+ elif process and basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
found = False
for pattern in linesig:
try:
@@ -2297,6 +2388,8 @@ def do_pygments(encoding, outputdir, fvextfile, pygments_list,
if codetype != ':GLOBAL':
p = pygments_settings[codetype]['formatter_options'].copy()
p['commandprefix'] = 'PYG'
+ if pygments_settings[codetype]['lexer'] == 'pycon':
+ p['python3'] = True
formatter[codetype] = LatexFormatter(**p)
lexer[codetype] = get_lexer_by_name(pygments_settings[codetype]['lexer'], **p)
@@ -2503,6 +2596,8 @@ def python_console(jobname, encoding, outputdir, workingdir, fvextfile,
from pygments.formatters import LatexFormatter
p = pygments_settings['formatter_options'].copy()
p['commandprefix'] = 'PYG'
+ if pygments_settings['lexer'] == 'pycon':
+ p['python3'] = True
formatter = LatexFormatter(**p)
lexer = get_lexer_by_name(pygments_settings['lexer'], **p)
else:
diff --git a/macros/latex/contrib/pythontex/pythontex3.py b/macros/latex/contrib/pythontex/pythontex3.py
index cb96f97d33..bc61f912ca 100644
--- a/macros/latex/contrib/pythontex/pythontex3.py
+++ b/macros/latex/contrib/pythontex/pythontex3.py
@@ -13,7 +13,7 @@ should be in the same directory.
Licensed under the BSD 3-Clause License:
-Copyright (c) 2012-2017, Geoffrey M. Poore
+Copyright (c) 2012-2019, Geoffrey M. Poore
All rights reserved.
@@ -62,6 +62,7 @@ from pygments.styles import get_all_styles
from pythontex_engines import *
import textwrap
import platform
+import itertools
if sys.version_info[0] == 2:
try:
@@ -77,7 +78,7 @@ else:
# Script parameters
# Version
-__version__ = '0.16'
+__version__ = '0.17'
@@ -1213,9 +1214,13 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
# Must double-escape any backslashes so that they survive `shlex.split()`
script = basename
if os.path.isabs(os.path.expanduser(os.path.normcase(outputdir))):
- script_full = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(outputdir, basename))
else:
- script_full = os.path.expanduser(os.path.normcase(os.path.join(orig_cwd, outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(orig_cwd, outputdir, basename))
+ if platform.system() == 'Windows':
+ script_full = script_full.replace('/', '\\')
+ else:
+ script_full = script_full.replace('\\', '/')
# `shlex.split()` only works with Unicode after 2.7.2
if (sys.version_info.major == 2 and sys.version_info.micro < 3):
exec_cmd = shlex.split(bytes(command.format(file=script.replace('\\', '\\\\'), File=script_full.replace('\\', '\\\\'))))
@@ -1275,7 +1280,11 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
for key in code_dict:
family = key.split('#')[0]
# Uncomment the following for debugging, and comment out what follows
- '''run_code(encoding, outputdir, workingdir, code_dict[key],
+ '''run_code(encoding, outputdir,
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
engine_dict[family].language,
engine_dict[family].commands,
engine_dict[family].created,
@@ -1287,9 +1296,12 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
engine_dict[family].linenumbers,
engine_dict[family].lookbehind,
keeptemps, hashdependencies,
- pygments_settings)'''
+ pygments_settings]))'''
tasks.append(pool.apply_async(run_code, [encoding, outputdir,
- workingdir, code_dict[key],
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
engine_dict[family].language,
engine_dict[family].commands,
engine_dict[family].created,
@@ -1412,7 +1424,7 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
unresolved_sessions = []
for key in dependencies:
for dep, val in dependencies[key].items():
- if val[0] > start_time:
+ if val[0] is None or val[0] > start_time:
unresolved_dependencies = True
dependencies[key][dep] = (None, None)
unresolved_sessions.append(key.replace('#', ':'))
@@ -1474,7 +1486,8 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict):
-def run_code(encoding, outputdir, workingdir, code_list, language, commands,
+def run_code(encoding, outputdir, workingdir,
+ cc_begin_list, code_list, cc_end_list, language, commands,
command_created, extension, makestderr, stderrfilename,
code_index, errorsig, warningsig, linesig, stderrlookbehind,
keeptemps, hashdependencies, pygments_settings):
@@ -1512,11 +1525,19 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
err_file_name = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename + '.err')))
out_file = open(out_file_name, 'w', encoding=encoding)
err_file = open(err_file_name, 'w', encoding=encoding)
- script = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename)))
+ script = os.path.expanduser(os.path.join(outputdir, basename))
+ if platform.system() == 'Windows':
+ script = script.replace('/', '\\')
+ else:
+ script = script.replace('\\', '/')
if os.path.isabs(script):
script_full = script
else:
- script_full = os.path.expanduser(os.path.normcase(os.path.join(os.getcwd(), outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(os.getcwd(), outputdir, basename))
+ if platform.system() == 'Windows':
+ script_full = script_full.replace('/', '\\')
+ else:
+ script_full = script_full.replace('\\', '/')
# #### Need to revise so that intermediate files can be detected and cleaned up
for f in command_created:
files.append(f.format(file=script, File=script_full))
@@ -1535,7 +1556,10 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# Add any created files due to the command
# This needs to be done before attempts to execute, to prevent orphans
try:
- proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file)
+ if family != 'Rcon':
+ proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file)
+ else:
+ proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=subprocess.STDOUT)
except WindowsError as e:
if e.errno == 2:
# Batch files won't be found when called without extension. They
@@ -1546,7 +1570,10 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# under Windows; a list is not required.
exec_cmd_string = ' '.join(exec_cmd)
exec_cmd_string = 'cmd /C "@echo off & call {0} & if errorlevel 1 exit 1"'.format(exec_cmd_string)
- proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file)
+ if family != 'Rcon':
+ proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file)
+ else:
+ proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=subprocess.STDOUT)
else:
raise
@@ -1567,15 +1594,21 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
messages.append('* PythonTeX error')
messages.append(' Missing output file for ' + key_run.replace('#', ':'))
errors += 1
+ elif family == 'juliacon' and proc.returncode == 1:
+ messages.append('* PythonTeX error')
+ messages.append(' Running code for Julia console failed')
+ with open(err_file_name, encoding='utf8') as f:
+ messages.append(f.read())
+ errors += 1
else:
if family == 'juliacon':
with open(out_file_name.rsplit('.', 1)[0] + '.tex', 'r', encoding=encoding) as f:
tex_data_lines = f.readlines()
- inst = 0
+ code_iter = itertools.chain(cc_begin_list, code_list, cc_end_list)
for n, line in enumerate(tex_data_lines):
if line.rstrip() == '\\begin{juliaterm}':
- tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(inst)
- inst += 1
+ c = next(code_iter)
+ tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(c.instance)
if n != 0:
tex_data_lines[n-1] = ''
if line.rstrip() == '\\end{juliaterm}':
@@ -1583,6 +1616,29 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
tex_data_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n')
with open(out_file_name, 'w', encoding=encoding) as f:
f.write(''.join(tex_data_lines))
+ elif family == 'Rcon':
+ with open(out_file_name, 'r', encoding=encoding) as f:
+ stdout_lines = f.readlines()
+ for n, line in enumerate(stdout_lines):
+ if line.startswith('> =>PYTHONTEX:'):
+ stdout_lines[n] = line[2:]
+ elif '> write("=>PYTHONTEX:' in line:
+ if line.startswith('> write("=>PYTHONTEX:'):
+ stdout_lines[n] = ''
+ else:
+ # cat() and similar functions can result in the
+ # prompt not being at the start of a new line. In
+ # that case, preserve the prompt to accurately
+ # emulate the console. If there is a following
+ # console environment, this effectively amounts
+ # to adding an extra empty line (pressing ENTER)
+ # between the two.
+ stdout_lines[n] = line.split('write("=>PYTHONTEX:', 1)[0]
+ while stdout_lines and (stdout_lines[-1].startswith('>') and not stdout_lines[-1][1:].strip(' \n')):
+ stdout_lines.pop()
+ stdout_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n')
+ with open(out_file_name, 'w', encoding=encoding) as f:
+ f.write(''.join(stdout_lines))
f = open(out_file_name, 'r', encoding=encoding)
out = f.read()
@@ -1640,7 +1696,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
else:
dependencies[dep] = (os.path.getmtime(dep_file), '')
- if family == 'juliacon':
+ if family in ('juliacon', 'Rcon'):
from pygments import highlight
from pygments.lexers import get_lexer_by_name
from pygments.formatters import LatexFormatter
@@ -1655,16 +1711,21 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
for block in out.split('=>PYTHONTEX:STDOUT#')[1:]:
if block:
delims, content = block.split('#\n', 1)
+ if content and not content.endswith('\n'):
+ # Content might not end with a newline. For example,
+ # Rcon with something like cat() as the last function.
+ content += '\n'
instance, command = delims.split('#')
if content or command in ('s', 'sub'):
if instance.endswith('CC'):
- messages.append('* PythonTeX warning')
- messages.append(' Custom code for "' + family + '" attempted to print or write to stdout')
- messages.append(' This is not supported; use a normal code command or environment')
- messages.append(' The following content was written:')
- messages.append('')
- messages.extend([' ' + l for l in content.splitlines()])
- warnings += 1
+ if family not in ('juliacon', 'Rcon'):
+ messages.append('* PythonTeX warning')
+ messages.append(' Custom code for "' + family + '" attempted to print or write to stdout')
+ messages.append(' This is not supported; use a normal code command or environment')
+ messages.append(' The following content was written:')
+ messages.append('')
+ messages.extend([' ' + l for l in content.splitlines()])
+ warnings += 1
elif command == 'i':
content = r'\pytx@SVMCR{pytx@MCR@' + key_run.replace('#', '@') + '@' + instance + '}\n' + content.rstrip('\n') + '\\endpytx@SVMCR\n\n'
macros.append(content)
@@ -1682,7 +1743,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# Remove newline added by printing, prevent
# LaTeX from adding a space after content
content = content.rsplit('\n', 1)[0] + '\\endinput\n'
- if family == 'juliacon':
+ if family in ('juliacon', 'Rcon'):
content = highlight(content, lexer[family], formatter[family])
f.write(content)
f.close()
@@ -1693,7 +1754,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
messages.append('* PythonTeX error')
messages.append(' Missing stderr file for ' + key_run.replace('#', ':'))
errors += 1
- elif family == 'juliacon':
+ elif family in ('juliacon', 'Rcon'):
pass
else:
# Open error and code files.
@@ -1733,7 +1794,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
index_next = index_now
start_errgobble = None
for n, line in enumerate(err_ud):
- if basename in line:
+ if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
# Get the gobbleation. This is used to determine if
# other lines containing the basename are a continuation,
# or separate messages.
@@ -1779,7 +1840,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# both the error and warning patterns, default to
# error.
past_line = err_ud[index]
- if (index < n and basename in past_line):
+ if (index < n and basename in past_line and (family not in ('perlsix', 'psix') or '.p6:' in past_line or '.p6 line' in past_line)):
break
for pattern in warningsig:
if pattern in past_line:
@@ -1843,8 +1904,9 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
index_now_last = index_now
index_next_last = index_next
err_key_last_int = -1
+ p6_sorry_search = False
for n, line in enumerate(err_ud):
- if basename in line:
+ if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
# Determine the corresponding line number in the document
found = False
for pattern in linesig:
@@ -1906,6 +1968,35 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
line = line.replace(fullbasename + '.' + extension, '<file>')
elif stderrfilename == 'genericscript':
line = line.replace(fullbasename + '.' + extension, '<script>')
+ if family in ('perlsix', 'psix'):
+ # Perl 6 "SORRY!" errors during compiling
+ # (before execution) need special processing,
+ # since they lack stderr delims and must
+ # include lines before the current one.
+ if p6_sorry_search: # Already handled
+ pass
+ else:
+ p6_sorry_search = True
+ p6_sorry_index = n - 1
+ while p6_sorry_index >= 0:
+ if not err_ud[p6_sorry_index].startswith('===SORRY!==='):
+ p6_sorry_index -= 1
+ continue
+ if errlinenum > index_now[1].lines_total + index_now[1].lines_input:
+ p6_linenum_offset = index_now[1].lines_total
+ else:
+ p6_linenum_offset = index_now[1].lines_total - index_now[1].lines_user + index_now[1].inline_count
+ p6_preceding_err_lines = [sub(r'line ([1-9][0-9]*)', lambda m: 'line {0}'.format(int(m.group(1)) - p6_linenum_offset), x) for x in err_ud[p6_sorry_index:n]]
+ if stderrfilename == 'full':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename, basename)
+ elif stderrfilename == 'session':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename, session)
+ elif stderrfilename == 'genericfile':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename + '.' + extension, '<file>')
+ elif stderrfilename == 'genericscript':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename + '.' + extension, '<script>')
+ err_dict[err_key].extend(p6_preceding_err_lines)
+ break
err_dict[err_key].append(line)
elif process:
err_dict[err_key].append(line)
@@ -1967,7 +2058,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
# Never process delimiting info until it is used
# Rather, store the index of the last delimiter
last_delim = line
- elif basename in line:
+ elif basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
found_basename = True
# Get the gobbleation. This is used to determine if
# other lines containing the basename are a continuation,
@@ -2122,7 +2213,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands,
else:
process = True
err_key = basename + '_' + instance
- elif process and basename in line:
+ elif process and basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
found = False
for pattern in linesig:
try:
@@ -2297,6 +2388,8 @@ def do_pygments(encoding, outputdir, fvextfile, pygments_list,
if codetype != ':GLOBAL':
p = pygments_settings[codetype]['formatter_options'].copy()
p['commandprefix'] = 'PYG'
+ if pygments_settings[codetype]['lexer'] == 'pycon':
+ p['python3'] = True
formatter[codetype] = LatexFormatter(**p)
lexer[codetype] = get_lexer_by_name(pygments_settings[codetype]['lexer'], **p)
@@ -2503,6 +2596,8 @@ def python_console(jobname, encoding, outputdir, workingdir, fvextfile,
from pygments.formatters import LatexFormatter
p = pygments_settings['formatter_options'].copy()
p['commandprefix'] = 'PYG'
+ if pygments_settings['lexer'] == 'pycon':
+ p['python3'] = True
formatter = LatexFormatter(**p)
lexer = get_lexer_by_name(pygments_settings['lexer'], **p)
else:
diff --git a/macros/latex/contrib/pythontex/pythontex_engines.py b/macros/latex/contrib/pythontex/pythontex_engines.py
index 38fea5efc4..4928826bf1 100644
--- a/macros/latex/contrib/pythontex/pythontex_engines.py
+++ b/macros/latex/contrib/pythontex/pythontex_engines.py
@@ -17,7 +17,7 @@ document (script for execution).
-Copyright (c) 2012-2017, Geoffrey M. Poore
+Copyright (c) 2012-2018, Geoffrey M. Poore
All rights reserved.
Licensed under the BSD 3-Clause License:
http://www.opensource.org/licenses/BSD-3-Clause
@@ -33,7 +33,8 @@ from hashlib import sha1
from collections import OrderedDict, namedtuple
-interpreter_dict = {k:k for k in ('python', 'ruby', 'julia', 'octave', 'bash', 'sage', 'rustc')}
+interpreter_dict = {k:k for k in ('python', 'ruby', 'julia', 'octave', 'bash',
+ 'sage', 'rustc', 'Rscript', 'perl', 'perl6')}
# The {file} field needs to be replaced by itself, since the actual
# substitution of the real file can only be done at runtime, whereas the
# substitution for the interpreter should be done when the engine is
@@ -194,7 +195,7 @@ class CodeEngine(object):
if not isinstance(l, str):
raise TypeError('CodeEngine needs "linenumbers" to contain strings')
# Need to replace tags
- linenumbers = [l.replace('{number}', r'(\d+)') for l in linenumbers]
+ linenumbers = [r'(\d+)'.join(re.escape(x) for x in l.split('{number}')) if '{number}' in l else l for l in linenumbers]
self.linenumbers = linenumbers
# Type check lookbehind
@@ -950,7 +951,7 @@ julia_template = '''
# Currently, Julia only supports UTF-8
# So can't set stdout and stderr encoding
- type JuliaTeXUtils
+ mutable struct JuliaTeXUtils
id::AbstractString
family::AbstractString
session::AbstractString
@@ -983,8 +984,8 @@ julia_template = '''
function JuliaTeXUtils()
self = new()
self.self = self
- self._dependencies = Array(AbstractString, 0)
- self._created = Array(AbstractString, 0)
+ self._dependencies = AbstractString[]
+ self._created = AbstractString[]
self._context_raw = ""
function formatter(expr)
@@ -1095,7 +1096,7 @@ julia_wrapper = '''
jltex.line = "{line}"
println("{stdoutdelim}")
- write(STDERR, "{stderrdelim}\\n")
+ write(stderr, "{stderrdelim}\\n")
jltex.before()
{code}
@@ -1267,6 +1268,7 @@ CodeEngine('octave', 'octave', '.m',
octave_template, octave_wrapper, 'disp({code})', octave_sub,
'error', 'warning', 'line {number}')
+
bash_template = '''
cd "{workingdir}"
{body}
@@ -1297,7 +1299,7 @@ rust_template = '''
use std::{{borrow, collections, fmt, fs, io, iter, ops, path}};
use self::OpenMode::{{ReadMode, WriteMode, AppendMode, TruncateMode, CreateMode, CreateNewMode}};
pub struct UserAction<'u> {{
- _act: Box<FnMut() + 'u>
+ _act: Box<dyn FnMut() + 'u>
}}
impl<'u> UserAction<'u> {{
pub fn new() -> Self {{
@@ -1323,8 +1325,8 @@ rust_template = '''
impl<'u, U: Into<UserAction<'u>> + 'u> ops::Add<U> for UserAction<'u> {{
type Output = UserAction<'u>;
fn add(self, f: U) -> Self::Output {{
- let mut self_act: Box<FnMut() + 'u> = self._act;
- let mut other_act: Box<FnMut() + 'u> = f.into()._act;
+ let mut self_act: Box<dyn FnMut() + 'u> = self._act;
+ let mut other_act: Box<dyn FnMut() + 'u> = f.into()._act;
Self::from(move || {{ self_act.as_mut()(); other_act.as_mut()(); }})
}}
}}
@@ -1335,7 +1337,7 @@ rust_template = '''
}}
}}
impl<'u> ops::Deref for UserAction<'u> {{
- type Target = FnMut() + 'u;
+ type Target = dyn FnMut() + 'u;
fn deref(&self) -> &Self::Target {{
&*self._act
}}
@@ -1346,7 +1348,7 @@ rust_template = '''
}}
}}
pub struct RustTeXUtils<'u> {{
- _formatter: Box<FnMut(&fmt::Display) -> String + 'u>,
+ _formatter: Box<dyn FnMut(&dyn fmt::Display) -> String + 'u>,
pub before: UserAction<'u>,
pub after: UserAction<'u>,
pub family: &'u str,
@@ -1410,7 +1412,7 @@ rust_template = '''
impl<'u> RustTeXUtils<'u> {{
pub fn new() -> Self {{
RustTeXUtils {{
- _formatter: Box::new(|x: &fmt::Display| format!("{{}}", x)),
+ _formatter: Box::new(|x: &dyn fmt::Display| format!("{{}}", x)),
before: UserAction::new(),
after: UserAction::new(),
family: "{family}",
@@ -1428,7 +1430,7 @@ rust_template = '''
pub fn formatter<A: fmt::Display>(&mut self, x: A) -> String {{
(self._formatter)(&x)
}}
- pub fn set_formatter<F: FnMut(&fmt::Display) -> String + 'u>(&mut self, f: F) {{
+ pub fn set_formatter<F: FnMut(&dyn fmt::Display) -> String + 'u>(&mut self, f: F) {{
self._formatter = Box::new(f);
}}
pub fn add_dependencies<SS: IntoIterator>(&mut self, deps: SS)
@@ -1541,3 +1543,208 @@ CodeEngine('rust', 'rust', '.rs',
created='{File}.exe')
SubCodeEngine('rust', 'rs')
+
+
+r_template = '''
+ library(methods)
+ setwd("{workingdir}")
+ pdf(file=NULL)
+ {body}
+ write("{dependencies_delim}", stdout())
+ write("{created_delim}", stdout())
+ '''
+
+r_wrapper = '''
+ write("{stdoutdelim}", stdout())
+ write("{stderrdelim}", stderr())
+ {code}
+ '''
+
+r_sub = '''
+ write("{field_delim}", stdout())
+ write(toString({field}), stdout())
+ '''
+
+CodeEngine('R', 'R', '.R',
+ '{Rscript} "{file}.R"',
+ r_template, r_wrapper, 'write(toString({code}), stdout())', r_sub,
+ ['error', 'Error'], ['warning', 'Warning'],
+ 'line {number}')
+
+
+rcon_template = '''
+ options(echo=TRUE, error=function(){{}})
+ library(methods)
+ setwd("{workingdir}")
+ pdf(file=NULL)
+ {body}
+ '''
+
+rcon_wrapper = '''
+ write("{stdoutdelim}", stdout())
+ {code}
+ '''
+
+CodeEngine('Rcon', 'R', '.R',
+ '{Rscript} "{file}.R"',
+ rcon_template, rcon_wrapper, '', '',
+ ['error', 'Error'], ['warning', 'Warning'],
+ '')
+
+
+perl_template = '''
+ use v5.14;
+ use utf8;
+ use strict;
+ use autodie;
+ use warnings;
+ use warnings qw(FATAL utf8);
+ use feature qw(unicode_strings);
+ use open qw(:encoding(UTF-8) :std);
+ chdir("{workingdir}");
+ {body}
+ print STDOUT "{dependencies_delim}\\n";
+ print STDOUT "{created_delim}\\n";
+ '''
+
+perl_wrapper = '''
+ print STDOUT "{stdoutdelim}\\n";
+ print STDERR "{stderrdelim}\\n";
+ {code}
+ '''
+
+perl_sub = '''
+ print STDOUT "{field_delim}\\n";
+ print STDOUT "" . ({field});
+ '''
+
+CodeEngine('perl', 'perl', '.pl',
+ '{perl} "{file}.pl"',
+ perl_template, perl_wrapper, 'print STDOUT "" . ({code});', perl_sub,
+ ['error', 'Error'], ['warning', 'Warning'],
+ 'line {number}')
+
+SubCodeEngine('perl', 'pl')
+
+
+perl6_template = '''
+ use v6;
+ chdir("{workingdir}");
+ {body}
+ put "{dependencies_delim}";
+ put "{created_delim}";
+ '''
+
+perl6_wrapper = '''
+ put "{stdoutdelim}";
+ note "{stderrdelim}";
+ {code}
+ '''
+
+perl6_sub = '''
+ put "{field_delim}";
+ put ({field});
+ '''
+
+CodeEngine('perlsix', 'perl6', '.p6',
+ '{perl6} "{File}.p6"',
+ perl6_template, perl6_wrapper, 'put ({code});', perl6_sub,
+ ['error', 'Error', 'Cannot'], ['warning', 'Warning'],
+ ['.p6:{number}', '.p6 line {number}'], True)
+
+SubCodeEngine('perlsix', 'psix')
+
+javascript_template = '''
+ jstex = {{
+ before : function () {{ }},
+ after : function () {{ }},
+ _dependencies : [ ],
+ _created : [ ],
+ add_dependencies : function () {{
+ jstex._dependencies = jstex._dependencies.concat(
+ Array.prototype.slice.apply( arguments ) );
+ }},
+ add_created : function () {{
+ jstex._created = jstex._created.concat(
+ Array.prototype.slice.apply( arguments ) );
+ }},
+ cleanup : function () {{
+ console.log( "{dependencies_delim}" );
+ jstex._dependencies.map(
+ dep => console.log( dep ) );
+ console.log( "{created_delim}" );
+ jstex._dependencies.map(
+ cre => console.log( cre ) );
+ }},
+ formatter : function ( x ) {{
+ return String( x );
+ }},
+ escape : function ( x ) {{
+ return String( x ).replace( /_/g, '\\\\_' )
+ .replace( /\\$/g, '\\\\$' )
+ .replace( /\\^/g, '\\\\^' );
+ }},
+ docdir : process.cwd(),
+ context : {{ }},
+ _context_raw : '',
+ set_context : function ( expr ) {{
+ if ( expr != '' && expr != jstex._context_raw ) {{
+ jstex.context = {{ }};
+ expr.split( ',' ).map( pair => {{
+ const halves = pair.split( '=' );
+ jstex.context[halves[0].trim()] = halves[1].trim();
+ }} );
+ }}
+ }}
+ }};
+
+ try {{
+ process.chdir( "{workingdir}" );
+ }} catch ( e ) {{
+ if ( process.argv.indexOf( '--manual' ) == -1 )
+ console.error( e );
+ }}
+ if ( module.paths.indexOf( jstex.docdir ) == -1 )
+ module.paths.unshift( jstex.docdir );
+
+ {extend}
+
+ jstex.id = "{family}_{session}_{restart}";
+ jstex.family = "{family}";
+ jstex.session = "{session}";
+ jstex.restart = "{restart}";
+
+ {body}
+
+ jstex.cleanup();
+ '''
+
+javascript_wrapper = '''
+ jstex.command = "{command}";
+ jstex.set_context( "{context}" );
+ jstex.args = "{args}";
+ jstex.instance = "{instance}";
+ jstex.line = "{line}";
+
+ console.log( "{stdoutdelim}" );
+ console.error( "{stderrdelim}" );
+ jstex.before();
+
+ {code}
+
+ jstex.after();
+ '''
+
+javascript_sub = '''
+ console.log( "{field_delim}" );
+ console.log( {field} );
+ '''
+
+CodeEngine('javascript', 'javascript', '.js',
+ 'node "{file}.js"',
+ javascript_template, javascript_wrapper,
+ 'console.log( jstex.formatter( {code} ) )',
+ javascript_sub,
+ ['error', 'Error'], ['warning', 'Warning'],
+ ':{number}')
+
diff --git a/macros/texinfo/latest/texi2dvi b/macros/texinfo/latest/texi2dvi
index f906ed696a..17f43557ba 100644
--- a/macros/texinfo/latest/texi2dvi
+++ b/macros/texinfo/latest/texi2dvi
@@ -44,7 +44,6 @@ orig_pwd=`pwd`
# Don't use `unset' since old bourne shells don't have this command.
# Instead, assign them an empty value.
action=compile
-batch=false # interact normally
debug=false
escape="\\"
expand=false # true for expansion via makeinfo
@@ -106,15 +105,6 @@ CDPATH=${ZSH_VERSION+.}$path_sep
# usage - display usage and exit successfully.
usage ()
{
- # We used to simply have `echo "$usage"', but coping with the
- # changing behavior of `echo' is much harder than simply using a
- # here-doc.
- #
- # echo '\noto' echo '\\noto' echo -e '\\noto'
- # bash 3.1 \noto \\noto \noto
- # bash 3.2 %oto \noto -e \noto
- #
- # where % denotes the eol character.
cat <<EOF
Usage: $program [OPTION]... FILE...
or: texi2pdf [OPTION]... FILE...
@@ -130,11 +120,10 @@ When invoked as \`texi2pdf' or given the option --pdf generate PDF output.
Otherwise, generate DVI.
General options:
- -b, --batch no interaction
-D, --debug turn on shell debugging (set -x)
-h, --help display this help and exit successfully
-o, --output=OFILE leave output in OFILE; only one input FILE is allowed
- -q, --quiet no output unless errors (implies --batch)
+ -q, --quiet no output unless errors
-v, --version display version information and exit successfully
-V, --verbose report on what is done
--max-iterations=N don't process files more than N times [$max_iters]
@@ -209,7 +198,7 @@ EOF
version ()
{
cat <<EOF
-texi2dvi (GNU Texinfo 6.6)
+texi2dvi (GNU Texinfo 6.7)
Copyright (C) 2019 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
@@ -222,46 +211,36 @@ EOF
# Generic auxiliary functions.
-# List of variables containing paths to directories or files that
-# we need to update.
-path_vars='work_build workdir t2ddir work_bak in_input'
+# Used to access files and directories after we have changed directory
+# (for --tidy).
+rel=
# Change directory, updating some relative paths.
cd_dir ()
{
cd "$1"
- # Check if argument is absolute, and if so, make all the path variables
- # absolute.
- case "$1" in
+ # Check if argument or input file is absolute, and if so, make all the path
+ # variables absolute.
+ use_absolute=false
+ case $1 in
[\\/]* | ?:[\\/]*) # absolute path
- for cdd_dir in $path_vars; do
+ use_absolute=true ;;
+ esac
+ case $in_input in
+ [\\/]* | ?:[\\/]*)
+ use_absolute=true ;;
+ esac
+
+ if $use_absolute ; then
+ for cdd_dir in work_build workdir t2ddir work_bak in_input in_dir; do
eval "$cdd_dir=\`absolute \$$cdd_dir\`"
done
- return ;;
- esac
+ return
+ fi
- # Replace each path component with ".." and remove any trailing slash.
- cdd_prefix=`echo "$1" | \$SED -e 's/[^/\\][^/\\]*/../g' -e 's/[/\\]$//'`
-
- # Add this prefix for some variables.
- for cdd_dir in $path_vars; do
- eval "case \"\$$cdd_dir\" in
- [\\/]* | ?:[\\/]*) ;; # absolute path - do nothing
- ?*)
- eval \"\$cdd_dir=\$cdd_prefix/\\\$\$cdd_dir\" ;;
- esac"
- # Without first level of quotes, where CDD_DIR is $cdd_dir:
- # case "$CDD_DIR" in
- # [\\/]* | ?:[\\/]*) ;;
- # *)
- # eval "$cdd_dir=$cdd_prefix/\$$cdd_dir" ;;
- # esac
- #
- # Inner 'eval' becomes
- # CDD_DIR=CDD_PREFIX/$CDD_DIR
- # where CDD_DIR is $cdd_dir and CDD_PREFIX is $cdd_prefix
- done
+ # Replace each path component with ".." and add a single trailing slash.
+ rel=`echo "$1" | \$SED -e 's/[^/\\][^/\\]*/../g' -e 's/[/\\]*$/\//'`
}
# cd_orig - Return to the original directory.
@@ -275,23 +254,7 @@ cd_orig ()
# - the temporary file can be removed
cd "$orig_pwd" || exit 1
- test -z "$cdd_prefix" && return
-
- # strip off ../../ from some variables
- # quote string by placing \ before each character (each either . or /)
- cdd_prefix_q=`echo "$cdd_prefix" | \$SED -e 's/\\(.\\)/\\\\\\1/g'`
- # after backslashes quote within backquoted string:
- # echo "$cdd_prefix" | $SED -e 's/\(.\)/\\\1/g'
-
- for cdo_dir in $path_vars ; do
- eval "$cdo_dir=\`echo \"\$$cdo_dir\" | \$SED -e 's/^$cdd_prefix_q\///'\`"
-
- # Becomes
- # CDO_DIR=`echo "$CDO_DIR" | $SED -e 's/^CDD_PREFIX//'`
-
- # eval $cdo_dir=\${$cdo_dir#\$cdd_prefix/}
- # would be simpler, but doesn't work in older shells.
- done
+ rel=
}
@@ -705,6 +668,8 @@ index_file_p ()
latex:*:*:"\\indexentry{"*|latex:*:*:"\\indexentry {"*) echo $1;;
texinfo:*:*:"\\entry{"*) echo $1;;
+ texinfo:*:*:"@entry{"*) echo $1;;
+ # @entry is output from newer versions of texinfo.tex
esac
return 0
}
@@ -767,7 +732,7 @@ report 'Once you'\''ve done that, delete the file with an '\''fl'\'' extension.'
}
-# xref_files_save - set xref_files_orig from xref_files_orig, and save xref
+# xref_files_save - set xref_files_orig from xref_files_new, and save xref
# files in $work_bak.
xref_files_save ()
{
@@ -782,7 +747,18 @@ xref_files_save ()
# Users may have, e.g., --keep-old-files. Don't let this interfere.
# (Don't use unset for the sake of ancient shells.)
TAR_OPTIONS=; export TAR_OPTIONS
- tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
+ tar cf - $xref_files_orig | (cd "$rel$work_bak" && tar xf -)
+ fi
+
+ # Remove auxiliary files in same directory as main input file. Otherwise,
+ # these will likely be read instead of those in the build dir.
+ if $tidy ; then
+ secondary_xref_files=`sorted_index_files`
+ for f in $xref_files_new $secondary_xref_files ; do
+ if test -f "$rel$in_dir/$f" ; then
+ remove $rel$in_dir/$f
+ fi
+ done
fi
}
@@ -817,10 +793,10 @@ xref_files_changed ()
for this_file in $xref_files_new; do
verbose "Comparing xref file `echo $this_file | $SED 's|\./||g'` ..."
# cmp -s returns nonzero exit status if files differ.
- if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
+ if cmp -s "$this_file" "$rel$work_bak/$this_file"; then :; else
verbose "xref file `echo $this_file | $SED 's|\./||g'` differed ..."
if $debug; then
- diff -u "$work_bak/$this_file" "$this_file"
+ diff -u "$rel$work_bak/$this_file" "$this_file"
fi
return 0
fi
@@ -908,21 +884,17 @@ make_tex_cmd ()
# Tell TeX to allow running external executables
test -n "$shell_escape" && tex_cmd="$tex_cmd $shell_escape"
- # Tell TeX to be batch if requested.
- if $batch; then
- # \batchmode does not show terminal output at all, so we don't
- # want that. And even in batch mode, TeX insists on having input
- # from the user. Close its stdin to make it impossible.
- tex_cmd="$tex_cmd </dev/null '${escape}nonstopmode'"
- fi
+ # Run without interaction.
+ # \batchmode does not show terminal output at all, so we don't
+ # want that. And even in batch mode, TeX insists on having input
+ # from the user. Close its stdin to make it impossible.
+ tex_cmd="$tex_cmd </dev/null '${escape}nonstopmode'"
}
-# run_tex - Run TeX as "$tex $in_input", taking care of errors and logs.
+# run_tex - Run TeX, taking care of errors and logs.
run_tex ()
{
- make_tex_cmd
-
# Check for any unusual characters in the filename.
# However, >, \ and any whitespace characters are not supported
# filenames.
@@ -943,7 +915,7 @@ run_tex ()
done
# Set \toks0 to "\input FILENAME\relax"
- tex_cmd="$tex_cmd '${escape}toks0${escape}bgroup${escape}input' '$in_input' '${escape}relax>"
+ tex_cmd="$tex_cmd '${escape}toks0${escape}bgroup${escape}input' '$rel$in_input' '${escape}relax>"
# Expand \toks0 after the end of the group
tex_cmd="$tex_cmd${escape}expandafter${escape}egroup"
@@ -951,7 +923,7 @@ run_tex ()
else
# In the case of a simple filename, just pass the filename
# with no funny tricks.
- tex_cmd="$tex_cmd '${escape}input' '$in_input'"
+ tex_cmd="$tex_cmd '${escape}input' '$rel$in_input'"
fi
verbose "$0: Running $tex_cmd ..."
@@ -960,7 +932,7 @@ run_tex ()
dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
esac
else
- error 1 "$tex exited with bad status, quitting."
+ tex_failed=true
fi
}
@@ -1137,6 +1109,8 @@ run_dvipdf ()
# run_tex_suite - Run the TeX tools until a stable point is reached.
run_tex_suite ()
{
+ make_tex_cmd
+
# Move to the working directory.
if $tidy; then
verbose "cd $work_build"
@@ -1162,6 +1136,7 @@ run_tex_suite ()
suite_cycle=`expr $suite_cycle + 1`
verbose "Cycle $suite_cycle for $command_line_filename"
+ tex_failed=false
run_core_conversion
xref_files_changed || break
xref_files_save
@@ -1173,6 +1148,11 @@ run_tex_suite ()
run_index
done
+ if $tex_failed ; then
+ # TeX failed, and the xref files did not change.
+ error 1 "$tex exited with bad status, quitting."
+ fi
+
# If we were using thumbpdf and producing PDF, then run thumbpdf
# and TeX one last time.
run_thumbpdf
@@ -1417,7 +1397,7 @@ run_hevea ()
# successful compilation.
run_hevea_cmd="$run_hevea_cmd -fix -O -o '$out_base'"
run_hevea_cmd="$run_hevea_cmd `list_prefix includes -I` -I '$orig_pwd' "
- run_hevea_cmd="$run_hevea_cmd '$in_input'"
+ run_hevea_cmd="$run_hevea_cmd '$rel$in_input'"
if $debug; then
run_hevea_cmd="$run_hevea_cmd -v -v"
@@ -1499,8 +1479,12 @@ compile ()
#
make_openout_test ()
{
+ recorder_option_maybe="$1"
+ make_tex_cmd
+
ensure_dir "$workdir"/check_recorder
cd_dir "$workdir"/check_recorder
+
cat > openout.tex <<EOF
\newwrite\ourwrite
\immediate\openout\ourwrite dum.dum
@@ -1508,11 +1492,6 @@ make_openout_test ()
EOF
# \bye doesn't work for LaTeX, but it will cause latex
# to exit with an input error.
- recorder_option_maybe="$1"
- save_batch=$batch
- batch=true
- make_tex_cmd
- batch=$save_batch
tex_cmd="$tex_cmd '${escape}input' ./openout.tex"
# ./ in case . isn't in path
verbose "$0: running $tex_cmd ..."
@@ -1717,12 +1696,6 @@ cleanup ()
# input is preprocessed.
input_file_name_decode ()
{
- # See if we are run from within AUC-Tex, in which case we are
- # passed `\input{FOO.tex}' or even `\nonstopmode\input{FOO.tex}'.
- case $command_line_filename in
- *\\nonstopmode*)
- batch=true;;
- esac
case $command_line_filename in
*\\input{*}*)
# Let AUC-TeX error parser deal with line numbers.
@@ -1808,8 +1781,7 @@ while test x"$1" != x"$arg_sep"; do
case "$1" in
-@ ) escape=@;;
-~ ) verbose "Option -~ is obsolete: texi2dvi ignores it.";;
- # Silently and without documentation accept -b and --b[atch] as synonyms.
- -b | --batch) batch=true;;
+ -b | --batch) ;; # Obsolete
--build) shift; build_mode=$1;;
--build-dir) shift; build_dir=$1; build_mode=tidy;;
-c | --clean) build_mode=clean;;
@@ -1832,7 +1804,7 @@ while test x"$1" != x"$arg_sep"; do
out_lang_set `echo "x$1" | $SED 's/^x--//'`;;
-p) out_lang_set pdf;;
- -q | -s | --quiet | --silent) quiet=true; batch=true;;
+ -q | -s | --quiet | --silent) quiet=true;;
--src-specials) src_specials=--src-specials;;
--shell-escape) shell_escape=--shell-escape;;
--tex4ht) latex2html=tex4ht;;
diff --git a/macros/texinfo/latest/texinfo.tex b/macros/texinfo/latest/texinfo.tex
index 5fe81b4c28..af857cbbb0 100644
--- a/macros/texinfo/latest/texinfo.tex
+++ b/macros/texinfo/latest/texinfo.tex
@@ -3,8 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2019-02-16.14}
-
+\def\texinfoversion{2019-09-20.22}
%
% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
%
@@ -258,8 +257,8 @@
% \domark is called twice inside \chapmacro, to add one
% mark before the section break, and one after.
-% In the second call \prevchapterdefs is the same as \lastchapterdefs,
-% and \prevsectiondefs is the same as \lastsectiondefs.
+% In the second call \prevchapterdefs is the same as \currentchapterdefs,
+% and \prevsectiondefs is the same as \currentsectiondefs.
% Then if the page is not broken at the mark, some of the previous
% section appears on the page, and we can get the name of this section
% from \firstmark for @everyheadingmarks top.
@@ -267,11 +266,11 @@
%
% See page 260 of The TeXbook.
\def\domark{%
- \toks0=\expandafter{\lastchapterdefs}%
- \toks2=\expandafter{\lastsectiondefs}%
+ \toks0=\expandafter{\currentchapterdefs}%
+ \toks2=\expandafter{\currentsectiondefs}%
\toks4=\expandafter{\prevchapterdefs}%
\toks6=\expandafter{\prevsectiondefs}%
- \toks8=\expandafter{\lastcolordefs}%
+ \toks8=\expandafter{\currentcolordefs}%
\mark{%
\the\toks0 \the\toks2 % 0: marks for @everyheadingmarks top
\noexpand\or \the\toks4 \the\toks6 % 1: for @everyheadingmarks bottom
@@ -288,19 +287,19 @@
% @setcolor (or @url, or @link, etc.) between @contents and the very
% first @chapter.
\def\gettopheadingmarks{%
- \ifcase0\topmark\fi
+ \ifcase0\the\savedtopmark\fi
\ifx\thischapter\empty \ifcase0\firstmark\fi \fi
}
\def\getbottomheadingmarks{\ifcase1\botmark\fi}
-\def\getcolormarks{\ifcase2\topmark\fi}
+\def\getcolormarks{\ifcase2\the\savedtopmark\fi}
% Avoid "undefined control sequence" errors.
-\def\lastchapterdefs{}
-\def\lastsectiondefs{}
-\def\lastsection{}
+\def\currentchapterdefs{}
+\def\currentsectiondefs{}
+\def\currentsection{}
\def\prevchapterdefs{}
\def\prevsectiondefs{}
-\def\lastcolordefs{}
+\def\currentcolordefs{}
% Margin to add to right of even pages, to left of odd pages.
\newdimen\bindingoffset
@@ -310,11 +309,35 @@
% Main output routine.
%
\chardef\PAGE = 255
-\output = {\onepageout{\pagecontents\PAGE}}
+\newtoks\defaultoutput
+\defaultoutput = {\savetopmark\onepageout{\pagecontents\PAGE}}
+\output=\expandafter{\the\defaultoutput}
\newbox\headlinebox
\newbox\footlinebox
+% When outputting the double column layout for indices, an output routine
+% is run several times, which hides the original value of \topmark. This
+% can lead to a page heading being output and duplicating the chapter heading
+% of the index. Hence, save the contents of \topmark at the beginning of
+% the output routine. The saved contents are valid until we actually
+% \shipout a page.
+%
+% (We used to run a short output routine to actually set \topmark and
+% \firstmark to the right values, but if this was called with an empty page
+% containing whatsits for writing index entries, the whatsits would be thrown
+% away and the index auxiliary file would remain empty.)
+%
+\newtoks\savedtopmark
+\newif\iftopmarksaved
+\topmarksavedtrue
+\def\savetopmark{%
+ \iftopmarksaved\else
+ \global\savedtopmark=\expandafter{\topmark}%
+ \global\topmarksavedtrue
+ \fi
+}
+
% \onepageout takes a vbox as an argument.
% \shipout a vbox for a single page, adding an optional header, footer
% and footnote. This also causes index entries for this page to be written
@@ -326,23 +349,17 @@
\ifodd\pageno \advance\hoffset by \bindingoffset
\else \advance\hoffset by -\bindingoffset\fi
%
- % Common context changes for both heading and footing.
- % Do this outside of the \shipout so @code etc. will be expanded in
- % the headline as they should be, not taken literally (outputting ''code).
- \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
- %
% Retrieve the information for the headings from the marks in the page,
% and call Plain TeX's \makeheadline and \makefootline, which use the
% values in \headline and \footline.
%
% This is used to check if we are on the first page of a chapter.
- \ifcase1\topmark\fi
+ \ifcase1\the\savedtopmark\fi
\let\prevchaptername\thischaptername
\ifcase0\firstmark\fi
\let\curchaptername\thischaptername
%
\ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
- \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
%
\ifx\curchaptername\prevchaptername
\let\thischapterheading\thischapter
@@ -353,7 +370,14 @@
\def\thischapterheading{}%
\fi
%
+ % Common context changes for both heading and footing.
+ % Do this outside of the \shipout so @code etc. will be expanded in
+ % the headline as they should be, not taken literally (outputting ''code).
+ \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
+ %
\global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
+ %
+ \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
\global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}%
%
{%
@@ -362,14 +386,8 @@
% take effect in \write's, yet the group defined by the \vbox ends
% before the \shipout runs.
%
- \indexdummies % don't expand commands in the output.
- \normalturnoffactive % \ in index entries must not stay \, e.g., if
- % the page break happens to be in the middle of an example.
- % We don't want .vr (or whatever) entries like this:
- % \entry{{\indexbackslash }acronym}{32}{\code {\acronym}}
- % "\acronym" won't work when it's read back in;
- % it needs to be
- % {\code {{\backslashcurfont }acronym}
+ \atdummies % don't expand commands in the output.
+ \turnoffactive
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
\ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
@@ -384,8 +402,9 @@
\unvbox\footlinebox
\fi
%
- }% end of \shipout\vbox
- }% end of group with \indexdummies
+ }%
+ }%
+ \global\topmarksavedfalse
\advancepageno
\ifnum\outputpenalty>-20000 \else\dosupereject\fi
}
@@ -429,11 +448,10 @@
}%
}
-% First remove any @comment, then any @c comment. Also remove a @texinfoc
-% comment (see \scanmacro for details). Pass the result on to \argcheckspaces.
+% First remove any @comment, then any @c comment. Pass the result on to
+% \argcheckspaces.
\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
-\def\argremovec#1\c#2\ArgTerm{\argremovetexinfoc #1\texinfoc\ArgTerm}
-\def\argremovetexinfoc#1\texinfoc#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
+\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
%
@@ -1034,7 +1052,7 @@ where each line of input produces a line of output.}
tex.sprint(
string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o',
- (c / 256), (c % 256)))
+ math.floor(c / 256), math.floor(c % 256)))
else
c = c - 0x10000
local c_hi = c / 1024 + 0xd800
@@ -1044,8 +1062,8 @@ where each line of input produces a line of output.}
string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o',
- (c_hi / 256), (c_hi % 256),
- (c_lo / 256), (c_lo % 256)))
+ math.floor(c_hi / 256), math.floor(c_hi % 256),
+ math.floor(c_lo / 256), math.floor(c_lo % 256)))
end
end
end
@@ -1058,15 +1076,19 @@ where each line of input produces a line of output.}
function PDFescstr(str)
for c in string.bytes(str) do
if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then
- tex.sprint(
+ tex.sprint(-2,
string.format(string.char(0x5c) .. string.char(0x25) .. '03o',
c))
else
- tex.sprint(string.char(c))
+ tex.sprint(-2, string.char(c))
end
end
end
}
+ % The -2 in the arguments here gives all the input to TeX catcode 12
+ % (other) or 10 (space), preventing undefined control sequence errors. See
+ % https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html
+ %
\endgroup
\def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}}
\ifnum\luatexversion>84
@@ -1105,6 +1127,16 @@ where each line of input produces a line of output.}
\fi
\fi
+\newif\ifpdforxetex
+\pdforxetexfalse
+\ifpdf
+ \pdforxetextrue
+\fi
+\ifx\XeTeXrevision\thisisundefined\else
+ \pdforxetextrue
+\fi
+
+
% PDF uses PostScript string constants for the names of xref targets,
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
@@ -1161,7 +1193,7 @@ output) for that.)}
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
\def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
\domark
\pdfsetcolor{#1}%
}
@@ -1169,7 +1201,7 @@ output) for that.)}
\def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
+ \def\currentcolordefs{}
%
\def\makefootline{%
\baselineskip24pt
@@ -1547,7 +1579,7 @@ output) for that.)}
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
\def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
\domark
\pdfsetcolor{#1}%
}
@@ -1555,7 +1587,7 @@ output) for that.)}
\def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
+ \def\currentcolordefs{}
%
\def\makefootline{%
\baselineskip24pt
@@ -2147,7 +2179,7 @@ end
% A few fonts for @defun names and args.
\setfont\defbf\bfshape{10}{\magstep1}{OT1}
\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
-\setfont\defsl\slshape{10}{\magstep1}{OT1TT}
+\setfont\defsl\slshape{10}{\magstep1}{OT1}
\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
\def\df{\let\ttfont=\deftt \let\bffont = \defbf
\let\ttslfont=\defttsl \let\slfont=\defsl \bf}
@@ -2295,7 +2327,7 @@ end
% A few fonts for @defun names and args.
\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
-\setfont\defsl\slshape{10}{\magstephalf}{OT1TT}
+\setfont\defsl\slshape{10}{\magstephalf}{OT1}
\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
\def\df{\let\ttfont=\deftt \let\bffont = \defbf
\let\slfont=\defsl \let\ttslfont=\defttsl \bf}
@@ -2818,7 +2850,7 @@ end
% @t, explicit typewriter.
\def\t#1{%
- {\tt \rawbackslash \plainfrenchspacing #1}%
+ {\tt \plainfrenchspacing #1}%
\null
}
@@ -2845,7 +2877,6 @@ end
% Turn off hyphenation.
\nohyphenation
%
- \rawbackslash
\plainfrenchspacing
#1%
}%
@@ -3032,41 +3063,33 @@ end
\global\def/{\normalslash}
}
-% we put a little stretch before and after the breakable chars, to help
-% line breaking of long url's. The unequal skips make look better in
-% cmtt at least, especially for dots.
-\def\urefprestretchamount{.13em}
-\def\urefpoststretchamount{.1em}
-\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax}
-\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax}
-%
-\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
-\def\urefcodedot{\urefprestretch .\urefpoststretch}
-\def\urefcodehash{\urefprestretch \#\urefpoststretch}
-\def\urefcodequest{\urefprestretch ?\urefpoststretch}
+\def\urefcodeamp{\urefprebreak \&\urefpostbreak}
+\def\urefcodedot{\urefprebreak .\urefpostbreak}
+\def\urefcodehash{\urefprebreak \#\urefpostbreak}
+\def\urefcodequest{\urefprebreak ?\urefpostbreak}
\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
{
\catcode`\/=\active
\global\def\urefcodeslashfinish{%
- \urefprestretch \slashChar
+ \urefprebreak \slashChar
% Allow line break only after the final / in a sequence of
% slashes, to avoid line break between the slashes in http://.
- \ifx\next/\else \urefpoststretch \fi
+ \ifx\next/\else \urefpostbreak \fi
}
}
-% One more complication: by default we'll break after the special
-% characters, but some people like to break before the special chars, so
-% allow that. Also allow no breaking at all, for manual control.
+% By default we'll break after the special characters, but some people like to
+% break before the special chars, so allow that. Also allow no breaking at
+% all, for manual control.
%
\parseargdef\urefbreakstyle{%
\def\txiarg{#1}%
\ifx\txiarg\wordnone
\def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
\else\ifx\txiarg\wordbefore
- \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
+ \def\urefprebreak{\urefallowbreak}\def\urefpostbreak{\nobreak}
\else\ifx\txiarg\wordafter
- \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
+ \def\urefprebreak{\nobreak}\def\urefpostbreak{\urefallowbreak}
\else
\errhelp = \EMsimple
\errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
@@ -3076,6 +3099,14 @@ end
\def\wordbefore{before}
\def\wordnone{none}
+% Allow a ragged right output to aid breaking long URL's. Putting stretch in
+% between characters of the URL doesn't look good.
+\def\urefallowbreak{%
+ \hskip 0pt plus 4 em\relax
+ \allowbreak
+ \hskip 0pt plus -4 em\relax
+}
+
\urefbreakstyle after
% @url synonym for @uref, since that's how everyone uses it.
@@ -3086,7 +3117,7 @@ end
% So now @email is just like @uref, unless we are pdf.
%
%\def\email#1{\angleleft{\tt #1}\angleright}
-\ifpdf
+\ifpdforxetex
\def\email#1{\doemail#1,,\finish}
\def\doemail#1,#2,#3\finish{\begingroup
\unsepspaces
@@ -3096,18 +3127,7 @@ end
\endlink
\endgroup}
\else
- \ifx\XeTeXrevision\thisisundefined
- \let\email=\uref
- \else
- \def\email#1{\doemail#1,,\finish}
- \def\doemail#1,#2,#3\finish{\begingroup
- \unsepspaces
- \pdfurl{mailto:#1}%
- \setbox0 = \hbox{\ignorespaces #2}%
- \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
- \endlink
- \endgroup}
- \fi
+ \let\email=\uref
\fi
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
@@ -4641,19 +4661,6 @@ end
}
}
-% We have this subroutine so that we can handle at least some @value's
-% properly in indexes (we call \makevalueexpandable in \indexdummies).
-% The command has to be fully expandable (if the variable is set), since
-% the result winds up in the index file. This means that if the
-% variable's value contains other Texinfo commands, it's almost certain
-% it will fail (although perhaps we could fix that with sufficient work
-% to do a one-level expansion on the result, instead of complete).
-%
-% Unfortunately, this has the consequence that when _ is in the *value*
-% of an @set, it does not print properly in the roman fonts (get the cmr
-% dot accent at position 126 instead). No fix comes to mind, and it's
-% been this way since 2003 or earlier, so just ignore it.
-%
\def\expandablevalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
{[No value for ``#1'']}%
@@ -4672,7 +4679,7 @@ end
% NB flag names containing - or _ may not work here.
\def\dummyvalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
- \noexpand\value{#1}%
+ \string\value{#1}%
\else
\csname SET#1\endcsname
\fi
@@ -4682,7 +4689,7 @@ end
% if possible, otherwise sort late.
\def\indexnofontsvalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
- ZZZZZZZ
+ ZZZZZZZ%
\else
\csname SET#1\endcsname
\fi
@@ -4832,29 +4839,15 @@ end
\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
-% Used when writing an index entry out to an index file to prevent
-% expansion of Texinfo commands that can appear in an index entry.
-%
-\def\indexdummies{%
- \escapechar = `\\ % use backslash in output files.
- \definedummyletter\@%
- \definedummyletter\ %
- %
- % For texindex which always views { and } as separators.
- \def\{{\lbracechar{}}%
- \def\}{\rbracechar{}}%
- %
- % Do the redefinitions.
- \definedummies
-}
-
-% Used for the aux and toc files, where @ is the escape character.
+% Used for the aux, toc and index files to prevent expansion of Texinfo
+% commands.
%
\def\atdummies{%
\definedummyletter\@%
\definedummyletter\ %
\definedummyletter\{%
\definedummyletter\}%
+ \definedummyletter\&%
%
% Do the redefinitions.
\definedummies
@@ -4878,8 +4871,7 @@ end
\def\definedummyletter#1{\def#1{\string#1}}%
\let\definedummyaccent\definedummyletter
-% Called from \indexdummies and \atdummies, to effectively prevent
-% the expansion of commands.
+% Called from \atdummies to prevent the expansion of commands.
%
\def\definedummies{%
%
@@ -4926,8 +4918,10 @@ end
\definedummyword\TeX
%
% Assorted special characters.
+ \definedummyword\ampchar
\definedummyword\atchar
\definedummyword\arrow
+ \definedummyword\backslashchar
\definedummyword\bullet
\definedummyword\comma
\definedummyword\copyright
@@ -4964,6 +4958,8 @@ end
\definedummyword\sup
\definedummyword\textdegree
%
+ \definedummyword\subentry
+ %
% We want to disable all macros so that they are not expanded by \write.
\macrolist
\let\value\dummyvalue
@@ -5044,11 +5040,10 @@ end
\commondummyword\xref
}
-% This does nothing, but for a time it was recommended to use
-% \usebracesinindexestrue to be able to use braces in index entries.
-
\let\indexlbrace\relax
\let\indexrbrace\relax
+\let\indexatchar\relax
+\let\indexbackslash\relax
{\catcode`\@=0
\catcode`\\=13
@@ -5082,10 +5077,8 @@ end
}
\gdef\indexnonalnumreappear{%
- \useindexbackslash
\let-\normaldash
\let<\normalless
- \def\@{@}%
}
}
@@ -5196,36 +5189,16 @@ end
-\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
-
-% Most index entries go through here, but \dosubind is the general case.
% #1 is the index name, #2 is the entry text.
-\def\doind#1#2{\dosubind{#1}{#2}{}}
-
-% There is also \dosubind {index}{topic}{subtopic}
-% which makes an entry in a two-level index such as the operation index.
-% TODO: Two-level index? Operation index?
-
-% Workhorse for all indexes.
-% #1 is name of index, #2 is stuff to put there, #3 is subentry --
-% empty if called from \doind, as we usually are (the main exception
-% is with most defuns, which call us directly).
-%
-\def\dosubind#1#2#3{%
+\def\doind#1#2{%
\iflinks
{%
- \requireopenindexfile{#1}%
- % Store the main index entry text (including the third arg).
- \toks0 = {#2}%
- % If third arg is present, precede it with a space.
- \def\thirdarg{#3}%
- \ifx\thirdarg\empty \else
- \toks0 = \expandafter{\the\toks0 \space #3}%
- \fi
%
+ \requireopenindexfile{#1}%
\edef\writeto{\csname#1indfile\endcsname}%
%
- \safewhatsit\dosubindwrite
+ \def\indextext{#2}%
+ \safewhatsit\doindwrite
}%
\fi
}
@@ -5247,21 +5220,7 @@ end
\fi}
\def\indexisfl{fl}
-% Output \ as {\indexbackslash}, because \ is an escape character in
-% the index files.
-\let\indexbackslash=\relax
-{\catcode`\@=0 \catcode`\\=\active
- @gdef@useindexbackslash{@def\{{@indexbackslash}}}
-}
-
-% Definition for writing index entry text.
-\def\sortas#1{\ignorespaces}%
-
-% Definition for writing index entry sort key. Should occur at the at
-% the beginning of the index entry, like
-% @cindex @sortas{september} \september
-% The \ignorespaces takes care of following space, but there's no way
-% to remove space before it.
+% Definition for writing index entry sort key.
{
\catcode`\-=13
\gdef\indexwritesortas{%
@@ -5272,51 +5231,150 @@ end
\xdef\indexsortkey{#1}\endgroup}
}
+\def\indexwriteseealso#1{
+ \gdef\pagenumbertext{\string\seealso{#1}}%
+}
+\def\indexwriteseeentry#1{
+ \gdef\pagenumbertext{\string\seeentry{#1}}%
+}
+
+% The default definitions
+\def\sortas#1{}%
+\def\seealso#1{\i{\putwordSeeAlso}\ #1}% for sorted index file only
+\def\putwordSeeAlso{See also}
+\def\seeentry#1{\i{\putwordSee}\ #1}% for sorted index file only
-% Write the entry in \toks0 to the index file.
+
+% Given index entry text like "aaa @subentry bbb @sortas{ZZZ}":
+% * Set \bracedtext to "{aaa}{bbb}"
+% * Set \fullindexsortkey to "aaa @subentry ZZZ"
+% * If @seealso occurs, set \pagenumbertext
%
-\def\dosubindwrite{%
- % Put the index entry in the margin if desired.
- \ifx\SETmarginindex\relax\else
- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
+\def\splitindexentry#1{%
+ \gdef\fullindexsortkey{}%
+ \xdef\bracedtext{}%
+ \def\sep{}%
+ \def\seealso##1{}%
+ \def\seeentry##1{}%
+ \expandafter\doindexsegment#1\subentry\finish\subentry
+}
+
+% append the results from the next segment
+\def\doindexsegment#1\subentry{%
+ \def\segment{#1}%
+ \ifx\segment\isfinish
+ \else
+ %
+ % Fully expand the segment, throwing away any @sortas directives, and
+ % trim spaces.
+ \edef\trimmed{\segment}%
+ \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+ %
+ \xdef\bracedtext{\bracedtext{\trimmed}}%
+ %
+ % Get the string to sort by. Process the segment with all
+ % font commands turned off.
+ \bgroup
+ \let\sortas\indexwritesortas
+ \let\seealso\indexwriteseealso
+ \let\seeentry\indexwriteseeentry
+ \indexnofonts
+ % The braces around the commands are recognized by texindex.
+ \def\lbracechar{{\string\indexlbrace}}%
+ \def\rbracechar{{\string\indexrbrace}}%
+ \let\{=\lbracechar
+ \let\}=\rbracechar
+ \def\@{{\string\indexatchar}}%
+ \def\atchar##1{\@}%
+ \def\backslashchar{{\string\indexbackslash}}%
+ \uccode`\~=`\\ \uppercase{\let~\backslashchar}%
+ %
+ \let\indexsortkey\empty
+ \global\let\pagenumbertext\empty
+ % Execute the segment and throw away the typeset output. This executes
+ % any @sortas or @seealso commands in this segment.
+ \setbox\dummybox = \hbox{\segment}%
+ \ifx\indexsortkey\empty{%
+ \indexnonalnumdisappear
+ \xdef\trimmed{\segment}%
+ \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+ \xdef\indexsortkey{\trimmed}%
+ \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
+ }\fi
+ %
+ % Append to \fullindexsortkey.
+ \edef\tmp{\gdef\noexpand\fullindexsortkey{%
+ \fullindexsortkey\sep\indexsortkey}}%
+ \tmp
+ \egroup
+ \def\sep{\subentry}%
+ %
+ \expandafter\doindexsegment
\fi
+}
+\def\isfinish{\finish}%
+\newbox\dummybox % used above
+
+\let\subentry\relax
+
+% Use \ instead of @ in index files. To support old texi2dvi and texindex.
+% This works without changing the escape character used in the toc or aux
+% files because the index entries are fully expanded here, and \string uses
+% the current value of \escapechar.
+\def\escapeisbackslash{\escapechar=`\\}
+
+% Use \ in index files by default. texi2dvi didn't support @ as the escape
+% character (as it checked for "\entry" in the files, and not "@entry"). When
+% the new version of texi2dvi has had a chance to become more prevalent, then
+% the escape character can change back to @ again. This should be an easy
+% change to make now because both @ and \ are only used as escape characters in
+% index files, never standing for themselves.
+%
+\set txiindexescapeisbackslash
+
+% Write the entry in \indextext to the index file.
+%
+\def\doindwrite{%
+ \maybemarginindex
%
- % Remember, we are within a group.
- \indexdummies % Must do this here, since \bf, etc expand at this stage
- \useindexbackslash % \indexbackslash isn't defined now so it will be output
- % as is; and it will print as backslash.
- % The braces around \indexbrace are recognized by texindex.
- %
- % Get the string to sort by, by processing the index entry with all
- % font commands turned off.
- {\indexnofonts
- \def\lbracechar{{\indexlbrace}}%
- \def\rbracechar{{\indexrbrace}}%
- \let\{=\lbracechar
- \let\}=\rbracechar
- \indexnonalnumdisappear
- \xdef\indexsortkey{}%
- \let\sortas=\indexwritesortas
- \edef\temp{\the\toks0}%
- \setbox\dummybox = \hbox{\temp}% Make sure to execute any \sortas
- \ifx\indexsortkey\empty
- \xdef\indexsortkey{\temp}%
- \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
- \fi
- }%
+ \atdummies
+ %
+ \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else
+ \escapeisbackslash
+ \fi
+ %
+ % For texindex which always views { and } as separators.
+ \def\{{\lbracechar{}}%
+ \def\}{\rbracechar{}}%
+ \uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}%
+ %
+ % Split the entry into primary entry and any subentries, and get the index
+ % sort key.
+ \splitindexentry\indextext
%
% Set up the complete index entry, with both the sort key and
% the original text, including any font commands. We write
% three arguments to \entry to the .?? file (four in the
% subentry case), texindex reduces to two when writing the .??s
% sorted result.
+ %
\edef\temp{%
\write\writeto{%
- \string\entry{\indexsortkey}{\noexpand\folio}{\the\toks0}}%
+ \string\entry{\fullindexsortkey}%
+ {\ifx\pagenumbertext\empty\noexpand\folio\else\pagenumbertext\fi}%
+ \bracedtext}%
}%
\temp
}
-\newbox\dummybox % used above
+
+% Put the index entry in the margin if desired (undocumented).
+\def\maybemarginindex{%
+ \ifx\SETmarginindex\relax\else
+ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}%
+ \fi
+}
+\let\SETmarginindex=\relax
+
% Take care of unwanted page breaks/skips around a whatsit:
%
@@ -5404,9 +5462,14 @@ end
% \entry {topic}{pagelist}
% for a topic that is used without subtopics
% \primary {topic}
+% \entry {topic}{}
% for the beginning of a topic that is used with subtopics
% \secondary {subtopic}{pagelist}
% for each subtopic.
+% \secondary {subtopic}{}
+% for a subtopic with sub-subtopics
+% \tertiary {subtopic}{subsubtopic}{pagelist}
+% for each sub-subtopic.
% Define the user-accessible indexing commands
% @findex, @vindex, @kindex, @cindex.
@@ -5418,11 +5481,6 @@ end
\def\tindex {\tpindex}
\def\pindex {\pgindex}
-\def\cindexsub {\begingroup\obeylines\cindexsub}
-{\obeylines %
-\gdef\cindexsub "#1" #2^^M{\endgroup %
-\dosubind{cp}{#2}{#1}}}
-
% Define the macros used in formatting output of the sorted index material.
% @printindex causes a particular index (the ??s file) to get printed.
@@ -5436,14 +5494,10 @@ end
\plainfrenchspacing
\everypar = {}% don't want the \kern\-parindent from indentation suppression.
%
- % See if the index file exists and is nonempty.
- % Change catcode of @ here so that if the index file contains
- % \initial {@}
- % as its first line, TeX doesn't complain about mismatched braces
- % (because it thinks @} is a control sequence).
- \catcode`\@ = 12
% See comment in \requireopenindexfile.
\def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi
+ %
+ % See if the index file exists and is nonempty.
\openin 1 \jobname.\indexname s
\ifeof 1
% \enddoublecolumns gets confused if there is no text in the index,
@@ -5453,8 +5507,6 @@ end
\putwordIndexNonexistent
\typeout{No file \jobname.\indexname s.}%
\else
- \catcode`\\ = 0
- %
% If the index file exists but is empty, then \openin leaves \ifeof
% false. We have to make TeX try to read something from the file, so
% it can discover if there is anything in it.
@@ -5462,47 +5514,51 @@ end
\ifeof 1
\putwordIndexIsEmpty
\else
- % Index files are almost Texinfo source, but we use \ as the escape
- % character. It would be better to use @, but that's too big a change
- % to make right now.
- \def\indexbackslash{\ttbackslash}%
- \let\indexlbrace\{ % Likewise, set these sequences for braces
- \let\indexrbrace\} % used in the sort key.
- \begindoublecolumns
- \let\dotheinsertentrybox\dotheinsertentryboxwithpenalty
- %
- % Read input from the index file line by line.
- \loopdo
- \ifeof1 \else
- \read 1 to \nextline
- \fi
- %
- \indexinputprocessing
- \thisline
- %
- \ifeof1\else
- \let\thisline\nextline
- \repeat
- %%
- \enddoublecolumns
+ \expandafter\printindexzz\thisline\relax\relax\finish%
\fi
\fi
\closein 1
\endgroup}
-\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx}
-\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next}
-\def\indexinputprocessing{%
- \ifeof1
- \let\firsttoken\relax
+% If the index file starts with a backslash, forgo reading the index
+% file altogether. If somebody upgrades texinfo.tex they may still have
+% old index files using \ as the escape character. Reading this would
+% at best lead to typesetting garbage, at worst a TeX syntax error.
+\def\printindexzz#1#2\finish{%
+ \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax
+ \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1
+ \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax
+\errmessage{%
+ERROR: A sorted index file in an obsolete format was skipped.
+To fix this problem, please upgrade your version of 'texi2dvi'
+or 'texi2pdf' to that at <https://ftp.gnu.org/gnu/texinfo>.
+If you are using an old version of 'texindex' (part of the Texinfo
+distribution), you may also need to upgrade to a newer version (at least 6.0).
+You may be able to typeset the index if you run
+'texindex \jobname.\indexname' yourself.
+You could also try setting the 'txiindexescapeisbackslash' flag by
+running a command like
+'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do
+this, Texinfo will try to use index files in the old format.
+If you continue to have problems, deleting the index files and starting again
+might help (with 'rm \jobname.?? \jobname.??s')%
+}%
+ \else
+ (Skipped sorted index file in obsolete format)
+ \fi
+ \else
+ \begindoublecolumns
+ \input \jobname.\indexname s
+ \enddoublecolumns
+ \fi
\else
- \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}%
- \act
+ \begindoublecolumns
+ \catcode`\\=0\relax
+ \catcode`\@=12\relax
+ \input \jobname.\indexname s
+ \enddoublecolumns
\fi
}
-\def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken}
-\long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1}
-
% These macros are used by the sorted index file itself.
% Change them to control the appearance of the index.
@@ -5511,12 +5567,19 @@ end
\catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13
\catcode`\$=3
\gdef\initialglyphs{%
+ % special control sequences used in the index sort key
+ \let\indexlbrace\{%
+ \let\indexrbrace\}%
+ \let\indexatchar\@%
+ \def\indexbackslash{\math{\backslash}}%
+ %
% Some changes for non-alphabetic characters. Using the glyphs from the
% math fonts looks more consistent than the typewriter font used elsewhere
% for these characters.
- \def\indexbackslash{\math{\backslash}}%
- \let\\=\indexbackslash
+ \uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}}
%
+ % In case @\ is used for backslash
+ \uppercase{\let\\=~}
% Can't get bold backslash so don't use bold forward slash
\catcode`\/=13
\def/{{\secrmnotbold \normalslash}}%
@@ -5576,12 +5639,6 @@ end
\def\entry{%
\begingroup
%
- % For pdfTeX and XeTeX.
- % The redefinition of \domark stops marks being added in \pdflink to
- % preserve coloured links across page boundaries. Otherwise the marks
- % would get in the way of \lastbox in \insertentrybox.
- \let\domark\relax
- %
% Start a new paragraph if necessary, so our assignments below can't
% affect previous text.
\par
@@ -5614,35 +5671,31 @@ end
\gdef\finishentry#1{%
\egroup % end box A
\dimen@ = \wd\boxA % Length of text of entry
- \global\setbox\boxA=\hbox\bgroup\unhbox\boxA
- % #1 is the page number.
- %
- % Get the width of the page numbers, and only use
- % leaders if they are present.
- \global\setbox\boxB = \hbox{#1}%
- \ifdim\wd\boxB = 0pt
- \null\nobreak\hfill\ %
- \else
- %
- \null\nobreak\indexdotfill % Have leaders before the page number.
+ \global\setbox\boxA=\hbox\bgroup
+ \unhbox\boxA
+ % #1 is the page number.
%
- \ifpdf
- \pdfgettoks#1.%
- \hskip\skip\thinshrinkable\the\toksA
+ % Get the width of the page numbers, and only use
+ % leaders if they are present.
+ \global\setbox\boxB = \hbox{#1}%
+ \ifdim\wd\boxB = 0pt
+ \null\nobreak\hfill\ %
\else
- \ifx\XeTeXrevision\thisisundefined
- \hskip\skip\thinshrinkable #1%
- \else
+ %
+ \null\nobreak\indexdotfill % Have leaders before the page number.
+ %
+ \ifpdforxetex
\pdfgettoks#1.%
\hskip\skip\thinshrinkable\the\toksA
+ \else
+ \hskip\skip\thinshrinkable #1%
\fi
\fi
- \fi
\egroup % end \boxA
\ifdim\wd\boxB = 0pt
- \global\setbox\entrybox=\vbox{\unhbox\boxA}%
- \else
- \global\setbox\entrybox=\vbox\bgroup
+ \noindent\unhbox\boxA\par
+ \nobreak
+ \else\bgroup
% We want the text of the entries to be aligned to the left, and the
% page numbers to be aligned to the right.
%
@@ -5708,55 +5761,11 @@ end
\egroup % The \vbox
\fi
\endgroup
- \dotheinsertentrybox
}}
\newskip\thinshrinkable
\skip\thinshrinkable=.15em minus .15em
-\newbox\entrybox
-\def\insertentrybox{%
- \ourunvbox\entrybox
-}
-
-% default definition
-\let\dotheinsertentrybox\insertentrybox
-
-% Use \lastbox to take apart vbox box by box, and add each sub-box
-% to the current vertical list.
-\def\ourunvbox#1{%
-\bgroup % for local binding of \delayedbox
- % Remove the last box from box #1
- \global\setbox#1=\vbox{%
- \unvbox#1%
- \unskip % remove any glue
- \unpenalty
- \global\setbox\interbox=\lastbox
- }%
- \setbox\delayedbox=\box\interbox
- \ifdim\ht#1=0pt\else
- \ourunvbox#1 % Repeat on what's left of the box
- \nobreak
- \fi
- \box\delayedbox
-\egroup
-}
-\newbox\delayedbox
-\newbox\interbox
-
-% Used from \printindex. \firsttoken should be the first token
-% after the \entry. If it's not another \entry, we are at the last
-% line of a group of index entries, so insert a penalty to discourage
-% widowed index entries.
-\def\dotheinsertentryboxwithpenalty{%
- \ifx\firsttoken\isentry
- \else
- \penalty 9000
- \fi
- \insertentrybox
-}
-\def\isentry{\entry}%
-
% Like plain.tex's \dotfill, except uses up at least 1 em.
% The filll stretch here overpowers both the fil and fill stretch to push
% the page number to the right.
@@ -5766,24 +5775,15 @@ end
\def\primary #1{\line{#1\hfil}}
-\newskip\secondaryindent \secondaryindent=0.5cm
-\def\secondary#1#2{{%
- \parfillskip=0in
- \parskip=0in
- \hangindent=1in
- \hangafter=1
- \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
- \ifpdf
- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
- \else
- \ifx\XeTeXrevision\thisisundefined
- #2
- \else
- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
- \fi
- \fi
- \par
-}}
+\def\secondary{\indententry{0.5cm}}
+\def\tertiary{\indententry{1cm}}
+
+\def\indententry#1#2#3{%
+ \bgroup
+ \leftskip=#1
+ \entry{#2}{#3}%
+ \egroup
+}
% Define two-column mode, which we use to typeset indexes.
% Adapted from the TeXbook, page 416, which is to say,
@@ -5793,60 +5793,21 @@ end
\newbox\partialpage
\newdimen\doublecolumnhsize
-% Use inside an output routine to save \topmark and \firstmark
-\def\savemarks{%
- \global\savedtopmark=\expandafter{\topmark }%
- \global\savedfirstmark=\expandafter{\firstmark }%
-}
-\newtoks\savedtopmark
-\newtoks\savedfirstmark
-
-% Set \topmark and \firstmark for next time \output runs.
-% Can't be run from withinside \output (because any material
-% added while an output routine is active, including
-% penalties, is saved for after it finishes). The page so far
-% should be empty, otherwise what's on it will be thrown away.
-\def\restoremarks{%
- \mark{\the\savedtopmark}%
- \bgroup\output = {%
- \setbox\dummybox=\box\PAGE
- }abc\eject\egroup
- % "abc" because output routine doesn't fire for a completely empty page.
- \mark{\the\savedfirstmark}%
-}
-
\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
% If not much space left on page, start a new page.
\ifdim\pagetotal>0.8\vsize\vfill\eject\fi
%
% Grab any single-column material above us.
\output = {%
- %
- % Here is a possibility not foreseen in manmac: if we accumulate a
- % whole lot of material, we might end up calling this \output
- % routine twice in a row (see the doublecol-lose test, which is
- % essentially a couple of indexes with @setchapternewpage off). In
- % that case we just ship out what is in \partialpage with the normal
- % output routine. Generally, \partialpage will be empty when this
- % runs and this will be a no-op. See the indexspread.tex test case.
- \ifvoid\partialpage \else
- \onepageout{\pagecontents\partialpage}%
- \fi
+ \savetopmark
%
\global\setbox\partialpage = \vbox{%
% Unvbox the main output page.
\unvbox\PAGE
\kern-\topskip \kern\baselineskip
}%
- \savemarks
}%
\eject % run that output routine to set \partialpage
- \restoremarks
- %
- % We recover the two marks that the last output routine saved in order
- % to propagate the information in marks added around a chapter heading,
- % which could be otherwise be lost by the time the final page is output.
- %
%
% Use the double-column output routine for subsequent pages.
\output = {\doublecolumnout}%
@@ -5887,6 +5848,7 @@ end
%
\def\doublecolumnout{%
%
+ \savetopmark
\splittopskip=\topskip \splitmaxdepth=\maxdepth
\dimen@ = \vsize
\divide\dimen@ by 2
@@ -5910,7 +5872,7 @@ end
}
-% Finished with with double columns.
+% Finished with double columns.
\def\enddoublecolumns{%
% The following penalty ensures that the page builder is exercised
% _before_ we change the output routine. This is necessary in the
@@ -5942,7 +5904,7 @@ end
%
\output = {%
% Split the last of the double-column material.
- \savemarks
+ \savetopmark
\balancecolumns
}%
\eject % call the \output just set
@@ -5950,10 +5912,9 @@ end
% Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
% definition right away.
- \global\output = {\onepageout{\pagecontents\PAGE}}%
+ \global\output=\expandafter{\the\defaultoutput}
%
\endgroup % started in \begindoublecolumns
- \restoremarks
% Leave the double-column material on the current page, no automatic
% page break.
\box\balancedcolumns
@@ -6119,11 +6080,9 @@ end
% @raisesections: treat @section as chapter, @subsection as section, etc.
\def\raisesections{\global\advance\secbase by -1}
-\let\up=\raisesections % original BFox name
% @lowersections: treat @chapter as section, @section as subsection, etc.
\def\lowersections{\global\advance\secbase by 1}
-\let\down=\lowersections % original BFox name
% we only have subsub.
\chardef\maxseclevel = 3
@@ -6468,27 +6427,22 @@ end
\expandafter\ifx\thisenv\titlepage\else
\checkenv{}% chapters, etc., should not start inside an environment.
\fi
- % FIXME: \chapmacro is currently called from inside \titlepage when
- % \setcontentsaftertitlepage to print the "Table of Contents" heading, but
- % this should probably be done by \sectionheading with an option to print
- % in chapter size.
- %
% Insert the first mark before the heading break (see notes for \domark).
- \let\prevchapterdefs=\lastchapterdefs
- \let\prevsectiondefs=\lastsectiondefs
- \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+ \let\prevchapterdefs=\currentchapterdefs
+ \let\prevsectiondefs=\currentsectiondefs
+ \gdef\currentsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
\gdef\thissection{}}%
%
\def\temptype{#2}%
\ifx\temptype\Ynothingkeyword
- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
\gdef\thischapter{\thischaptername}}%
\else\ifx\temptype\Yomitfromtockeyword
- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
\gdef\thischapter{}}%
\else\ifx\temptype\Yappendixkeyword
\toks0={#1}%
- \xdef\lastchapterdefs{%
+ \xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\appendixletter}%
% \noexpand\putwordAppendix avoids expanding indigestible
@@ -6499,7 +6453,7 @@ end
}%
\else
\toks0={#1}%
- \xdef\lastchapterdefs{%
+ \xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\the\chapno}%
% \noexpand\putwordChapter avoids expanding indigestible
@@ -6519,18 +6473,18 @@ end
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \let\prevchapterdefs=\lastchapterdefs
- \let\prevsectiondefs=\lastsectiondefs
+ \let\prevchapterdefs=\currentchapterdefs
+ \let\prevsectiondefs=\currentsectiondefs
\domark
%
{%
\chapfonts \rm
\let\footnote=\errfootnoteheading % give better error message
%
- % Have to define \lastsection before calling \donoderef, because the
+ % Have to define \currentsection before calling \donoderef, because the
% xref code eventually uses it. On the other hand, it has to be called
% after \pchapsepmacro, or the headline will change too soon.
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
%
% Only insert the separating space if we have a chapter/appendix
% number, and don't print the unnumbered ``number''.
@@ -6619,10 +6573,10 @@ end
\csname #2fonts\endcsname \rm
%
% Insert first mark before the heading break (see notes for \domark).
- \let\prevsectiondefs=\lastsectiondefs
+ \let\prevsectiondefs=\currentsectiondefs
\ifx\temptype\Ynothingkeyword
\ifx\sectionlevel\seckeyword
- \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+ \gdef\currentsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
\gdef\thissection{\thissectionname}}%
\fi
\else\ifx\temptype\Yomitfromtockeyword
@@ -6630,7 +6584,7 @@ end
\else\ifx\temptype\Yappendixkeyword
\ifx\sectionlevel\seckeyword
\toks0={#1}%
- \xdef\lastsectiondefs{%
+ \xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
% \noexpand\putwordSection avoids expanding indigestible
@@ -6643,7 +6597,7 @@ end
\else
\ifx\sectionlevel\seckeyword
\toks0={#1}%
- \xdef\lastsectiondefs{%
+ \xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
% \noexpand\putwordSection avoids expanding indigestible
@@ -6669,28 +6623,28 @@ end
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \global\let\prevsectiondefs=\lastsectiondefs
+ \global\let\prevsectiondefs=\currentsectiondefs
\domark
%
% Only insert the space after the number if we have a section number.
\ifx\temptype\Ynothingkeyword
\setbox0 = \hbox{}%
\def\toctype{unn}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\else\ifx\temptype\Yomitfromtockeyword
% for @headings -- no section number, don't include in toc,
- % and don't redefine \lastsection.
+ % and don't redefine \currentsection.
\setbox0 = \hbox{}%
\def\toctype{omit}%
\let\sectionlevel=\empty
\else\ifx\temptype\Yappendixkeyword
\setbox0 = \hbox{#4\enspace}%
\def\toctype{app}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\else
\setbox0 = \hbox{#4\enspace}%
\def\toctype{num}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\fi\fi\fi
%
% Write the toc entry (before \donoderef). See comments in \chapmacro.
@@ -6780,13 +6734,8 @@ end
% 1 and 2 (the page numbers aren't printed), and so are the first
% two pages of the document. Thus, we'd have two destinations named
% `1', and two named `2'.
- \ifpdf
+ \ifpdforxetex
\global\pdfmakepagedesttrue
- \else
- \ifx\XeTeXrevision\thisisundefined
- \else
- \global\pdfmakepagedesttrue
- \fi
\fi
}
@@ -7149,11 +7098,7 @@ end
% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
% environment contents.
-\font\circle=lcircle10
-\newdimen\circthick
-\newdimen\cartouter\newdimen\cartinner
-\newskip\normbskip\newskip\normpskip\newskip\normlskip
-\circthick=\fontdimen8\circle
+
%
\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
\def\ctr{{\hskip 6pt\circle\char'010}}
@@ -7168,7 +7113,18 @@ end
%
\newskip\lskip\newskip\rskip
+% only require the font if @cartouche is actually used
+\def\cartouchefontdefs{%
+ \font\circle=lcircle10\relax
+ \circthick=\fontdimen8\circle
+}
+\newdimen\circthick
+\newdimen\cartouter\newdimen\cartinner
+\newskip\normbskip\newskip\normpskip\newskip\normlskip
+
+
\envdef\cartouche{%
+ \cartouchefontdefs
\ifhmode\par\fi % can't be in the midst of a paragraph.
\startsavinginserts
\lskip=\leftskip \rskip=\rightskip
@@ -7347,13 +7303,9 @@ end
% @raggedright does more-or-less normal line breaking but no right
-% justification. From plain.tex. Don't stretch around special
-% characters in urls in this environment, since the stretch at the right
-% should be enough.
+% justification. From plain.tex.
\envdef\raggedright{%
\rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax
- \def\urefprestretchamount{0pt}%
- \def\urefpoststretchamount{0pt}%
}
\let\Eraggedright\par
@@ -7728,6 +7680,21 @@ end
\fi\fi
}
+% \dosubind {index}{topic}{subtopic}
+%
+% If SUBTOPIC is present, precede it with a space, and call \doind.
+% (At some time during the 20th century, this made a two-level entry in an
+% index such as the operation index. Nobody seemed to notice the change in
+% behaviour though.)
+\def\dosubind#1#2#3{%
+ \def\thirdarg{#3}%
+ \ifx\thirdarg\empty
+ \doind{#1}{#2}%
+ \else
+ \doind{#1}{#2\space#3}%
+ \fi
+}
+
% Untyped functions:
% @deffn category name args
@@ -7742,7 +7709,6 @@ end
% \deffngeneral {subind}category name args
%
\def\deffngeneral#1#2 #3 #4\endheader{%
- % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
\dosubind{fn}{\code{#3}}{#1}%
\defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
}
@@ -8030,36 +7996,18 @@ end
}
\fi
-% alias because \c means cedilla in @tex or @math
-\let\texinfoc=\c
-
-\newcount\savedcatcodeone
-\newcount\savedcatcodetwo
-
% Used at the time of macro expansion.
% Argument is macro body with arguments substituted
\def\scanmacro#1{%
\newlinechar`\^^M
\def\xeatspaces{\eatspaces}%
%
- % Temporarily undo catcode changes of \printindex. Set catcode of @ to
- % 0 so that @-commands in macro expansions aren't printed literally when
- % formatting an index file, where \ is used as the escape character.
- \savedcatcodeone=\catcode`\@
- \savedcatcodetwo=\catcode`\\
- \catcode`\@=0
- \catcode`\\=\active
- %
% Process the macro body under the current catcode regime.
- \scantokens{#1@texinfoc}%
+ \scantokens{#1@comment}%
%
- \catcode`\@=\savedcatcodeone
- \catcode`\\=\savedcatcodetwo
- %
- % The \texinfoc is to remove the \newlinechar added by \scantokens, and
- % can be noticed by \parsearg.
- % We avoid surrounding the call to \scantokens with \bgroup and \egroup
- % to allow macros to open or close groups themselves.
+ % The \comment is to remove the \newlinechar added by \scantokens, and
+ % can be noticed by \parsearg. Note \c isn't used because this means cedilla
+ % in math mode.
}
% Used for copying and captions
@@ -8160,12 +8108,14 @@ end
\def\macroargctxt{%
\scanctxt
\catcode`\ =\active
+ \catcode`\@=\other
\catcode`\^^M=\other
\catcode`\\=\active
}
\def\macrolineargctxt{% used for whole-line arguments without braces
\scanctxt
+ \catcode`\@=\other
\catcode`\{=\other
\catcode`\}=\other
}
@@ -8729,9 +8679,29 @@ end
% also remove a trailing comma, in case of something like this:
% @node Help-Cross, , , Cross-refs
\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
-\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}\omittopnode}
+
+% Used so that the @top node doesn't have to be wrapped in an @ifnottex
+% conditional.
+% \doignore goes to more effort to skip nested conditionals but we don't need
+% that here.
+\def\omittopnode{%
+ \ifx\lastnode\wordTop
+ \expandafter\ignorenode\fi
+}
+\def\wordTop{Top}
+
+% Until the next @node or @bye command, divert output to a box that is not
+% output.
+\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}%
+\ignorenodebye
+}
+
+{\let\bye\relax
+\gdef\ignorenodebye{\let\bye\ignorenodebyedef}
+\gdef\ignorenodebyedef{\egroup(`Top' node ignored)\bye}}
+% The redefinition of \bye here is because it is declared \outer
-\let\nwnode=\node
\let\lastnode=\empty
% Write a cross-reference definition for the current node. #1 is the
@@ -8754,7 +8724,7 @@ end
% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
% anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \lastsection,
+% 1) NAME-title - the current sectioning name taken from \currentsection,
% or the anchor name.
% 2) NAME-snt - section number and type, passed as the SNT arg, or
% empty for anchors.
@@ -8776,7 +8746,7 @@ end
\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
##1}{##2}}% these are parameters of \writexrdef
}%
- \toks0 = \expandafter{\lastsection}%
+ \toks0 = \expandafter{\currentsection}%
\immediate \writexrdef{title}{\the\toks0 }%
\immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
\safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
@@ -9206,19 +9176,6 @@ end
\catcode`\^^]=\other
\catcode`\^^^=\other
\catcode`\^^_=\other
- % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
- % in xref tags, i.e., node names. But since ^^e4 notation isn't
- % supported in the main text, it doesn't seem desirable. Furthermore,
- % that is not enough: for node names that actually contain a ^
- % character, we would end up writing a line like this: 'xrdef {'hat
- % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
- % argument, and \hat is not an expandable control sequence. It could
- % all be worked out, but why? Either we support ^^ or we don't.
- %
- % The other change necessary for this was to define \auxhat:
- % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
- % and then to call \auxhat in \setq.
- %
\catcode`\^=\other
%
% Special characters. Should be turned off anyway, but...
@@ -9236,14 +9193,7 @@ end
\catcode`\%=\other
\catcode`+=\other % avoid \+ for paranoia even though we've turned it off
%
- % This is to support \ in node names and titles, since the \
- % characters end up in a \csname. It's easier than
- % leaving it active and making its active definition an actual \
- % character. What I don't understand is why it works in the *value*
- % of the xrdef. Seems like it should be a catcode12 \, and that
- % should not typeset properly. But it works, so I'm moving on for
- % now. --karl, 15jan04.
- \catcode`\\=\other
+ \catcode`\\=\active
%
% @ is our escape character in .aux files, and we need braces.
\catcode`\{=1
@@ -9574,13 +9524,13 @@ end
\global\advance\floatno by 1
%
{%
- % This magic value for \lastsection is output by \setref as the
+ % This magic value for \currentsection is output by \setref as the
% XREFLABEL-title value. \xrefX uses it to distinguish float
% labels (which have a completely different output format) from
% node and anchor labels. And \xrdef uses it to construct the
% lists of floats.
%
- \edef\lastsection{\floatmagic=\safefloattype}%
+ \edef\currentsection{\floatmagic=\safefloattype}%
\setref{\floatlabel}{Yfloat}%
}%
\fi
@@ -9703,7 +9653,7 @@ end
% #1 is the control sequence we are passed; we expand into a conditional
% which is true if #1 represents a float ref. That is, the magic
-% \lastsection value which we \setref above.
+% \currentsection value which we \setref above.
%
\def\iffloat#1{\expandafter\doiffloat#1==\finish}
%
@@ -11191,21 +11141,14 @@ directory should work if nowhere else does.}
\relax
}
-% define all Unicode characters we know about, for the sake of @U.
+% Define all Unicode characters we know about. This makes UTF-8 the default
+% input encoding and allows @U to work.
\iftxinativeunicodecapable
\nativeunicodechardefsatu
\else
\utfeightchardefs
\fi
-
-% Make non-ASCII characters printable again for compatibility with
-% existing Texinfo documents that may use them, even without declaring a
-% document encoding.
-%
-\setnonasciicharscatcode \other
-
-
\message{formatting,}
\newdimen\defaultparindent \defaultparindent = 15pt
@@ -11521,11 +11464,9 @@ directory should work if nowhere else does.}
% \backslashcurfont outputs one backslash character in current font,
% as in \char`\\.
\global\chardef\backslashcurfont=`\\
-\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
-% \realbackslash is an actual character `\' with catcode other, and
-% \doublebackslash is two of them (for the pdf outlines).
-{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
+% \realbackslash is an actual character `\' with catcode other.
+{\catcode`\\=\other @gdef@realbackslash{\}}
% In Texinfo, backslash is an active character; it prints the backslash
% in fixed width font.
@@ -11543,10 +11484,8 @@ directory should work if nowhere else does.}
@def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
@let@backslashchar = @ttbackslash % @backslashchar{} is for user documents.
-% \rawbackslash defines an active \ to do \backslashcurfont.
% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other. We switch back and forth between these.
-@gdef@rawbackslash{@let\=@backslashcurfont}
+% catcode other.
@gdef@otherbackslash{@let\=@realbackslash}
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
@@ -11618,7 +11557,7 @@ directory should work if nowhere else does.}
@ifx\@eatinput @let\ = @ttbackslash @fi
@catcode13=5 % regular end of line
@enableemergencynewline
- @let@c=@texinfoc
+ @let@c=@comment
@let@parsearg@originalparsearg
% Also turn back on active characters that might appear in the input
% file name, in case not using a pre-dumped format.
diff --git a/macros/texinfo/texinfo/ABOUT-NLS b/macros/texinfo/texinfo/ABOUT-NLS
index 3cc828658c..0a9d56d9e7 100644
--- a/macros/texinfo/texinfo/ABOUT-NLS
+++ b/macros/texinfo/texinfo/ABOUT-NLS
@@ -1,1379 +1 @@
-1 Notes on the Free Translation Project
-***************************************
-
-Free software is going international! The Free Translation Project is a
-way to get maintainers of free software, translators, and users all
-together, so that free software will gradually become able to speak many
-languages. A few packages already provide translations for their
-messages.
-
- If you found this 'ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU 'gettext' internally,
-itself available at your nearest GNU archive site. But you do _not_
-need to install GNU 'gettext' prior to configuring, installing or using
-this package with messages translated.
-
- Installers will find here some useful hints. These notes also
-explain how users should proceed for getting the programs to use the
-available translations. They tell how people wanting to contribute and
-work on translations can contact the appropriate team.
-
-1.1 INSTALL Matters
-===================
-
-Some packages are "localizable" when properly installed; the programs
-they contain can be made to speak your own native language. Most such
-packages use GNU 'gettext'. Other packages have their own ways to
-internationalization, predating GNU 'gettext'.
-
- By default, this package will be installed to allow translation of
-messages. It will automatically detect whether the system already
-provides the GNU 'gettext' functions. Installers may use special
-options at configuration time for changing the default behaviour. The
-command:
-
- ./configure --disable-nls
-
-will _totally_ disable translation of messages.
-
- When you already have GNU 'gettext' installed on your system and run
-configure without an option for your new package, 'configure' will
-probably detect the previously built and installed 'libintl' library and
-will decide to use it. If not, you may have to to use the
-'--with-libintl-prefix' option to tell 'configure' where to look for it.
-
- Internationalized packages usually have many 'po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language. Unless
-translations have been forbidden at 'configure' time by using the
-'--disable-nls' switch, all available translations are installed
-together with the package. However, the environment variable 'LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-'LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-1.2 Using This Package
-======================
-
-As a user, if your language has been installed for this package, you
-only have to set the 'LANG' environment variable to the appropriate
-'LL_CC' combination. If you happen to have the 'LC_ALL' or some other
-'LC_xxx' environment variables set, you should unset them before setting
-'LANG', otherwise the setting of 'LANG' will not have the desired
-effect. Here 'LL' is an ISO 639 two-letter language code, and 'CC' is
-an ISO 3166 two-letter country code. For example, let's suppose that
-you speak German and live in Germany. At the shell prompt, merely
-execute 'setenv LANG de_DE' (in 'csh'), 'export LANG; LANG=de_DE' (in
-'sh') or 'export LANG=de_DE' (in 'bash'). This can be done from your
-'.login' or '.profile' file, once and for all.
-
- You might think that the country code specification is redundant.
-But in fact, some languages have dialects in different countries. For
-example, 'de_AT' is used for Austria, and 'pt_BR' for Brazil. The
-country code serves to distinguish the dialects.
-
- The locale naming convention of 'LL_CC', with 'LL' denoting the
-language and 'CC' denoting the country, is the one use on systems based
-on GNU libc. On other systems, some variations of this scheme are used,
-such as 'LL' or 'LL_CC.ENCODING'. You can get the list of locales
-supported by your system for your language by running the command
-'locale -a | grep '^LL''.
-
- Not all programs have translations for all languages. By default, an
-English message is shown in place of a nonexistent translation. If you
-understand other languages, you can set up a priority list of languages.
-This is done through a different environment variable, called
-'LANGUAGE'. GNU 'gettext' gives preference to 'LANGUAGE' over 'LANG'
-for the purpose of message handling, but you still need to have 'LANG'
-set to the primary language; this is required by other parts of the
-system libraries. For example, some Swedish users who would rather read
-translations in German than English for when Swedish is not available,
-set 'LANGUAGE' to 'sv:de' while leaving 'LANG' to 'sv_SE'.
-
- Special advice for Norwegian users: The language code for Norwegian
-bokma*l changed from 'no' to 'nb' recently (in 2003). During the
-transition period, while some message catalogs for this language are
-installed under 'nb' and some older ones under 'no', it's recommended
-for Norwegian users to set 'LANGUAGE' to 'nb:no' so that both newer and
-older translations are used.
-
- In the 'LANGUAGE' environment variable, but not in the 'LANG'
-environment variable, 'LL_CC' combinations can be abbreviated as 'LL' to
-denote the language's main dialect. For example, 'de' is equivalent to
-'de_DE' (German as spoken in Germany), and 'pt' to 'pt_PT' (Portuguese
-as spoken in Portugal) in this context.
-
-1.3 Translating Teams
-=====================
-
-For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list. The up-to-date list of
-teams can be found at the Free Translation Project's homepage,
-'http://translationproject.org/', in the "Teams" area.
-
- If you'd like to volunteer to _work_ at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is _not_ the same as the list itself, it has
-'-request' appended. For example, speakers of Swedish can send a
-message to 'sv-request@li.org', having this message body:
-
- subscribe
-
- Keep in mind that team members are expected to participate _actively_
-in translations, or at solving translational difficulties, rather than
-merely lurking around. If your team does not exist yet and you want to
-start one, or if you are unsure about what to do or how to get started,
-please write to 'coordinator@translationproject.org' to reach the
-coordinator for all translator teams.
-
- The English team is special. It works at improving and uniformizing
-the terminology in use. Proven linguistic skills are praised more than
-programming skills, here.
-
-1.4 Available Packages
-======================
-
-Languages are not equally supported in all packages. The following
-matrix shows the current state of internationalization, as of Jun 2014.
-The matrix shows, in regard of each package, for which languages PO
-files have been submitted to translation coordination, with a
-translation percentage of at least 50%.
-
- Ready PO files af am an ar as ast az be bg bn bn_IN bs ca crh cs
- +---------------------------------------------------+
- a2ps | [] [] [] |
- aegis | |
- anubis | |
- aspell | [] [] [] |
- bash | [] [] [] |
- bfd | |
- binutils | [] |
- bison | |
- bison-runtime | [] |
- buzztrax | [] |
- ccd2cue | |
- ccide | |
- cflow | |
- clisp | |
- coreutils | [] [] |
- cpio | |
- cppi | |
- cpplib | [] |
- cryptsetup | [] |
- datamash | |
- denemo | [] [] |
- dfarc | [] |
- dialog | [] [] [] |
- dico | |
- diffutils | [] |
- dink | [] |
- direvent | |
- doodle | [] |
- dos2unix | |
- dos2unix-man | |
- e2fsprogs | [] [] |
- enscript | [] |
- exif | [] |
- fetchmail | [] [] |
- findutils | [] |
- flex | [] |
- freedink | [] [] |
- fusionforge | |
- gas | |
- gawk | [] |
- gcal | [] |
- gcc | |
- gdbm | |
- gettext-examples | [] [] [] [] [] |
- gettext-runtime | [] [] [] |
- gettext-tools | [] [] |
- gjay | |
- glunarclock | [] [] [] |
- gnubiff | [] |
- gnubik | [] |
- gnucash | () () [] |
- gnuchess | |
- gnulib | [] |
- gnunet | |
- gnunet-gtk | |
- gold | |
- gphoto2 | [] |
- gprof | [] |
- gramadoir | |
- grep | [] [] [] |
- grub | [] |
- gsasl | |
- gss | |
- gst-plugins-bad | [] [] |
- gst-plugins-base | [] [] [] |
- gst-plugins-good | [] [] [] |
- gst-plugins-ugly | [] [] [] |
- gstreamer | [] [] [] [] |
- gtick | [] |
- gtkam | [] [] |
- gtkspell | [] [] [] [] [] |
- guix | |
- guix-packages | |
- gutenprint | [] |
- hello | [] |
- help2man | |
- help2man-texi | |
- hylafax | |
- idutils | |
- iso_15924 | [] |
- iso_3166 | [] [] [] [] [] [] [] [] [] [] |
- iso_3166_2 | |
- iso_4217 | [] |
- iso_639 | [] [] [] [] [] [] [] [] [] |
- iso_639_3 | [] [] |
- iso_639_5 | |
- jwhois | |
- kbd | [] |
- klavaro | [] [] [] [] [] |
- ld | [] |
- leafpad | [] [] [] [] |
- libc | [] [] [] |
- libexif | () |
- libextractor | |
- libgnutls | [] |
- libgphoto2 | [] |
- libgphoto2_port | [] |
- libgsasl | |
- libiconv | [] [] |
- libidn | [] |
- liferea | [] [] [] [] |
- lilypond | [] [] |
- lordsawar | [] |
- lprng | |
- lynx | [] [] |
- m4 | [] |
- mailfromd | |
- mailutils | |
- make | [] |
- man-db | [] [] |
- man-db-manpages | |
- midi-instruments | [] [] [] |
- minicom | [] |
- mkisofs | [] |
- myserver | [] |
- nano | [] [] [] |
- opcodes | |
- parted | [] |
- pies | |
- pnmixer | |
- popt | [] |
- procps-ng | |
- procps-ng-man | |
- psmisc | [] |
- pspp | [] |
- pushover | [] |
- pwdutils | |
- pyspread | |
- radius | [] |
- recode | [] [] [] |
- recutils | |
- rpm | |
- rush | |
- sarg | |
- sed | [] [] [] [] |
- sharutils | [] |
- shishi | |
- skribilo | |
- solfege | [] [] |
- solfege-manual | |
- spotmachine | |
- sudo | [] [] |
- sudoers | [] [] |
- sysstat | [] |
- tar | [] [] [] |
- texinfo | [] [] |
- texinfo_document | [] [] |
- tigervnc | [] |
- tin | |
- tin-man | |
- tracgoogleappsa... | |
- trader | |
- util-linux | [] |
- ve | |
- vice | |
- vmm | |
- vorbis-tools | [] |
- wastesedge | |
- wcd | |
- wcd-man | |
- wdiff | [] [] |
- wget | [] |
- wyslij-po | |
- xboard | |
- xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] |
- xkeyboard-config | [] [] [] |
- +---------------------------------------------------+
- af am an ar as ast az be bg bn bn_IN bs ca crh cs
- 4 0 2 5 3 11 0 8 25 3 3 1 55 4 74
-
- da de el en en_GB en_ZA eo es et eu fa fi fr
- +--------------------------------------------------+
- a2ps | [] [] [] [] [] [] [] [] [] |
- aegis | [] [] [] [] |
- anubis | [] [] [] [] [] |
- aspell | [] [] [] [] [] [] [] |
- bash | [] [] [] |
- bfd | [] [] [] [] |
- binutils | [] [] [] |
- bison | [] [] [] [] [] [] [] [] |
- bison-runtime | [] [] [] [] [] [] [] [] |
- buzztrax | [] [] [] [] |
- ccd2cue | [] [] [] [] |
- ccide | [] [] [] [] [] [] |
- cflow | [] [] [] [] [] |
- clisp | [] [] [] [] [] |
- coreutils | [] [] [] [] [] |
- cpio | [] [] [] [] [] |
- cppi | [] [] [] [] [] |
- cpplib | [] [] [] [] [] [] |
- cryptsetup | [] [] [] [] [] |
- datamash | [] [] [] [] |
- denemo | [] |
- dfarc | [] [] [] [] [] [] |
- dialog | [] [] [] [] [] [] [] [] [] |
- dico | [] [] [] [] |
- diffutils | [] [] [] [] [] [] |
- dink | [] [] [] [] [] [] |
- direvent | [] [] [] [] |
- doodle | [] [] [] [] |
- dos2unix | [] [] [] [] [] |
- dos2unix-man | [] [] [] |
- e2fsprogs | [] [] [] [] [] |
- enscript | [] [] [] [] [] [] |
- exif | [] [] [] [] [] [] |
- fetchmail | [] () [] [] [] [] [] |
- findutils | [] [] [] [] [] [] [] [] |
- flex | [] [] [] [] [] [] |
- freedink | [] [] [] [] [] [] [] [] |
- fusionforge | [] [] [] |
- gas | [] [] [] |
- gawk | [] [] [] [] [] |
- gcal | [] [] [] [] |
- gcc | [] |
- gdbm | [] [] [] [] [] |
- gettext-examples | [] [] [] [] [] [] [] |
- gettext-runtime | [] [] [] [] [] [] |
- gettext-tools | [] [] [] [] [] |
- gjay | [] [] [] [] |
- glunarclock | [] [] [] [] [] |
- gnubiff | () [] [] () |
- gnubik | [] [] [] [] [] |
- gnucash | [] () () () () () () |
- gnuchess | [] [] [] [] |
- gnulib | [] [] [] [] [] [] [] |
- gnunet | [] |
- gnunet-gtk | [] |
- gold | [] [] [] |
- gphoto2 | [] () [] [] |
- gprof | [] [] [] [] [] [] |
- gramadoir | [] [] [] [] [] |
- grep | [] [] [] [] [] [] [] |
- grub | [] [] [] [] [] |
- gsasl | [] [] [] [] [] |
- gss | [] [] [] [] [] |
- gst-plugins-bad | [] [] [] |
- gst-plugins-base | [] [] [] [] [] [] |
- gst-plugins-good | [] [] [] [] [] [] [] |
- gst-plugins-ugly | [] [] [] [] [] [] [] [] |
- gstreamer | [] [] [] [] [] [] [] |
- gtick | [] () [] [] [] |
- gtkam | [] () [] [] [] [] |
- gtkspell | [] [] [] [] [] [] [] [] |
- guix | [] [] |
- guix-packages | |
- gutenprint | [] [] [] [] |
- hello | [] [] [] [] [] [] [] [] |
- help2man | [] [] [] [] [] [] [] |
- help2man-texi | [] [] [] |
- hylafax | [] [] |
- idutils | [] [] [] [] [] |
- iso_15924 | [] () [] [] () [] () |
- iso_3166 | [] () [] [] [] [] () [] () |
- iso_3166_2 | [] () () () |
- iso_4217 | [] () [] [] [] () [] () |
- iso_639 | [] () [] [] () [] () |
- iso_639_3 | () () () |
- iso_639_5 | () () () |
- jwhois | [] [] [] [] [] |
- kbd | [] [] [] [] [] [] |
- klavaro | [] [] [] [] [] [] [] |
- ld | [] [] [] [] |
- leafpad | [] [] [] [] [] [] [] [] |
- libc | [] [] [] [] [] |
- libexif | [] [] () [] [] |
- libextractor | [] |
- libgnutls | [] [] [] [] |
- libgphoto2 | [] () [] |
- libgphoto2_port | [] () [] [] [] [] |
- libgsasl | [] [] [] [] [] |
- libiconv | [] [] [] [] [] [] [] |
- libidn | [] [] [] [] [] |
- liferea | [] () [] [] [] [] [] |
- lilypond | [] [] [] [] [] [] |
- lordsawar | [] [] |
- lprng | |
- lynx | [] [] [] [] [] [] |
- m4 | [] [] [] [] [] [] |
- mailfromd | [] |
- mailutils | [] [] [] [] |
- make | [] [] [] [] [] |
- man-db | [] [] [] [] |
- man-db-manpages | [] [] |
- midi-instruments | [] [] [] [] [] [] [] [] [] |
- minicom | [] [] [] [] [] |
- mkisofs | [] [] [] |
- myserver | [] [] [] [] |
- nano | [] [] [] [] [] [] [] |
- opcodes | [] [] [] [] [] |
- parted | [] [] [] |
- pies | [] |
- pnmixer | [] [] |
- popt | [] [] [] [] [] [] |
- procps-ng | [] [] |
- procps-ng-man | [] [] |
- psmisc | [] [] [] [] [] [] [] |
- pspp | [] [] [] |
- pushover | () [] [] [] |
- pwdutils | [] [] [] |
- pyspread | [] [] [] |
- radius | [] [] |
- recode | [] [] [] [] [] [] [] |
- recutils | [] [] [] [] |
- rpm | [] [] [] [] [] |
- rush | [] [] [] |
- sarg | [] [] |
- sed | [] [] [] [] [] [] [] [] |
- sharutils | [] [] [] [] |
- shishi | [] [] [] |
- skribilo | [] [] [] |
- solfege | [] [] [] [] [] [] [] [] |
- solfege-manual | [] [] [] [] [] |
- spotmachine | [] [] [] [] [] |
- sudo | [] [] [] [] [] [] |
- sudoers | [] [] [] [] [] [] |
- sysstat | [] [] [] [] [] [] |
- tar | [] [] [] [] [] [] [] |
- texinfo | [] [] [] [] [] |
- texinfo_document | [] [] [] [] |
- tigervnc | [] [] [] [] [] [] |
- tin | [] [] [] [] |
- tin-man | [] |
- tracgoogleappsa... | [] [] [] [] [] |
- trader | [] [] [] [] [] [] |
- util-linux | [] [] [] [] |
- ve | [] [] [] [] [] |
- vice | () () () |
- vmm | [] [] |
- vorbis-tools | [] [] [] [] |
- wastesedge | [] |
- wcd | [] [] [] [] |
- wcd-man | [] |
- wdiff | [] [] [] [] [] [] [] |
- wget | [] [] [] [] [] [] |
- wyslij-po | [] [] [] [] |
- xboard | [] [] [] [] |
- xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] |
- xkeyboard-config | [] [] [] [] [] [] [] |
- +--------------------------------------------------+
- da de el en en_GB en_ZA eo es et eu fa fi fr
- 119 131 32 1 6 0 94 95 22 13 4 102 139
-
- ga gd gl gu he hi hr hu hy ia id is it ja ka kk
- +-------------------------------------------------+
- a2ps | [] [] [] [] |
- aegis | [] |
- anubis | [] [] [] [] |
- aspell | [] [] [] [] [] |
- bash | [] [] [] [] |
- bfd | [] [] |
- binutils | [] [] [] |
- bison | [] |
- bison-runtime | [] [] [] [] [] [] [] [] |
- buzztrax | |
- ccd2cue | [] |
- ccide | [] [] |
- cflow | [] [] [] |
- clisp | |
- coreutils | [] [] |
- cpio | [] [] [] [] [] [] |
- cppi | [] [] [] [] [] |
- cpplib | [] [] |
- cryptsetup | [] |
- datamash | |
- denemo | [] |
- dfarc | [] [] [] |
- dialog | [] [] [] [] [] [] [] [] [] [] |
- dico | |
- diffutils | [] [] [] [] |
- dink | [] |
- direvent | [] |
- doodle | [] [] |
- dos2unix | [] [] |
- dos2unix-man | |
- e2fsprogs | [] [] |
- enscript | [] [] [] |
- exif | [] [] [] [] [] [] |
- fetchmail | [] [] [] |
- findutils | [] [] [] [] [] [] [] |
- flex | [] |
- freedink | [] [] [] [] |
- fusionforge | |
- gas | [] |
- gawk | [] () [] |
- gcal | |
- gcc | |
- gdbm | |
- gettext-examples | [] [] [] [] [] [] [] |
- gettext-runtime | [] [] [] [] [] [] [] |
- gettext-tools | [] [] [] |
- gjay | [] |
- glunarclock | [] [] [] [] [] [] |
- gnubiff | [] [] () |
- gnubik | [] [] [] |
- gnucash | () () () () () |
- gnuchess | |
- gnulib | [] [] [] [] [] |
- gnunet | |
- gnunet-gtk | |
- gold | [] [] |
- gphoto2 | [] [] [] [] |
- gprof | [] [] [] [] |
- gramadoir | [] [] [] |
- grep | [] [] [] [] [] [] [] |
- grub | [] [] [] |
- gsasl | [] [] [] [] [] |
- gss | [] [] [] [] [] |
- gst-plugins-bad | [] [] [] |
- gst-plugins-base | [] [] [] [] |
- gst-plugins-good | [] [] [] [] [] [] |
- gst-plugins-ugly | [] [] [] [] [] [] |
- gstreamer | [] [] [] [] [] |
- gtick | [] [] [] [] [] |
- gtkam | [] [] [] [] [] |
- gtkspell | [] [] [] [] [] [] [] [] [] [] |
- guix | |
- guix-packages | |
- gutenprint | [] [] [] |
- hello | [] [] [] [] [] |
- help2man | [] [] [] |
- help2man-texi | |
- hylafax | [] |
- idutils | [] [] |
- iso_15924 | [] [] [] [] [] [] |
- iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] |
- iso_3166_2 | [] [] |
- iso_4217 | [] [] [] [] [] [] |
- iso_639 | [] [] [] [] [] [] [] [] [] |
- iso_639_3 | [] [] |
- iso_639_5 | |
- jwhois | [] [] [] [] |
- kbd | [] [] [] |
- klavaro | [] [] [] [] [] |
- ld | [] [] [] [] |
- leafpad | [] [] [] [] [] [] [] () |
- libc | [] [] [] [] [] |
- libexif | [] |
- libextractor | |
- libgnutls | [] |
- libgphoto2 | [] [] |
- libgphoto2_port | [] [] |
- libgsasl | [] [] [] [] |
- libiconv | [] [] [] [] [] [] [] |
- libidn | [] [] [] [] |
- liferea | [] [] [] [] [] |
- lilypond | [] |
- lordsawar | |
- lprng | [] |
- lynx | [] [] [] [] |
- m4 | [] [] [] [] [] |
- mailfromd | |
- mailutils | |
- make | [] [] [] [] |
- man-db | [] [] |
- man-db-manpages | [] [] |
- midi-instruments | [] [] [] [] [] [] [] [] [] |
- minicom | [] [] [] |
- mkisofs | [] [] |
- myserver | [] |
- nano | [] [] [] [] [] [] |
- opcodes | [] [] [] |
- parted | [] [] [] [] [] |
- pies | |
- pnmixer | [] [] |
- popt | [] [] [] [] [] [] [] [] [] [] |
- procps-ng | |
- procps-ng-man | |
- psmisc | [] [] [] [] |
- pspp | [] [] |
- pushover | [] |
- pwdutils | [] |
- pyspread | |
- radius | [] |
- recode | [] [] [] [] [] [] [] |
- recutils | |
- rpm | [] |
- rush | [] |
- sarg | |
- sed | [] [] [] [] [] [] [] |
- sharutils | |
- shishi | |
- skribilo | [] |
- solfege | [] [] |
- solfege-manual | |
- spotmachine | |
- sudo | [] [] [] [] |
- sudoers | [] [] [] |
- sysstat | [] [] [] [] |
- tar | [] [] [] [] [] [] |
- texinfo | [] [] [] |
- texinfo_document | [] [] [] |
- tigervnc | |
- tin | |
- tin-man | |
- tracgoogleappsa... | [] [] [] [] |
- trader | [] [] |
- util-linux | [] |
- ve | [] |
- vice | () () |
- vmm | |
- vorbis-tools | [] [] |
- wastesedge | [] |
- wcd | |
- wcd-man | |
- wdiff | [] [] [] |
- wget | [] [] [] [] |
- wyslij-po | [] [] [] |
- xboard | |
- xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] |
- xkeyboard-config | [] [] [] [] [] [] |
- +-------------------------------------------------+
- ga gd gl gu he hi hr hu hy ia id is it ja ka kk
- 35 2 47 4 8 2 60 71 2 6 81 11 87 57 0 3
-
- kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
- +--------------------------------------------------+
- a2ps | [] [] |
- aegis | [] |
- anubis | [] [] [] |
- aspell | [] [] |
- bash | [] [] |
- bfd | |
- binutils | |
- bison | [] |
- bison-runtime | [] [] [] [] [] [] |
- buzztrax | |
- ccd2cue | |
- ccide | [] [] |
- cflow | [] |
- clisp | [] |
- coreutils | [] [] |
- cpio | [] |
- cppi | |
- cpplib | [] |
- cryptsetup | [] |
- datamash | [] [] |
- denemo | |
- dfarc | [] [] |
- dialog | [] [] [] [] [] [] |
- dico | |
- diffutils | [] [] [] |
- dink | [] |
- direvent | [] |
- doodle | [] |
- dos2unix | [] [] |
- dos2unix-man | [] |
- e2fsprogs | [] |
- enscript | [] |
- exif | [] [] [] |
- fetchmail | [] |
- findutils | [] [] |
- flex | [] |
- freedink | [] [] |
- fusionforge | |
- gas | |
- gawk | [] |
- gcal | |
- gcc | |
- gdbm | |
- gettext-examples | [] [] [] [] [] [] |
- gettext-runtime | [] [] [] |
- gettext-tools | [] |
- gjay | |
- glunarclock | [] [] |
- gnubiff | [] |
- gnubik | [] [] |
- gnucash | () () () () () () () [] |
- gnuchess | [] [] |
- gnulib | [] |
- gnunet | |
- gnunet-gtk | |
- gold | |
- gphoto2 | [] |
- gprof | [] [] |
- gramadoir | [] |
- grep | [] [] |
- grub | [] [] [] |
- gsasl | [] |
- gss | |
- gst-plugins-bad | [] [] [] |
- gst-plugins-base | [] [] [] |
- gst-plugins-good | [] [] [] [] |
- gst-plugins-ugly | [] [] [] [] [] |
- gstreamer | [] [] [] |
- gtick | [] |
- gtkam | [] [] |
- gtkspell | [] [] [] [] [] [] [] |
- guix | |
- guix-packages | |
- gutenprint | [] |
- hello | [] [] [] |
- help2man | [] |
- help2man-texi | |
- hylafax | [] |
- idutils | [] |
- iso_15924 | () [] [] |
- iso_3166 | [] [] [] () [] [] [] [] [] [] |
- iso_3166_2 | () [] |
- iso_4217 | () [] [] [] |
- iso_639 | [] [] () [] [] [] [] |
- iso_639_3 | [] () [] |
- iso_639_5 | () |
- jwhois | [] [] |
- kbd | [] |
- klavaro | [] [] |
- ld | |
- leafpad | [] [] [] [] [] |
- libc | [] [] |
- libexif | [] |
- libextractor | [] |
- libgnutls | [] [] |
- libgphoto2 | [] |
- libgphoto2_port | [] |
- libgsasl | [] |
- libiconv | [] [] |
- libidn | [] |
- liferea | [] [] [] |
- lilypond | [] |
- lordsawar | |
- lprng | |
- lynx | [] |
- m4 | [] |
- mailfromd | |
- mailutils | |
- make | [] [] |
- man-db | [] |
- man-db-manpages | [] |
- midi-instruments | [] [] [] [] [] [] [] |
- minicom | [] |
- mkisofs | [] |
- myserver | |
- nano | [] [] [] |
- opcodes | [] |
- parted | [] [] |
- pies | |
- pnmixer | [] |
- popt | [] [] [] [] [] |
- procps-ng | |
- procps-ng-man | |
- psmisc | [] |
- pspp | [] [] |
- pushover | |
- pwdutils | [] |
- pyspread | |
- radius | [] |
- recode | [] [] |
- recutils | [] |
- rpm | [] |
- rush | [] |
- sarg | |
- sed | [] [] |
- sharutils | [] |
- shishi | |
- skribilo | |
- solfege | [] [] |
- solfege-manual | [] |
- spotmachine | [] |
- sudo | [] [] [] |
- sudoers | [] [] [] |
- sysstat | [] [] |
- tar | [] [] [] |
- texinfo | [] |
- texinfo_document | [] |
- tigervnc | [] |
- tin | |
- tin-man | |
- tracgoogleappsa... | [] [] [] |
- trader | [] |
- util-linux | [] |
- ve | [] |
- vice | [] |
- vmm | [] |
- vorbis-tools | [] |
- wastesedge | [] |
- wcd | [] |
- wcd-man | [] |
- wdiff | [] |
- wget | [] [] |
- wyslij-po | [] |
- xboard | [] |
- xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] |
- xkeyboard-config | [] [] [] |
- +--------------------------------------------------+
- kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
- 5 15 4 6 0 13 23 3 3 3 4 11 2 42 1 125
-
- nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
- +------------------------------------------------+
- a2ps | [] [] [] [] [] [] [] |
- aegis | [] [] |
- anubis | [] [] [] |
- aspell | [] [] [] [] [] [] [] |
- bash | [] [] [] [] [] [] |
- bfd | [] [] |
- binutils | [] [] |
- bison | [] [] [] |
- bison-runtime | [] [] [] [] [] [] [] [] |
- buzztrax | [] |
- ccd2cue | [] [] |
- ccide | [] [] [] |
- cflow | [] [] [] |
- clisp | [] |
- coreutils | [] [] [] [] |
- cpio | [] [] [] |
- cppi | [] [] [] |
- cpplib | [] [] [] |
- cryptsetup | [] [] [] |
- datamash | [] [] |
- denemo | |
- dfarc | [] [] [] |
- dialog | [] [] [] [] [] [] [] |
- dico | [] |
- diffutils | [] [] [] |
- dink | |
- direvent | [] [] [] |
- doodle | [] [] |
- dos2unix | [] [] [] [] |
- dos2unix-man | [] [] |
- e2fsprogs | [] |
- enscript | [] [] [] [] [] [] |
- exif | [] [] [] [] [] [] |
- fetchmail | [] [] [] |
- findutils | [] [] [] [] [] [] |
- flex | [] [] [] [] [] |
- freedink | [] [] [] [] [] |
- fusionforge | |
- gas | |
- gawk | [] |
- gcal | |
- gcc | |
- gdbm | [] [] [] |
- gettext-examples | [] [] [] [] [] [] [] [] |
- gettext-runtime | [] [] [] [] [] [] [] [] [] |
- gettext-tools | [] [] [] [] [] [] [] |
- gjay | [] |
- glunarclock | [] [] [] [] [] [] |
- gnubiff | [] |
- gnubik | [] [] [] [] |
- gnucash | () () () () () [] |
- gnuchess | [] [] |
- gnulib | [] [] [] [] [] |
- gnunet | |
- gnunet-gtk | |
- gold | |
- gphoto2 | [] [] [] [] [] |
- gprof | [] [] [] [] |
- gramadoir | [] [] |
- grep | [] [] [] [] [] [] |
- grub | [] [] [] [] [] |
- gsasl | [] [] [] |
- gss | [] [] [] [] |
- gst-plugins-bad | [] [] [] [] [] |
- gst-plugins-base | [] [] [] [] [] [] |
- gst-plugins-good | [] [] [] [] [] [] [] |
- gst-plugins-ugly | [] [] [] [] [] [] [] |
- gstreamer | [] [] [] [] [] [] [] |
- gtick | [] [] [] [] [] |
- gtkam | [] [] [] [] [] [] |
- gtkspell | [] [] [] [] [] [] [] [] [] |
- guix | |
- guix-packages | |
- gutenprint | [] [] |
- hello | [] [] [] [] [] [] |
- help2man | [] [] [] [] |
- help2man-texi | [] |
- hylafax | |
- idutils | [] [] [] |
- iso_15924 | [] () [] [] [] [] |
- iso_3166 | [] [] [] [] () [] [] [] [] [] [] [] [] |
- iso_3166_2 | [] () [] |
- iso_4217 | [] [] () [] [] [] [] [] |
- iso_639 | [] [] [] () [] [] [] [] [] [] |
- iso_639_3 | [] () |
- iso_639_5 | () [] |
- jwhois | [] [] [] [] |
- kbd | [] [] |
- klavaro | [] [] [] [] [] |
- ld | |
- leafpad | [] [] [] [] [] [] [] [] |
- libc | [] [] [] |
- libexif | [] () [] |
- libextractor | [] |
- libgnutls | [] |
- libgphoto2 | [] |
- libgphoto2_port | [] [] [] [] [] |
- libgsasl | [] [] [] [] |
- libiconv | [] [] [] [] [] |
- libidn | [] [] [] |
- liferea | [] [] [] [] () [] [] |
- lilypond | |
- lordsawar | |
- lprng | [] |
- lynx | [] [] |
- m4 | [] [] [] [] [] |
- mailfromd | [] |
- mailutils | [] |
- make | [] [] [] |
- man-db | [] [] [] |
- man-db-manpages | [] [] [] |
- midi-instruments | [] [] [] [] [] [] [] [] |
- minicom | [] [] [] [] |
- mkisofs | [] [] [] |
- myserver | [] [] |
- nano | [] [] [] [] [] [] |
- opcodes | |
- parted | [] [] [] [] [] [] |
- pies | [] |
- pnmixer | [] |
- popt | [] [] [] [] [] [] |
- procps-ng | [] |
- procps-ng-man | [] |
- psmisc | [] [] [] [] |
- pspp | [] [] |
- pushover | |
- pwdutils | [] |
- pyspread | [] [] |
- radius | [] [] |
- recode | [] [] [] [] [] [] [] [] |
- recutils | [] [] |
- rpm | [] |
- rush | [] [] [] |
- sarg | [] [] |
- sed | [] [] [] [] [] [] [] [] |
- sharutils | [] [] [] |
- shishi | [] [] |
- skribilo | [] |
- solfege | [] [] [] |
- solfege-manual | [] [] |
- spotmachine | [] [] |
- sudo | [] [] [] [] [] [] |
- sudoers | [] [] [] [] |
- sysstat | [] [] [] [] [] |
- tar | [] [] [] [] [] |
- texinfo | [] [] [] |
- texinfo_document | [] [] |
- tigervnc | [] [] [] |
- tin | [] |
- tin-man | |
- tracgoogleappsa... | [] [] [] [] |
- trader | [] [] |
- util-linux | [] [] |
- ve | [] [] [] |
- vice | |
- vmm | |
- vorbis-tools | [] [] [] |
- wastesedge | |
- wcd | |
- wcd-man | |
- wdiff | [] [] [] [] [] |
- wget | [] [] [] [] [] |
- wyslij-po | [] [] [] [] |
- xboard | [] [] [] |
- xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] |
- xkeyboard-config | [] [] [] [] |
- +------------------------------------------------+
- nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr
- 7 3 6 114 1 12 88 32 82 3 40 45 7 101
-
- sv sw ta te tg th tr uk ur vi wa wo zh_CN
- +----------------------------------------------+
- a2ps | [] [] [] [] [] |
- aegis | [] |
- anubis | [] [] [] [] |
- aspell | [] [] [] [] [] |
- bash | [] [] [] [] |
- bfd | [] [] [] |
- binutils | [] [] [] |
- bison | [] [] [] [] |
- bison-runtime | [] [] [] [] [] [] |
- buzztrax | [] [] [] |
- ccd2cue | [] [] [] |
- ccide | [] [] [] [] |
- cflow | [] [] [] [] |
- clisp | |
- coreutils | [] [] [] |
- cpio | [] [] [] [] [] |
- cppi | [] [] [] [] |
- cpplib | [] [] [] [] [] |
- cryptsetup | [] [] [] |
- datamash | [] [] [] |
- denemo | [] |
- dfarc | [] [] |
- dialog | [] [] [] [] [] [] |
- dico | [] |
- diffutils | [] [] [] [] [] |
- dink | [] |
- direvent | [] [] |
- doodle | [] [] |
- dos2unix | [] [] [] [] |
- dos2unix-man | [] [] [] |
- e2fsprogs | [] [] [] [] |
- enscript | [] [] [] [] |
- exif | [] [] [] [] [] |
- fetchmail | [] [] [] [] |
- findutils | [] [] [] [] [] |
- flex | [] [] [] [] |
- freedink | [] [] [] |
- fusionforge | |
- gas | [] |
- gawk | [] [] [] |
- gcal | [] [] [] |
- gcc | [] |
- gdbm | [] [] |
- gettext-examples | [] [] [] [] [] |
- gettext-runtime | [] [] [] [] [] |
- gettext-tools | [] [] [] [] [] |
- gjay | [] [] [] |
- glunarclock | [] [] [] [] |
- gnubiff | [] [] |
- gnubik | [] [] [] [] |
- gnucash | () () () () [] |
- gnuchess | [] [] [] |
- gnulib | [] [] [] [] |
- gnunet | |
- gnunet-gtk | |
- gold | [] [] |
- gphoto2 | [] [] [] [] |
- gprof | [] [] [] [] |
- gramadoir | [] [] [] |
- grep | [] [] [] [] [] |
- grub | [] [] [] [] |
- gsasl | [] [] [] [] |
- gss | [] [] [] |
- gst-plugins-bad | [] [] [] [] [] |
- gst-plugins-base | [] [] [] [] [] |
- gst-plugins-good | [] [] [] [] [] |
- gst-plugins-ugly | [] [] [] [] [] |
- gstreamer | [] [] [] [] [] |
- gtick | [] [] [] |
- gtkam | [] [] [] [] |
- gtkspell | [] [] [] [] [] [] [] |
- guix | |
- guix-packages | |
- gutenprint | [] [] [] [] |
- hello | [] [] [] [] [] [] |
- help2man | [] [] [] |
- help2man-texi | [] |
- hylafax | [] |
- idutils | [] [] [] |
- iso_15924 | [] () [] [] () [] |
- iso_3166 | [] [] () [] [] () [] [] |
- iso_3166_2 | () [] [] () [] |
- iso_4217 | [] () [] [] () [] |
- iso_639 | [] [] [] () [] [] () [] [] |
- iso_639_3 | [] () [] [] () |
- iso_639_5 | () [] () |
- jwhois | [] [] [] [] |
- kbd | [] [] [] [] |
- klavaro | [] [] [] [] [] [] |
- ld | [] [] [] [] [] |
- leafpad | [] [] [] [] [] [] |
- libc | [] [] [] [] [] |
- libexif | [] [] () |
- libextractor | [] [] |
- libgnutls | [] [] [] [] |
- libgphoto2 | [] [] [] |
- libgphoto2_port | [] [] [] [] |
- libgsasl | [] [] [] [] |
- libiconv | [] [] [] [] [] |
- libidn | () [] [] [] |
- liferea | [] [] [] [] [] |
- lilypond | [] |
- lordsawar | |
- lprng | [] |
- lynx | [] [] [] [] |
- m4 | [] [] [] |
- mailfromd | [] [] |
- mailutils | [] |
- make | [] [] [] [] |
- man-db | [] [] [] |
- man-db-manpages | [] [] |
- midi-instruments | [] [] [] [] [] [] |
- minicom | [] [] |
- mkisofs | [] [] [] |
- myserver | [] |
- nano | [] [] [] [] |
- opcodes | [] [] [] |
- parted | [] [] [] [] [] |
- pies | [] [] |
- pnmixer | [] [] [] |
- popt | [] [] [] [] [] [] [] |
- procps-ng | [] [] |
- procps-ng-man | [] |
- psmisc | [] [] [] [] |
- pspp | [] [] [] |
- pushover | [] |
- pwdutils | [] [] |
- pyspread | [] |
- radius | [] [] |
- recode | [] [] [] [] |
- recutils | [] [] [] |
- rpm | [] [] [] [] |
- rush | [] [] |
- sarg | |
- sed | [] [] [] [] [] |
- sharutils | [] [] [] [] |
- shishi | [] [] |
- skribilo | [] [] |
- solfege | [] [] [] [] |
- solfege-manual | [] |
- spotmachine | [] [] [] |
- sudo | [] [] [] [] [] |
- sudoers | [] [] [] [] |
- sysstat | [] [] [] [] [] |
- tar | [] [] [] [] [] |
- texinfo | [] [] [] |
- texinfo_document | [] |
- tigervnc | [] [] [] |
- tin | [] |
- tin-man | |
- tracgoogleappsa... | [] [] [] [] [] |
- trader | [] |
- util-linux | [] [] [] [] |
- ve | [] [] [] [] |
- vice | () () |
- vmm | |
- vorbis-tools | [] [] |
- wastesedge | |
- wcd | [] [] [] |
- wcd-man | [] |
- wdiff | [] [] [] [] |
- wget | [] [] [] |
- wyslij-po | [] [] |
- xboard | [] [] |
- xdg-user-dirs | [] [] [] [] [] [] [] [] |
- xkeyboard-config | [] [] [] [] |
- +----------------------------------------------+
- sv sw ta te tg th tr uk ur vi wa wo zh_CN
- 106 1 4 3 0 13 51 115 1 125 7 1 100
-
- zh_HK zh_TW
- +-------------+
- a2ps | | 30
- aegis | | 9
- anubis | | 19
- aspell | | 29
- bash | [] | 23
- bfd | | 11
- binutils | | 12
- bison | [] | 18
- bison-runtime | [] | 38
- buzztrax | | 9
- ccd2cue | | 10
- ccide | | 17
- cflow | | 16
- clisp | | 10
- coreutils | | 18
- cpio | | 20
- cppi | | 17
- cpplib | [] | 19
- cryptsetup | | 14
- datamash | | 11
- denemo | | 5
- dfarc | | 17
- dialog | [] | 42
- dico | | 6
- diffutils | | 22
- dink | | 10
- direvent | | 11
- doodle | | 12
- dos2unix | [] | 18
- dos2unix-man | | 9
- e2fsprogs | | 15
- enscript | | 21
- exif | | 27
- fetchmail | | 19
- findutils | | 29
- flex | [] | 19
- freedink | | 24
- fusionforge | | 3
- gas | | 5
- gawk | | 13
- gcal | | 8
- gcc | | 2
- gdbm | | 10
- gettext-examples | [] [] | 40
- gettext-runtime | [] [] | 35
- gettext-tools | [] | 24
- gjay | | 9
- glunarclock | [] | 27
- gnubiff | | 9
- gnubik | | 19
- gnucash | () | 6
- gnuchess | | 11
- gnulib | | 23
- gnunet | | 1
- gnunet-gtk | | 1
- gold | | 7
- gphoto2 | [] | 19
- gprof | | 21
- gramadoir | | 14
- grep | [] | 31
- grub | | 21
- gsasl | [] | 19
- gss | | 17
- gst-plugins-bad | | 21
- gst-plugins-base | | 27
- gst-plugins-good | | 32
- gst-plugins-ugly | | 34
- gstreamer | [] | 32
- gtick | | 19
- gtkam | | 24
- gtkspell | [] [] | 48
- guix | | 2
- guix-packages | | 0
- gutenprint | | 15
- hello | [] | 30
- help2man | | 18
- help2man-texi | | 5
- hylafax | | 5
- idutils | | 14
- iso_15924 | [] | 23
- iso_3166 | [] [] | 58
- iso_3166_2 | | 9
- iso_4217 | [] [] | 28
- iso_639 | [] [] | 46
- iso_639_3 | | 10
- iso_639_5 | | 2
- jwhois | [] | 20
- kbd | | 17
- klavaro | | 30
- ld | [] | 15
- leafpad | [] | 39
- libc | [] | 24
- libexif | | 10
- libextractor | | 5
- libgnutls | | 13
- libgphoto2 | | 10
- libgphoto2_port | [] | 19
- libgsasl | | 18
- libiconv | [] | 29
- libidn | | 17
- liferea | | 29
- lilypond | | 11
- lordsawar | | 3
- lprng | | 3
- lynx | | 19
- m4 | [] | 22
- mailfromd | | 4
- mailutils | | 6
- make | | 19
- man-db | | 15
- man-db-manpages | | 10
- midi-instruments | [] | 43
- minicom | [] | 17
- mkisofs | | 13
- myserver | | 9
- nano | [] | 30
- opcodes | | 12
- parted | [] | 23
- pies | | 4
- pnmixer | | 9
- popt | [] | 36
- procps-ng | | 5
- procps-ng-man | | 4
- psmisc | [] | 22
- pspp | | 13
- pushover | | 6
- pwdutils | | 8
- pyspread | | 6
- radius | | 9
- recode | | 31
- recutils | | 10
- rpm | [] | 13
- rush | | 10
- sarg | | 4
- sed | [] | 35
- sharutils | | 13
- shishi | | 7
- skribilo | | 7
- solfege | | 21
- solfege-manual | | 9
- spotmachine | | 11
- sudo | | 26
- sudoers | | 22
- sysstat | | 23
- tar | [] | 30
- texinfo | | 17
- texinfo_document | | 13
- tigervnc | | 14
- tin | [] | 7
- tin-man | | 1
- tracgoogleappsa... | [] | 22
- trader | | 12
- util-linux | | 13
- ve | | 14
- vice | | 1
- vmm | | 3
- vorbis-tools | | 13
- wastesedge | | 3
- wcd | | 8
- wcd-man | | 3
- wdiff | [] | 23
- wget | | 21
- wyslij-po | | 14
- xboard | | 10
- xdg-user-dirs | [] [] | 68
- xkeyboard-config | [] | 28
- +-------------+
- 89 teams zh_HK zh_TW
- 166 domains 7 42 2809
-
- Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect. This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
- For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and distributed
-as such by its maintainer. There might be an observable lag between the
-mere existence a PO file and its wide availability in a distribution.
-
- If Jun 2014 seems to be old, you may fetch a more recent copy of this
-'ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix
-with full percentage details can be found at
-'http://translationproject.org/extra/matrix.html'.
-
-1.5 Using 'gettext' in new packages
-===================================
-
-If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU 'gettext' in your
-package. Of course you have to respect the GNU Lesser General Public
-License which covers the use of the GNU 'gettext' library. This means
-in particular that even non-free programs can use 'libintl' as a shared
-library, whereas only free software can use 'libintl' as a static
-library or use modified versions of 'libintl'.
-
- Once the sources are changed appropriately and the setup can handle
-the use of 'gettext' the only thing missing are the translations. The
-Free Translation Project is also available for packages which are not
-developed inside the GNU project. Therefore the information given above
-applies also for every other Free Software Project. Contact
-'coordinator@translationproject.org' to make the '.pot' files available
-to the translation teams.
+<https://www.gnu.org/software/gettext/manual/html_node/Users.html>
diff --git a/macros/texinfo/texinfo/ChangeLog b/macros/texinfo/texinfo/ChangeLog
index 9fd7bdb98c..3993820b40 100644
--- a/macros/texinfo/texinfo/ChangeLog
+++ b/macros/texinfo/texinfo/ChangeLog
@@ -1,3 +1,1688 @@
+2019-09-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ 6.7.
+
+ * configure.ac, NEWS, util/texi2dvi, util/texi2pdf,
+ doc/refcard/txirefcard.tex: version
+
+2019-09-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Avoid gcc warnings about strncat.
+
+ * install-info/install-info.c (split_entry, format_entry):
+ Replace some calls to strncat with strcat. This avoids a
+ "'strncat' specified bound 2 equals source length
+ [-Wstringop-overflow=]" warning with gcc 8.
+
+2019-09-21 YOKOTA Hiroshi <yokota.hgml@gmail.com> (tiny change)
+
+ Japanese language support changes.
+
+ * doc/short-sample-ja.texi: Include version.texi.
+ * doc/Makefile.am: Install texinfo-ja.tex.
+
+ * doc/texinfo.tex: Support Lua 5.3+ number syntax
+
+ Lua 5.3 and newer supports floating point number.
+ But some old code doesn't know that Lua supports floating point numbers.
+
+ This patch avoids some unexpected floating point numbers in Lua
+ code.
+
+ * doc/txi-ja.tex: Update LuaTeX hack
+
+ "comment" command is now unified to "c" command.
+
+ Origin of this hack:
+ https://ja.osdn.net/projects/luatex-ja/ticket/36096
+
+ * doc/info-fr.texi: Change encoding to UTF-8.
+ * doc/info-fr.texi, doc/info-stnd.texi, doc/short-sample-ja.texi:
+ Do not wrap @top node in @ifnottex.
+
+2019-09-19 Gavin Smith <gavinsmith0123@gmail.com>
+
+ pretest 6.6.92
+
+ * configure.ac: version
+
+2019-09-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ pretest 6.6.91
+
+ * configure.ac: version
+
+2019-09-08 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Fix LuaTeX errors in anchors.
+
+ * doc/texinfo.tex (\pdfescstr) [LuaTeX]:
+ Change definition of PDFescstr so to only output tokens of
+ catcode 10 or 12 back into TeX. This is intended to prevent
+ errors when using @-commands inside anchors, reported by Didier
+ Verna.
+
+2019-08-26 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/Convert/Plaintext.pm (_convert) <menu_entry_node>:
+ Put a pending space in the output so it is not included in the
+ node name when INFO_SPECIAL_CHARS_QUOTE is set. Faulty menu in
+ output reported by Didier Verna.
+
+2019-08-25 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\atdummies, \definedummies): Define \& and
+ \ampchar as dummies so they are written properly to the index
+ files. Report from Didier Verna.
+
+2019-08-19 Eli Zaretskii <eliz@gnu.org>
+
+ * info/pcterm.c (kill): Don't use RETSIGTYPE, it is no longer
+ defined by config.h.
+
+2019-08-18 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Fix @value in index entry.
+
+ * doc/texinfo.tex (\dummyvalue): Use \string\value instead of
+ \noexpand\value. This means that a backslash is correctly used
+ as the escape character in the output, rather than an at sign.
+
+2019-08-18 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo-tex-test.texi (Test of macros with @ in index):
+ Comment out, as it doesn't work with \ as the index file escape
+ character.
+
+2019-08-18 gettextize <bug-gnu-gettext@gnu.org>
+
+ * gnulib/m4/gettext.m4: Upgrade to gettext-0.20.1.
+ * gnulib/m4/intlmacosx.m4: Upgrade to gettext-0.20.1.
+ * gnulib/m4/nls.m4: Upgrade to gettext-0.20.1.
+ * gnulib/m4/po.m4: Upgrade to gettext-0.20.1.
+ * gnulib/m4/progtest.m4: Upgrade to gettext-0.20.1.
+ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.20.
+
+2019-08-18 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/Convert/HTML.pm (default_contents): Use
+ <a rel="index"> for links to index nodes.
+ * NEWS: Mention change.
+
+2019-08-18 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * NEWS: Remove announcement of use of @ as escape character in
+ index files.
+
+2019-08-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Use "rel" attribute to indicate index nodes.
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_menu_entry_type):
+ If the target node in a menu entry is an index node, then set
+ the "rel" attribute on the <a> element to "index". Remove
+ commented-out code.
+ * NEWS: Mention change.
+
+2019-08-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Mark index nodes.
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_texi) <line commands>,
+ * tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command):
+ If @printindex is seen, record that the current node is an index
+ node by setting the "isindex" extra value.
+
+2019-08-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (Minimum): Put .texi first in the list and
+ remove footnote about preferring the "longer extensions".
+ Automake warns if .texi is not used. Report from ДилÑн Палаузов
+ <dilyan.palauzov@aegee.org>.
+
+2019-08-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (GNU Sample Texts): Mention UPDATED-MONTH
+ variable in version.texi. Report from ДилÑн Палаузов
+ <dilyan.palauzov@aegee.org>.
+
+2019-08-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (GNU Sample Texts): Link to "Texinfo" node of
+ Automake manual directly. Report from ДилÑн Палаузов
+ <dilyan.palauzov@aegee.org>.
+
+2019-08-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (Beginning and Ending a File): Minor grammar
+ fix. Report from TonyMc <afmcc@btinternet.com>.
+
+2019-07-26 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (Node Menu Illustration): Minor grammar fix.
+ Report from ДилÑн Палаузов <dilyan.palauzov@aegee.org>.
+
+2019-07-11 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * util/texi2html: Remove file. It has not worked for a long
+ time due to invoking texi2any incorrectly. Report from Adam
+ Spiers.
+
+2019-06-14 Patrice Dumas <pertusus@free.fr>
+
+ Do not output HTML target when there is only one element in file
+
+ * tp/Texinfo/Convert/HTML.pm (count_elements_in_filename, command_href,
+ output): add 'elements_in_file_count' to converter object, set equal
+ to 'file_counters' to record and keep the information of the number
+ of elements in files.
+ Add count_elements_in_filename() to return this number.
+ Do not output an HTML target for hrefs to elements (elements are nodes
+ in most cases) when there is only one element in the href destination
+ file.
+
+2019-06-01 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\printindex): Remove \message printing
+ informative statement. Report from Karl Berry.
+
+2019-05-18 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex: Specify "@set txiindexescapeisbackslash" in
+ order to use backslashes in index files by default.
+
+2019-05-18 Arnold D. Robbins <arnold@skeeve.com>
+
+ * doc/texinfo.tex (\definedummies): Define \subentry as a dummy.
+ (\indexwriteseealso, \indexwriteseeentry): Fix writing
+ 'seeentry' and 'seealso' commands for when backslash is the
+ escape.
+
+2019-05-13 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/tests/run_parser_all.sh: Do not use a staging directory to
+ remove CVS and .svn directories, as we don't use CVN or SVN.
+
+2019-05-09 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * util/htmlxref.cnf: Add eww. From Tsuyoshi Kitamoto
+ <tsuyoshi.kitamoto@gmail.com>.
+
+2019-05-06 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Fix finding translation files in out-of-source build.
+
+ * tp/Texinfo/ModulePath.pm.in ($builddir, $srcdir):
+ Save builddir instead of srcdir.
+ * tp/Texinfo/XSLoader.pm: Pass on $Texinfo::ModulePath::builddir
+ to XS modules.
+ * tp/Texinfo/XS/parsetexi/api.c (init),
+ * tp/texi2any.pl: When looking for the directory containing the
+ translation files, check in $Texinfo::ModulePath::builddir and
+ nowhere else.
+
+2019-05-06 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/tests/t/stdout.sh,
+ * tp/tests/t/stdout_split.sh: Remove tests.
+
+2019-05-06 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/tests/Makefile.am (copy-tests): Do not try to make target
+ in subdirectory.
+
+2019-05-06 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/t/94htmlxref.t: Remove a ".texi" suffix given as the manual
+ argument to an xref command.
+
+2019-05-06 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/t/30sectioning.t: Remove a ".texi" suffix given as the
+ manual argument to an xref command.
+
+2019-05-05 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/Convert/HTML.pm (_external_node_href): Do not strip
+ off an arbitrary extension from the name of an external manual -
+ only strip of ".info". Ludovico Courtès reported that
+ extensions were being used to distinguish translations of
+ manuals into other languages.
+
+2019-04-28 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/XS/Makefile.am
+ (XSParagraph_la_LDFLAGS, Parsetexi_la_LDFLAGS):
+ Put $(LTLIBINTL) and $(LTLIBICONV) in here. Remove $(TERMLIBS)
+ which was not used.
+
+ Attempt to fix building under Cygwin, which Hans-Bernhard Bröker
+ reported was broken.
+
+2019-04-28 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Set TEXI2DVI in Makefile.
+
+ * doc/Makefile.am: Set TEXI2DVI to use the texi2dvi in the
+ Texinfo sources rather than an installed one.
+
+2019-04-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Ignore spaces before @seeentry, @seealso and @sortas.
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_texi): Split off an ignored
+ spaces element if one of these commands is seen.
+ * tp/Texinfo/XS/parsetexi/parser.c
+ (isolate_last_space_menu_entry_node, isolate_trailing_space):
+ Rename and add a parameter.
+ (process_remaining_on_line): After these commands are seen, call
+ isolate_trailing_space.
+
+ * tp/t/09indices.t (subentry_and_sortas): New test.
+
+ This allows these commands to occur at the end of index commands
+ without trailing spaces being present in the output.
+
+2019-04-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ "See also" index entries for DocBook output.
+
+ * tp/Texinfo/Convert/DocBook.pm (_index_entry):
+ Output <see> or <seealso> elements if @seeentry or @seealso
+ directives were given for the index entry.
+
+2019-04-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
+ * tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry),
+ * tp/Texinfo/XS/parsetexi/api.c (build_single_index_data):
+ Always create index entry object but do not add it to array of
+ entries for the index if there was a @seeentry or @seealso.
+
+2019-04-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/XS/parsetexi/indices.c (enter_index_entry): Skip if
+ 'seeentry' or 'seealso' was recorded.
+ * tp/Texinfo/XS/parsetexi/separator.c (handle_close_brace):
+ Record values of 'seeentry' and 'seealso' the same way as for
+ 'sortas'. Ignore spaces following these commands.
+ * tp/Texinfo/XS/parsetexi/command_data.txt: Add 'seeentry',
+ 'seealso'. Remove comments referring to line numbers in Common.pm.
+
+2019-04-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/Common.pm (%in_index_commands, %brace_commands):
+ Add 'seeentry', 'seealso'. These are handled the same way as
+ 'sortas'.
+ * tp/Texinfo/ParserNonXS.pm (%command_ignore_space_after):
+ Add 'seeentry', 'seealso'.
+ (_parse_texi) <close brace>: Record values of 'seeentry' and
+ 'seealso' in extra hash the same way as for 'sortas'.
+ (_enter_index_entry): Skip the index entry if there is a
+ 'seeentry' or 'seealso' directive.
+ * tp/Texinfo/Convert/Plaintext.pm (_convert): Do not warn about
+ unhandled commands if a 'seeentry' or 'seealso' directive is
+ present.
+
+ * tp/t/09indices.t (seeentry): Add test.
+
+2019-04-21 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove TOP_NODE_FILE.
+
+ * doc/texinfo.texi (HTML Customization Variables): Remove
+ TOP_NODE_FILE.
+ * tp/Texinfo/Common.pm (@variable_string_settables):
+ Remove TOP_NODE_FILE.
+ * tp/Texinfo/Convert/Converter.pm (_top_node_filename):
+ Do not look at TOP_NODE_FILE.
+ * tp/Texinfo/Convert/HTML.pm (%defaults): Use TOP_FILE instead
+ of TOP_NODE_FILE.
+ (_set_variables_texi2html): Do not override value of TOP_FILE to
+ an empty string.
+ * tp/init/chm.pm: Do not try to set TOP_NODE_FILE.
+
+2019-04-03 Patrice Dumas <pertusus@free.fr>
+
+ Use EXTENSION instead of hardcoding html and add extension to TOP_NODE_FILE_TARGET
+
+ * tp/Texinfo/Convert/Converter.pm (_top_node_filename),
+ tp/Texinfo/Convert/HTML.pm (_set_root_commands_targets_node_files):
+ use EXTENSION instead of .html.
+ * tp/Texinfo/Convert/HTML.pm (%defaults, _external_node_href),
+ doc/texinfo.texi (TOP_NODE_FILE_TARGET): default is now index.html.
+ * tp/Texinfo/Convert/HTML.pm (_external_node_href): use
+ $external_file_extension instead of $extension to make clear that
+ it is not the same as EXTENSION.
+ * tp/t/init/t2h_singular.init (t2h_node_file_name): add that
+ function to replace .htm with .html for node files.
+ * tp/tests/tex_html/list-of-tests: update to match SHORTEXTN
+ removal.
+
+2019-04-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove some customization variables.
+
+ * tp/texi2any.pl (HTML Customization Variables):
+ Remove NODE_FILE_EXTENSION, SHORTEXTN.
+ (Other Customization Variables): Remove NODE_FILENAMES. Remove
+ mention of INPUT_ENCODING_NAME
+ * NEWS: Mention removal.
+
+2019-04-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove NODE_FILE_EXTENSION.
+
+ * tp/Texinfo/Convert/HTML.pm (%defaults):
+ (_set_root_commands_targets_node_files, _set_pages_files)
+ (_external_node_href, output),
+ * tp/Texinfo/Convert/Converter.pm (_set_pages_files, output)
+ (_top_node_filename)
+
+ Do not set or refer to NODE_FILE_EXTENSION. The extension for
+ html files will always be '.html'. Remove some commented-out
+ code.
+
+2019-04-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove SHORTEXTN.
+
+ * tp/Texinfo/Convert/HTML.pm (converter_initialize):
+ Do not check SHORTEXTN customization variable.
+
+2019-04-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove NODE_FILENAMES.
+
+ * tp/Texinfo/Convert/HTML.pm (output, %defaults, _set_pages_files),
+ * tp/Texinfo/Convert/Converter.pm (output, _top_node_filename)
+ (_set_pages_files): Do not set or refer to NODE_FILENAMES.
+
+ * tp/Texinfo/Convert/HTML.pm (_set_pages_files),
+ * tp/Texinfo/Convert/Converter.pm (_set_pages_files):
+ Remove code for naming output files with a number suffix (this
+ was the old texi2html behaviour).
+
+2019-04-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\defsl): Declare with OT1 encoding instead of
+ OT1TT to avoid pdftex warning about conflicting CMap's.
+
+2019-04-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (Preparing for TeX): Clearer wording
+ about where TeX finds input files. Report from Alan Mackenzie.
+ Update link to texinfo.tex. Do not discuss how to set
+ environment variables in csh.
+
+2019-04-11 Arnold D. Robbins <arnold@skeeve.com>
+
+ * doc/texinfo.texi: Update chapter on Indexing to cover new
+ @seeentry, @seealso and @subentry commands. General smaller
+ revisions to that chapter.
+
+2019-04-08 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Make texi2dvi --tidy more reliable.
+
+ * util/texi2dvi (xref_files_save) [--tidy]: Check for auxiliary
+ files in the same directory as the input file, and remove them.
+ (cd_dir): Possibly make $in_dir absolute.
+
+ * NEWS: Mention texi2dvi changes.
+
+
+2019-04-08 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Do not change directory variables when changing directory.
+
+ * util/texi2dvi (cd_dir, cd_orig): Do not change variables
+ containing pathnames. Store a prefix to use with these
+ variables in $rel. If either the new directory or in_input is
+ absolute, change all the pathname variables to be absolute.
+
+ (xref_files_save, xref_files_changed): Prefix $work_bak with
+ $rel.
+ (run_tex, run_hevea): Prefix $in_input with $rel.
+
+ No functional changes intended. The code to add and remove the
+ prefix from all of the variables had tricky quoting. $rel is
+ only needed in a small number of places in functions called from
+ run_tex_suite.
+
+2019-04-08 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * util/texi2dvi (make_openout_test): Call make_tex_cmd before
+ cd_dir. This means that no calls to ensure_dir are called
+ between cd_dir and cd_orig.
+
+2019-04-08 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * util/texi2dvi (run_tex): Remove use of make_tex_cmd. I could
+ find nothing in make_tex_cmd that would change the result
+ between uses of run_tex.
+ (run_tex_suite): Move use of make_tex_cmd here.
+
+2019-04-07 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (HTML Customization Variables): Remove text
+ "For HTML" from the description of each variable, as it is clear
+ that these variables are all for HTML.
+
+2019-04-07 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (latex2html Customization Variables): New
+ node, split from 'HTML Customization Variables'.
+
+2019-04-07 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove @math and @tex as 'global commands.'
+
+ * tp/Texinfo/ParserNonXS.pm (%global_multiple_commands),
+ * tp/Texinfo/XS/parsetexi/api.c (build_global_info2),
+ * tp/Texinfo/XS/parsetexi/parser.c (register_global_command),
+ * tp/Texinfo/XS/parsetexi/parser.h (GLOBAL_INFO): Remove 'math'
+ and 'tex'.
+
+ Reverts change on 2019-04-01. Suggestion from Patrice.
+
+2019-04-06 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\printindex): Give an error message with
+ \errmessage, instead of putting a message in the output
+ document, in order to give a hard failure in case an index file
+ has a backslash. Suggestion from Karl. Old index files will
+ still be upgraded by texi2dvi due to the previous change.
+
+2019-04-06 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * util/texi2dvi: If TeX exits with a bad status, do not quit
+ immediately: check if the xref files have changed. If they
+ have, the error might be corrected on subsequent runs. This is
+ intended to help with moving index files to use @ as the escape
+ character instead of \.
+
+2019-04-03 Patrice Dumas <pertusus@free.fr>
+
+ use tree in HTML handlers to collect @-command to be processed
+
+ * tp/Texinfo/Convert/HTML.pm (run_stage_handlers): pass document
+ tree root.
+ * tp/Texinfo/Common.pm (collect_commands_in_tree): add.
+ * tp/init/tex4ht.pm (tex4ht_prepare), tp/init/latex2html.pm (l2h_process):
+ find the math and tex command using
+ Texinfo::Common::collect_commands_in_tree instead of relying
+ on having those commands collected by the parser.
+
+2019-04-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Optionally use backslash as index escape character.
+
+ * doc/texinfo.tex
+ (\doindwrite): If the user gave '@set txiindexescapeisbackslash',
+ then use \ as the escape character in the index file.
+ (\splitindexentry): Use \string to output \indexlbrace etc.
+ (\printindex): Under the same condition, read the sorted index
+ file with backslash as an escape character. Expand the advice
+ on how to print the indices properly.
+
+2019-04-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Do not output literal backslash character in index files.
+
+ * doc/texinfo.tex
+ (\splitindexentry): In the sort key, use '{@indexbackslash }'
+ for a backslash, instead of a backslash character.
+ (\initialglyphs): Recognize \indexbackslash.
+ (\doindwrite): Output a backslash character as '@backslashchar {}'.
+ (\definedummies): Define \backslashchar as a dummy.
+
+ * doc/texinfo-tex-test.texi (Test of certain characters in index):
+ Add more examples.
+
+ This is intended to make it more reliable for either backslash
+ or at sign to be used as the escape character in index files,
+ for use with old versions of texi2dvi. (This also allows
+ reading in old index files that used the \indexbackslash
+ sequence, although that is not very important.)
+
+2019-04-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * js/info.js (scan_toc): Use getElementById instead of
+ querySelector, as id's are unique. From Mathieu.
+
+2019-04-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\urefallowbreak): Reduce stretch from 1fil to 4em.
+
+ This discourages breaking too early in the line.
+
+2019-04-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Support links between locally-installed manuals.
+
+ * js/info.js (external_manual_url_p): New function.
+ (fix_links): If a link to an external manual, open link in the
+ same browser tab.
+ (on_click): No special handling of links to external manuals.
+
+ This is intended to support links between locally-installed HTML
+ manuals. For this to work, links to other manuals must begin
+ with "../", so htmlxref.cnf would need to be overridden.
+
+2019-04-02 Patrice Dumas <pertusus@free.fr>
+
+ Avoid side effects in HTML formatting fonctions that can be overriden
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_heading_command,
+ _convert_menu_command, _convert): move code with side effects (setting
+ 'seenmenus' and using 'seemenus' to add automatically a menu) out
+ of formatting functions that can be overriden by a user to main
+ converter function.
+ * tests/tex_html: regenerate formatting_singular tests that overrides
+ the menu formatting function.
+
+2019-04-01 Patrice Dumas <pertusus@free.fr>
+
+ In _element_direction() output TOP_NODE_UP related infos even if element is not defined
+
+ * tp/Texinfo/HTML.pl (_element_direction): output
+ TOP_NODE_UP related infos even if element is not defined.
+ Explain in a comment when element is undef.
+
+2019-04-01 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Add @math and @tex as 'global commands.'
+
+ * tp/Texinfo/ParserNonXS.pm (%global_multiple_commands),
+ * tp/Texinfo/XS/parsetexi/api.c (build_global_info2),
+ * tp/Texinfo/XS/parsetexi/parser.c (register_global_command),
+ * tp/Texinfo/XS/parsetexi/parser.h (GLOBAL_INFO): Add 'math' and
+ 'tex'.
+ * tp/init/latex2html.pm, tp/init/tex4ht.pm: Do not add values to
+ GLOBAL_COMMANDS.
+
+ Patrice Dumas reported that tex4ht.pm and latex2html.pm were
+ broken since the GLOBAL_COMMANDS array was removed as a
+ customization value for init files (on 2018-10-13).
+
+2019-04-01 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Make search-next and search-previous work for tree search.
+
+ * info/session.c (info_search_next, info_search_previous):
+ If there is an active tree search, carry on with it. This means
+ that the '}' and '{' keys can be used to go through the results
+ from a tree search (instead of 'M-}' and 'M-{').
+ (info_search_1): Disable any active tree search.
+ * NEWS: Mention change.
+
+2019-03-31 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove XS po directory.
+
+ * tp/Texinfo/XS/po: Remove.
+ * tp/Texinfo/XS/configure.ac (AC_CONFIG_FILES): Remove
+ po/Makefile.in.
+
+ This keeps AM_GNU_GETTEXT in the XS subdirectory. Apparently
+ AM_PO_SUBDIRS is also still used, even there is no po
+ subdirectory.
+
+2019-03-31 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Only use a single po directory.
+
+ * po/POTFILES.in: List parsetexi input files.
+ * po/Makevars (XGETTEXT_OPTIONS): Move options from
+ tp/Texinfo/XS/po/Makevars.
+
+2019-03-31 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Find translation directory for parsetexi.
+
+ * tp/Texinfo/XS/parsetexi/api.c (find_locales_dir): New
+ function.
+ (init): Call it.
+ * NEWS: Mention change.
+
+2019-03-31 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Pass on srcdir to XS modules.
+
+ * tp/Texinfo/ModulePath.pm.in ($srcdir): New variable.
+ (init) [uninstalled]: Set it.
+ * tp/Texinfo/XSLoader.pm: Pass on $Texinfo::ModulePath::srcdir
+ to XS modules.
+ * tp/Texinfo/XS/parsetexi/api.c (init): Save value of srcdir.
+
+2019-03-31 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Output message if file ended inside Top node.
+
+ * doc/texinfo.tex (\omittopnode): Redefine @bye and put a
+ message in the output file to say the Top node was omitted.
+ This is most likely for short test files that consist only of a
+ Top node.
+
+2019-03-31 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * NEWS: Add some news items.
+
+2019-03-31 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Make texi2dvi --batch the default.
+
+ * util/texi2dvi: (batch): Remove variable.
+ (usage): Do not mention --batch.
+ (make_tex_command): Unconditionally run in batch mode.
+ (make_openout_test): Do not save and restore $batch.
+ (input_file_name_decode): Do not set $batch for AUC-Tex input.
+ (usage): Remove a comment about 'echo' compatibility.
+
+2019-03-31 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (Inserting Unicode): Include the IJ ligature
+ in the output. Do not say that a UTF-8 encoding must be
+ explicitly requested.
+
+2019-03-30 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Module search path changes (no functional changes intended).
+
+ * tp/texi2any.pl:
+ Only check if one variable has been substituted by the Makefile
+ to create this file. Do not set environment variables: only add
+ a directory to @INC so that Texinfo:ModulePath might be found.
+ Pass an 'updirs' argument into Texinfo::ModulePath.
+ * tp/Texinfo/ModulePath.pm.in (init): Change argument from
+ 'uninstalled' to 'installed', so that the uninstalled case is
+ the default. Place code for using uninstalled files and
+ checking environment variables inside a conditional so it is
+ clearer when this code is used. Do not set any environment
+ variables: use them for input only.
+
+2019-03-30 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Introduce blank lines in test case.
+
+ * tp/t/converter_tests.t ($at_commands_in_refs_text): Introduce
+ blank lines in input Texinfo to avoid problems with varying line
+ break decisions due to different wcwidth implementations.
+ * tp/t/converters_tests.t (at_commands_in_refs): Do not skip.
+ (at_commands_in_refs_utf8): Do not skip this one either, since
+ we are now counting combining accents in the XS code as having
+ width.
+
+2019-03-30 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Skip tests instead of marking them as expected failures.
+
+ * tp/t/test_utils (test): If a test case is marked as 'todo',
+ always skip the test with 'skip' from Test::More, instead of
+ putting it inside a 'TODO' block. Remove some commented-out
+ code.
+
+2019-03-30 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Skip a test.
+
+ * tp/t/converters_tests.t (at_commands_in_refs): Skip plaintext
+ output until we can get consistent results on Solaris 10 and
+ Solaris 11.
+
+2019-03-30 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/t/test_utils.pl: Do not print errors from conversions.
+
+2019-03-29 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Use 'utf-8' instead of 'utf-8-strict' as name of encoding.
+
+ * tp/Texinfo/Common.pm (%default_parser_state_configuration)
+ (open_out, count_out): Use 'utf-8' instead of 'utf-8-strict' as
+ the name of the perl encoding.
+ * tp/Texinfo/ParserNonXS.pm (_open_in): Check for 'utf-8'
+ instead of 'utf-8-strict'. Add a missing closing parenthesis in
+ input filter declaration.
+ * tp/Texinfo/XS/parsetexi/parser.c (wipe_global_info):
+ Use 'utf-8' instead of 'utf-8-strict'.
+
+ On perl v5.8.4, there was an error 'Cannot find encoding
+ "utf-8-strict"'. (This version is used on the OpenCSW
+ buildfarm.)
+
+2019-03-28 Arnold D. Robbins <arnold@skeeve.com>
+
+ * texinfo.tex: @see is now @seentry, per Gavin. Removed
+ spurious definition of \putwordSee.
+
+2019-03-27 Patrice Dumas <pertusus@free.fr>
+
+ Set Top node Up per format and not in Structuring.
+
+ * tp/Texinfo/Common.pm, tp/Texinfo/Convert/Converter.pm: set
+ TOP_NODE_UP in converter defaults.
+ * tp/Texinfo/Structuring.pm, tp/Texinfo/Convert/HTML.pm,
+ tp/Texinfo/Convert/Info.pm, doc/texinfo.texi: do not set
+ the Top node Up in Structuring but in converters. Only use
+ TOP_NODE_UP and set an Up URL/name in HTML when TOP_NODE_UP_URL
+ is set and do not modify all the links of the TOP_NODE_UP,
+ only the Top node Up links.
+
+2019-03-27 Patrice Dumas <pertusus@free.fr>
+
+ * tp/init/chm.pm, tp/init/latex2html.pm, tp/init/tex4ht.pm:
+ use __() from Texinfo::Common
+
+2019-03-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Fix test of XS modules.
+
+ * tp/Texinfo/XS/TestXS.pm: Declare init function as having a
+ single argument, and return a true value. Otherwise the test
+ for XS modules fails. Report from Patrice Dumas.
+
+2019-03-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Small changes.
+
+ * tp/Texinfo/XS/xspara.c (xspara_add_text): Add a comment.
+ * tp/tests/sectioning/Makefile.am: Do not try to distribute a
+ removed file.
+ * tp/Texinfo/XS/po/texinfo.pot: Untrack in git.
+
+2019-03-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Make test results consistent for older versions of perl.
+
+ * tp/Texinfo/Convert/Plaintext.pm (@U): Check argument to @U
+ before attempting to output the character. The check inside
+ eval doesn't work for old versions of perl. Trim down some
+ comments.
+
+2019-03-25 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Make test results consistent between XS and non-XS modules.
+
+ * tp/Texinfo/XS/xspara.c (xspara_add_text): Treat characters
+ with wcwidth 0 the same as those with wcwidth 1. This is wrong,
+ but gives consistency for the test results.
+
+2019-03-24 Arnold D. Robbins <arnold@skeeve.com>
+
+ @see in index entries (experimental).
+
+ * doc/texinfo.tex
+ (\see, \putwordSee): Add default definitions for reading
+ in a sorted index file.
+ (\splitindexentry): Record value of any @see directive in
+ the index entry inside \pagenumbertext. Make @see expansion
+ empty when getting the sort key.
+
+2019-03-24 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * util/htmlxref.cnf: Update 'mit-scheme-imail'. From
+ Thérèse Godefroy.
+
+2019-03-24 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/XS/parsetexi/parser.c (wipe_global_info): Set
+ input_encoding_name as well as input_perl_encoding.
+
+2019-03-24 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove INPUT_PERL_ENCODING and INPUT_ENCODING_NAME as
+ customization variables.
+
+ * tp/Texinfo/Common.pm (%default_customization_values)
+ (@variable_string_settables): Remove INPUT_PERL_ENCODING and
+ INPUT_ENCODING_NAME.
+ * tp/Texinfo/Convert/Converter.pm (converter),
+ * tp/Texinfo/XS/parsetexi/Parsetexi.pm (parse_texi_file),
+ Remove code propagating INPUT_PERL_ENCODING and
+ INPUT_ENCODING_NAME.
+
+ * tp/Texinfo/ParserNonXS.pm (%initialization_overrides):
+ Remove 'INPUT_ENCODING_NAME'.
+
+ * tp/Texinfo/ParserNonXS.pm (_open_in, _end_line, _parse_texi),
+ * tp/Texinfo/Convert/Converter.pm (converter),
+ * tp/Texinfo/Convert/IXIN.pm (output_ixin),
+ * tp/Texinfo/Structuring.pm (do_index_keys):
+ Do not use INPUT_PERL_ENCODING or INPUT_ENCODING_NAME: use the
+ 'info' hash instead.
+
+ * tp/Texinfo/Common.pm (_convert_text_options),
+ * tp/Texinfo/Report.pm (gdt),
+ * tp/texi2any.pl:
+ Do not look use INPUT_ENCODING_NAME or INPUT_PERL_ENCODING.
+
+ * doc/texinfo.texi (Other Customization Variables):
+ Remove INPUT_PERL_ENCODING and INPUT_ENCODING_NAME. Remove
+ @ifnottex block around Top node.
+
+ This is an attempt at simplifying a complicated picture around
+ character encoding. These customization variables had little
+ use as the encoding is given as @documentencoding in the input.
+
+
+2019-03-24 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Use UTF-8 more consistently in test suite.
+
+ * tp/Texinfo/ParserNonXS.pm (parse_texi_file): Do not set
+ 'input_encoding_name' and 'input_perl_encoding' here.
+ * tp/Texinfo/Common.pm (%default_parser_state_configuration):
+ Set 'input_encoding_name' and 'input_perl_encoding' here.
+
+2019-03-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Make UTF-8 default input encoding for parsetexi.
+
+ * tp/Texinfo/XS/parsetexi/Parsetexi.pm (parse_texi_file):
+ Propagate values of INPUT_PERL_ENCODING and INPUT_ENCODING_NAME.
+ * tp/Texinfo/XS/parsetexi/api.c (reset_parser_except_conf):
+ Call 'set_input_encoding' to use "utf-8" as the default.
+ * tp/Texinfo/XS/parsetexi/parser.c (wipe_global_info): Set
+ global_info.input_perl_encoding to "utf-8-strict".
+
+ This replicates changes made on 2019-02-23 and 2019-02-26.
+
+2019-03-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ @subentry in parsetexi.
+
+ * tp/Texinfo/XS/parsetexi/command_data.txt: Add subentry.
+ * tp/Texinfo/XS/parsetexi/handle_commands.c
+ (handle_line_commands) <@subentry>: Add section.
+ (handle_brace_commands) <@sortas>: Allow to occur inside @subentry.
+ * tp/Texinfo/XS/parsetexi/parser.c (check_valid_nesting): Allow
+ @subentry to occur inside most commands.
+ (process_remaining_on_line) <@-command>: Allow @subentry to
+ occur other than at the beginning of a line.
+ * tp/Texinfo/XS/parsetexi/separator.c (handle_close_brace)
+ <@sortas>: Record sort key on @subentry element.
+
+2019-03-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Fix sort key for undefined @value.
+
+ * doc/texinfo.tex (\indexnofontsvalue): Place a % comment
+ character after the text for an undefined @value.
+ If this comment character isn't present and the @value is
+ followed by a space, the rest of the index sort key will be
+ discarded inside @eatspaces called from @splitindexentry. It
+ appears that @eatspaces does not cope with several spaces in a
+ row in its argument.
+
+2019-03-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Add more tests of @value in index.
+
+ * doc/texinfo-tex-test.texi (Test of auxiliary files):
+ Add test of values in index entries containing underscores and
+ nested Texinfo commands. Add test of a @value that changes.
+ * doc/texinfo.tex (\expandablevalue): Remove obsolete comment.
+ @value in index entries is more reliable now that we use @ as
+ the escape character in index entries.
+
+2019-03-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove apparently unused code.
+
+ * doc/texinfo.tex (\begindoublecolumns): Remove code that is
+ supposed to account for the output routine in
+ \begindoublecolumns being called twice in a row. It checks
+ whether \partialpage is void, but it appears that \partialpage
+ will always be void. \doublecolumnout, \balancecolumns and
+ \pagesofar all clear \partialpage with \unvbox, which I believe
+ covers all the cases. I was unable to get this code to run with
+ various tests. Remove references to long-lost test files.
+ (Removed code introduced on Jan 14 16:53:43 1999 according to
+ ChangeLog entry.)
+
+2019-03-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Ignore Top node a different way.
+
+ (\omittopnode): Change implementation so as to work when the
+ next node is hidden inside an included file.
+ (\nwnode, \up, \down): Remove these useless synonyms.
+
+2019-03-22 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Ignore Top node in texinfo.tex even without @ifnottex.
+
+ * doc/texinfo.tex (\omittopnode): New macro.
+ (\node): Call it.
+
+2019-03-22 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\texinfoc): Remove.
+ (\scanmacro): Use \comment instead of \texinfoc. \comment has
+ the same meaning inside math mode as outside.
+ (\argremovecomment): Don't bother about @texinfoc.
+
+2019-03-18 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Pass on to XS modules whether uninstalled files should be used.
+
+ * tp/Texinfo/ModulePath.pm.in ($texinfo_uninstalled): New
+ variable.
+ (init): Set it if passed the right argument.
+ * tp/texi2any.pl: Pass on to Texinfo::ModulePath::init whether
+ uninstalled files should be used. Use the value of
+ $texinfo_uninstalled to decide where to look for locale files.
+ Remove some commented-out code and move a variable declaration
+ into a smaller block.
+ * tp/Texinfo/XSLoader.pm: Pass on
+ $Texinfo::ModulePath::texinfo_uninstalled to XS modules.
+
+2019-03-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Find translatable strings in parsetexi.
+
+ * tp/Texinfo/XS/po/Makevars (XGETTEXT_OPTIONS): Use line_error
+ and similar functions to mark translatable strings. (This
+ should maybe be done in the top-level po/Makevars instead.)
+ * tp/Texinfo/XS/parsetexi/errors.c (line_error_internal):
+ Pass message string to gettext function.
+ * tp/Texinfo/XS/po/POTFILES.in: List files containing
+ translatable strings.
+
+2019-03-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Add gettext to XS modules.
+
+ * tp/Texinfo/XS/parsetexi/Parsetexi.xs,
+ * tp/Texinfo/XS/parsetexi/api.c (init):
+ Add, to be called from Texinfo::XSLoader. Initialize gettext.
+
+ * tp/Texinfo/XS/parsetexi/api.c: Include libintl.h.
+
+ * tp/Texinfo/XS/configure.ac: Add AM_GNU_GETTEXT([external]).
+ * tp/Texinfo/XS/Makefile.am (AM_CPPFLAGS): Define DATADIR.
+
+ * tp/Texinfo/XS: Run 'gettextize'.
+ I do not know if '--po-dir=../../../po -f' should have been used
+ here - should we share the po directory with the top-level
+ project?
+ * tp/Texinfo/XS: Run 'aclocal -I gnulib/m4'.
+ * tp/Texinfo/XS/po/Makevars: Copy from Makevars.template. I'm
+ not sure if this will be used.
+
+ Changes made by gettextize:
+ * tp/Texinfo/XS/Makefile.am (SUBDIRS): Add po.
+ * tp/Texinfo/XS/configure.ac (AC_CONFIG_FILES): Add po/Makefile.in.
+
+ * tp/Texinfo/XS/gnulib/m4/gettext.m4: New file, from gettext-0.19.8.
+ * tp/Texinfo/XS/gnulib/m4/iconv.m4: Upgrade to gettext-0.19.8.
+ * tp/Texinfo/XS/gnulib/m4/lib-ld.m4: Upgrade to gettext-0.19.8.
+ * tp/Texinfo/XS/gnulib/m4/lib-link.m4: Upgrade to gettext-0.19.8.
+ * tp/Texinfo/XS/gnulib/m4/lib-prefix.m4: Upgrade to gettext-0.19.8.
+ * tp/Texinfo/XS/gnulib/m4/nls.m4: New file, from gettext-0.19.8.
+ * tp/Texinfo/XS/gnulib/m4/po.m4: New file, from gettext-0.19.8.
+ * tp/Texinfo/XS/gnulib/m4/progtest.m4: New file, from gettext-0.19.8.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ @seealso in index entries (experimental).
+
+ * doc/texinfo.tex
+ (\seealso, \putwordSeeAlso): Add default definitions for reading
+ in a sorted index file.
+ (\splitindexentry): Record value of any @seealso directive in
+ the index entry inside \pagenumbertext. Make @seealso expansion
+ empty when getting the sort key.
+ (\doindwrite): If \pagenumbertext set, use its contents instead
+ of \folio in the page number field.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo-tex-test.texi (Index subentries): New section.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Combine pdftex and XeTeX conditionals.
+
+ * doc/texinfo.tex (\ifpdforxetex): New conditional. Use it in
+ several places. This removes some code duplication.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Support @tertiary in sorted index file.
+
+ * doc/texinfo.tex (\indententry): New.
+ (\secondary, \tertiary): Use it.
+ (\entry): Fix case when there are no page numbers and no leaders
+ are being printed. Indent code that is outputting inside a box.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\printindex): Fix detection of backslash in
+ sorted index file.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Make @subentry the same level as index command in tree.
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_texi) <@subentry>:
+ Call _end_line to avoid @subentry becoming a child of an index
+ command or another @subentry command.
+
+ This means that we convert back to Texinfo correctly without
+ misplacing spaces before the @subentry command.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove unused function.
+
+ * tp/Texinfo/Convert/Converter.pm (_register_command_arg): Remove.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Test of @subentry.
+
+ * tp/t/09indices.t (subentries): New test.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ @subentry in DocBook output.
+
+ * tp/Texinfo/Convert/DocBook.pm (_index_entry):
+ Possibly output index subentries inside <secondary> or
+ <tertiary> elements.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ @subentry in HTML output.
+
+ * tp/Texinfo/Convert/Converter.pm (convert_index_subentries): New.
+ * tp/Texinfo/Convert/HTML.pm (_convert_printindex_command): Use it.
+ * tp/Texinfo/Convert/Plaintext.pm (_printindex_formatted):
+ Inline code from convert_line and call convert_index_subentries.
+
+2019-03-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Start on supporting @subentry in parser and Info output.
+
+ * tp/Texinfo/Common.pm (%line_commands): Add 'subentry'.
+ * tp/Texinfo/ParserNonXS.pm
+ (%in_full_text_commands): Include 'subentry' so that @subentry
+ can appear inside an index command.
+ (%begin_line_commands): Allow @subentry to occur other than at
+ the beginning of a line.
+ (_is_index_element): New.
+ (_parse_texi): Use _is_index_element to check if we are in an
+ index command.
+ (_parse_texi) <line commands>: Handle @subentry. Check valid
+ nesting. Keep track of how many @subentry's have been used.
+ * tp/Texinfo/Convert/Plaintext.pm (_printindex_formatted): If
+ there are index subentries, add them to the end of the text of
+ the index entry, separated by commas.
+
+ This represents index subentries as a line command at the end of
+ the index entry. A second @subentry is nested inside the first.
+
+2019-03-14 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/t/18itemize.t (table_in_itemize): New test.
+
+2019-03-13 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Examples of special characters in PDF destinations.
+
+ * doc/texinfo-tex-test.texi
+ (Test of characters in node names for PDF): New test.
+
+2019-03-12 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Only load lcircle10 if @cartouche is used.
+
+ * doc/texinfo.tex (\cartouchefontdefs): New macro. Put loading
+ lcircle10 font in here.
+ (\cartouche): Use it.
+
+ This is a similar approach to that used for @euro{}.
+
+2019-03-11 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Active backslash in \setupdatafile.
+
+ * doc/texinfo.tex (\setupdatafile): Make backslash active rather
+ than other. This means that a section title is printed
+ correctly with input like the following:
+
+ \input texinfo
+ @xrefautomaticsectiontitle on
+
+ @node One
+ @chapter One
+
+ One. @xref{Two}.
+
+ @node Two
+ @chapter Two \
+
+ @bye
+
+ Without this, the backslash typesets as quotation marks. Delete
+ an old comment stating that catcode other is needed for \csname
+ to work in \xrdef. Currently, \turnoffactive called in \xrdef
+ gives backslash the needed definition. In any case, backslashes
+ in node names appear to produce buggy PDF files in many cases.
+
+ * doc/texinfo.tex (\setupdatafile): Remove out-of-date comment
+ about why we do not support ^^ notation in auxiliary files.
+
+2019-03-10 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo-tex-test.texi (Test of index widow elimination):
+ Comment out.
+ (No page number in index): New section.
+
+2019-03-10 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove code for preventing widowed index entries.
+
+ * doc/texinfo.tex
+ (\finishentry): Output the index entry directly to the current
+ vertical list instead of storing it in a box and then calling
+ \dotheinsertentrybox.
+ (\insertentrybox, \dotheinsertentrybox)
+ (\dotheinsertentryboxwithpenalty, \ourunvbox): Remove.
+ (\entry): No redefinition of \domark.
+ (\printindex): Do not redefine \dotheinsertentrybox. Read file
+ with \input instead of line-by-line with \read.
+ (\indexinputprocessing, \loopdo): Remove.
+
+ This code added an awful lot of complexity for not much benefit.
+ It is better to use the processes provided in TeX (\input and
+ \unvbox) where possible, instead of creating a separate version.
+
+2019-03-10 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Use <h5> for footnote labels.
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_footnote_command): Use
+ <h5> instead of <h3> for the numbered footnote labels.
+ Jean-Christophe Helary reported that the <h3> level being used
+ was greater than that for the main footnotes heading, which was
+ only <h4>.
+
+2019-03-10 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Fix indentation of @table within @itemize.
+
+ * tp/Texinfo/Convert/Plaintext.pm (ensure_end_of_line):
+ Set 'counter' on top-most 'text_element_context' to zero. This
+ makes a @table be indented correctly within an @itemize and also
+ means an @item immediately following the @table is indented
+ properly. Report from Alan Mackenzie.
+
+2019-03-09 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove unused backslash macros.
+
+ * doc/texinfo.tex (\rawbackslash): Remove. It appears to be
+ unnecessary as @t and @code work fine without it.
+ (\t, \tclose): Do not call \rawbackslash.
+ (\rawbackslashxx, \doublebackslash): Remove.
+
+2019-03-09 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo-tex-test.texi (Index display): Use @ as the escape
+ character.
+ (@,c in macro argument): @, doesn't work any more in macro
+ argument due to changing the catcode of @.
+
+2019-03-09 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\macroargctxt, \macrolineargctxt): Set
+ catcode of @ to other.
+
+2019-03-09 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove description of a bug fixed by the last change.
+
+ * doc/texinfo-tex-test.texi: Remove description of why a Texinfo
+ command inside an @example inside a macro didn't work. It works
+ now that @ is no longer an escape character when a macro body is
+ read. This means that \scantokens no longer sees any control
+ sequences in the macro body and does not insert extra spaces.
+
+2019-03-09 Gavin Smith <gavinsmith0123@gmail.com>
+
+ No catcode changes in \scanmacro.
+
+ * doc/texinfo.tex (\scanmacro): Do not change catcode of @ or \.
+
+2019-03-09 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Fix marginindex flag.
+
+ (\doindwrite, \maybemarginindex): Move code to put index entry
+ in the margin to a new macro, and make it work again.
+
+2019-03-09 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove \indexdummies.
+
+ * doc/texinfo.tex (\indexdummies): Remove.
+ (\doindwrite): Call \atdummies instead of \indexdummies and move
+ the special definitions of \{ and \} here.
+ (\onepageout): Call \atdummies instead of \indexdummies.
+
+2019-03-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Use @ as escape character in index files.
+
+ * doc/texinfo.tex
+ (\indexdummies): Do not change \escapechar to backslash.
+ Call \otherbackslash in order to keep backslash as it is.
+ (\doindwrite, \indexnonalnumreappear):
+ Do not call \useindexbackslash or change the definition of \@.
+ (\indexbackslash, \useindexbackslash): Remove.
+ (\splitindexentry): Convert @@ and @atchar{} to {@indexatchar}.
+ texindex does not currently output given a sort key beginning
+ with @ as @initial{@@}, outputting @initial{@} instead.
+
+ (\onepageout): Remove comment about backslash in index files.
+ Call \turnoffactive instead of \normalturnoffactive in order to
+ output backslash as itself in index files.
+
+ (\printindex): Do not change catcode of \ or @.
+ (\printindex, \initialglyphs): Move setting \indexlbrace and
+ \indexrbrace to \initialglyphs, and add \indexatchar too. Do
+ not set \indexbackslash.
+
+ (\atdummies): Comment changed so as no longer to imply that the
+ aux and toc files are the only auxiliary files using @.
+
+ (\printindex): Cheeck first character of index file, and if it
+ is a backslash, skip reading the file.
+
+ * doc/texinfo-tex-test.texi (Test of certain characters in index):
+ New section.
+ * util/texi2dvi (index_file_p): Check for a @entry in index
+ files as well as \entry.
+
+2019-03-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Reset output routine correctly.
+
+ * doc/texinfo.tex (\defaultoutput): New token list, to contain
+ default output routine.
+ (\enddoublecolumns): Use it to correctly use \savetopmark in the
+ output routine after the output of an index is finished.
+ * doc/texinfo-tex-test.texi: Remove @bye line ending file by
+ mistake.
+
+2019-03-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ No stretch around breakable characters in URL's.
+
+ * doc/texinfo.tex
+ (\urefprestretchamount, \urefpoststretchamount): Remove.
+ (\urefprestretch, \urefpoststretch): Remove. Replace calls with
+ \urefprebreak and \urefpostbreak.
+ (\urefallowbreak): New macro, to allow a ragged right break
+ within a URL.
+
+ * doc/texinfo-tex-test.texi (URL line breaking): New section.
+
+ This could lead to too much space being inserted, for example
+ around the two slashes in "http://". The ragged right break
+ prevents under-full or over-full boxes. (bug-texinfo, July 2018.)
+
+2019-03-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Tidy up index writing.
+
+ * doc/texinfo.tex (\dosubindwrite, \doindwrite): Rename.
+ (\doind, \dosubind): Make \dosubind call \doind, not vice versa.
+ Move definition of \dosubind nearer where it is used.
+
+ (\deffngeneral): Remove a comment.
+
+2019-03-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Implement index subentries in texinfo.tex.
+
+ * doc/texinfo.tex (\splitindexentry): New macro.
+ (\dosubindwrite): Call it to get the index text split up into
+ primary entry and possible secondary and further entries
+ separated by @subentry, as well as the index sort key. For one
+ subentry only, this is the same format as was output in the past
+ and recognized by the C implementation of texindex.
+
+ This feature is experimental.
+
+2019-03-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Change how marks are preserved.
+
+ * doc/texinfo.tex (\savemarks, \restoremarks): Remove. No
+ longer propagate marks by running an output routine. This could
+ lead to whatsits being thrown away in \restoremarks.
+ (\savedtopmark, \savetopmark, \iftopmarksaved): New. Save
+ \topmark only in \savedtopmark, a token list register.
+ (\gettopheadingmarks, \getcolormarks, \onepageout)
+ (\begindoublecolumns, \doublecolumnout):
+ Use \savetopmark instead.
+
+ The old behaviour made texinfo.tex less hackable, as simple
+ input like:
+
+ \input texinfo
+
+ @cindex dddddd
+ @cindex fff
+
+ @printindex cp
+ @bye
+
+ could lead to an empty *.cp file, which was confusing, even if
+ this kind of problem would never occur in real documents.
+
+2019-03-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Add test material for headings and footings.
+
+ * doc/texinfo-tex-test.texi (Headings and footings): New section.
+
+2019-03-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Rename \lastchapterdefs.
+
+ * doc/texinfo.tex:
+ (\lastchapterdefs, \currentchapterdefs)
+ (\lastsectiondefs, \currentsectiondefs)
+ (\lastcolordefs, \currentcolordefs)
+ (\lastsection, \currentsection):
+ Rename, as it is confusing to have both \lastchapterdefs and
+ \prevchapterdefs: both "last" and "previous" mean the same
+ thing.
+
+2019-03-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Fix @everyheadingmarks top.
+
+ * doc/texinfo.tex (\onepageout): Separate the code for setting
+ \headlinebox and \footlinebox. Otherwise, the definitions for
+ the footline would overwrite those for the headline, rendering
+ '@everyheadingmarks top' ineffective.
+
+2019-03-02 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.tex (\chapmacro): Remove obsolete comment about
+ \setcontentsaftertitlepage.
+
+2019-02-28 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove obsolete and unused code.
+
+ * doc/texinfo.tex (\cindexsub): Remove. It has been in
+ texinfo.tex for a very long time but is not documented or
+ implemented in makeinfo.
+
+2019-02-28 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Better support for @sortas at end of index entry.
+
+ * doc/texinfo.tex (\dosubindwrite): Use \eatspaces to trim
+ leading and trailing spaces from the index entry. This means a
+ @sortas command can occur at the end of the index entry with a
+ space before it, and the space will be removed when writing to
+ the index file.
+ (\sortas): Expand to empty.
+ (\dosubind): Do not set \toks0: use a \def instead to store the
+ index entry text.
+
+2019-02-26 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Use UTF-8 input and output by default for Info.
+
+ * tp/Texinfo/ParserNonXS.pm (_open_in): New function.
+ (parse_texi_file),
+ (_end_line) <@include>: Use it.
+ (parse_texi_file): Set the input encoding on $self->{'info'}.
+
+ * tp/Texinfo/Convert/Unicode.pm (%extra_unicode_map): New hash,
+ to contain a subset of %unicode_map.
+ * tp/Texinfo/Convert/Plaintext.pm (converter_initialize):
+ If @documentencoding were not given and we are converting to
+ UTF-8, set 'no_extra_unicode' on the 'convert_text_options'
+ hash, and do not use any curly quotes for style commands.
+ * tp/Texinfo/Convert/Plaintext.pm (_process_text): Do not
+ convert `` into “, etc unless @documentencoding was in the
+ document.
+ * tp/Texinfo/Convert/Text.pm (brace_no_arg_command):
+ Check 'no_extra_unicode' in the options and if it is set,
+ exclude commands in %extra_unicode_map being output as non-ASCII
+ UTF-8 sequences.
+
+2019-02-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * doc/texinfo.texi (@titlepage): Remove documentation of
+ @setcontentsaftertitlepage.
+
+2019-02-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove unused code.
+
+ * tp/Texinfo/Parser.pm (%tree_informations, duplicate_parser),
+ * tp/Texinfo/XS/parsetexi/Parsetexi.pm (duplicate_parser):
+ Remove unused.
+
+2019-02-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Make UTF-8 default input encoding.
+
+ * doc/texinfo.tex: Remove line setting catcodes of non-ASCII
+ characters to "other". Change a comment.
+ * tp/t/test_sort.t: Update results.
+ * tp/Texinfo/Common.pm (%default_customization_values)
+ <INPUT_ENCODING_NAME, INPUT_PERL_ENCODING>: Use UTF-8 by default.
+ * NEWS: Mention change.
+
+2019-02-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Avoid unnecessary change in test results.
+
+ * tp/Texinfo/Convert/HTML.pm: Add 'return undef' to end of
+ function. This stops an empty string being returned from the
+ sub for some reason. This led to a change in the results
+ for 'file_html' tests.
+
+2019-02-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Load more modules on demand.
+
+ * tp/Texinfo/Convert/Converter.pm: Use fewer "use" declarations.
+ (converter, sort_element_count): Use "require" statements
+ to load modules on demand. This cuts down the run time of
+ 'texi2any --help' as it stops Texinfo::Parser being loaded
+ (about 0.6 sec -> 0.4 sec on my computer).
+
+ This change depends on the previous change for module
+ namespaces; otherwise, the Texinfo::Parser::parser subroutine
+ can't be called in texi2any.pl, as the wrong hash is being
+ referenced for %Texinfo::Parser::. This could be worked around
+ by putting the call within an 'eval' statement to delay the
+ choice of which namespace hash to use; however, this would be
+ too distracting if done too much.
+
+2019-02-23 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Avoid package typeglob assignment.
+
+ * tp/Texinfo/ParserNonXS.pm: Use "package Texinfo::Parser"
+ instead of "package Texinfo::ParserNonXS" and then aliasing the
+ package namespace hash with a typeglob assignment. Move
+ "use Texinfo::Report" earlier in file and remove lengthy
+ comment.
+
+ * tp/Texinfo/XS/parsetexi/Parsetexi.xs: Use "Texinfo::Parser"
+ instead of "Parsetexi" in MODULE and PACAKGE declarations.
+
+ Package typeglob assignment is not recommended in the Perl
+ documentation anywhere, and has confusing effects. It appears
+ that when a Perl source file is read, the symbols are
+ interpreted in terms of a particular package namespace hash.
+ This hash does not change if the package hash is later
+ reassigned, which can lead to undefined symbols, especially with
+ complicated situations when files "use" one another.
+
+2019-02-19 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Prefer @url in the documentation.
+
+ * doc/texinfo.texi (@url, @url Examples): Use @url consistently
+ and say that @uref is a synonym. Akim Demaille reported that a
+ confusing mixture of the two was being used.
+
+2019-02-19 Gavin Smith <gavinsmith0123@gmail.com>
+
+ @documentencoding is not file-specific.
+
+ * tp/Texinfo/XS/parsetexi/input.c (input_encoding): New
+ variable.
+ (set_input_encoding, next_text):
+ Use that encoding instead of an encoding on the input stack.
+
+ (INPUT): Remove field 'encoding'.
+ (input_push, input_push_file): Update.
+
+ Eli Zaretskii reported that a @documentencoding command in an
+ @include'd file would not take effect outside of that file,
+ which was wrong for the Emacs manuals.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove noderename.cnf feature.
+
+ * tp/Texinfo/Common.pm (@variable_string_settables):
+ Remove 'RENAMED_NODES_DIRECTIONS', 'RENAMED_NODES_FILE'.
+ (collect_renamed_nodes, parse_renamed_nodes_file): Remove.
+
+ * tp/Texinfo/Convert/HTML.pm
+ (converter_initialize): Do not check Texinfo::Config::renamed_nodes.
+ (_file_header_informations): Change a comment.
+ (output): Do not call Texinfo::Common::collect_renamed_nodes.
+ Remove code dealing with renamed nodes.
+ (_parse_node_and_warn_external): Remove unused. This eliminates
+ the dependecy of Texinfo::Convert::HTML on Texinfo::Parser.
+
+ * tp/tests/Makefile.am: Remove code dealing with copying
+ renamednodes.cnf-ref.
+ * tp/tests/sectioning/renamednodes.cnf-ref: Remove.
+ * tp/tests/sectioning (equivalent_nodes_test_renamed_nodes): Remove.
+ * tp/tests/README: Update instructions for git.
+
+ * tp/t/92formatting.t (unknown_nodes_renamed): Remove.
+
+ * doc/texinfo.texi (Other Customization Variables)
+ <RENAMED_NODES_FILE, RENAMED_NODES_REDIRECTIONS>: Remove.
+ RENAMED_NODES_REDIRECTIONS was not actually used anywhere.
+ (HTML Xref Link Preservation): Remove node.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+
+ * tp/test_utils.pl: Check if errors were output properly.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove some function checks.
+
+ * configure.ac: Remove AC_FUNC_STRCOLL.
+ (AC_CHECK_FUNCS): Do not check for bzero, getcwd, memset,
+ setvbuf or strchr.
+ * system.h: Never declare strcoll.
+ * info/dribble.c (open_dribble_file): Do not check HAVE_SETVBUF
+ or SETVBUF_REVERSED.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Do not check for some header files.
+
+ * configure.ac (AC_CHECK_HEADERS): Do not check for limits.h,
+ string.h, strings.h, sys/file.h, sys/stream.h or sys/ttold.h.
+ * system.h: Unconditionally include limits.h. Never include
+ sys/file.h.
+ * info/termdep.h: Do not try to include sys/ttold.h.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Do not check for fcntl.h or sys/fcntl.h.
+
+ * configure.ac (AC_CHECK_HEADERS): Do not check for fcntl.h or
+ sys/fcntl.h.
+ * system.h: Include fcntl.h unconditionally.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove BSD signals support.
+
+ * configure.ac: Do not check for sigblock or sigsetmask.
+ * info/signals.c: Do not check HAVE_SIGSETMASK.
+ (sigprocmask): Remove this replacement function.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove AC_REPLACE_FUNCS.
+
+ * configure.ac: Remove AC_REPLACE_FUNCS. This has likely been
+ unused since gnulib was integrated into the sources.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove 'termio' support.
+
+ * configure.ac: Do not check for termio.h or sys/ptem.h.
+ * info/termdep.h, info/terminal.c:
+ Remove all code for when termios.h is not present.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove obsolete configure checks.
+
+ * configure.ac: Remove AC_HEADER_STAT, AC_HEADER_STDC,
+ AC_TYPE_SIGNAL, AC_C_CONST, AC_STRUCT_TM, AC_FUNC_VPRINTF.
+ Remove commented-out use of AC_FUNC_SETVBUF_REVERSED.
+
+ * info/signals.c, info/terminal.c: Remove use of RETSIGTYPE for
+ signal handlers.
+
+ Some of these are noted in the autoconf or gnulib manuals as
+ being unnecessary.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Remove customization value OUT.
+
+ * tp/Texinfo/Common.pm (@command_line_settables),
+ * doc/texinfo.texi (Customization Variables and Options):
+ Remove 'OUT'.
+ * tp/texi2any.pl: Do not use 'OUT' as a customization variable
+ and use 'OUTFILE' instead to check if the name of the output
+ file has been given.
+
+2019-02-17 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Re-use open file descriptor.
+
+ * info/t/Init-test.inc: Change a comment.
+ * info/t: All tests: Use a file descriptor that is already open
+ to pass bytes to pseudotty instead of opening the FIFO again
+ every time.
+
+2019-02-16 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * configure.ac: Bump version to 6.6dev.
+
2019-02-16 Gavin Smith <gavinsmith0123@gmail.com>
6.6.
diff --git a/macros/texinfo/texinfo/Makefile.in b/macros/texinfo/texinfo/Makefile.in
index b88f2cd2cf..99761223e5 100644
--- a/macros/texinfo/texinfo/Makefile.in
+++ b/macros/texinfo/texinfo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -225,7 +225,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = tp/Texinfo/ModulePath.pm pre-inst-env
+CONFIG_CLEAN_FILES = pre-inst-env
CONFIG_CLEAN_VPATH_FILES =
SCRIPTS = $(noinst_SCRIPTS)
AM_V_P = $(am__v_P_@AM_V@)
@@ -294,8 +294,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.in \
$(top_srcdir)/build-aux/install-sh \
$(top_srcdir)/build-aux/missing \
$(top_srcdir)/build-aux/pre-inst-env.in \
- $(top_srcdir)/build-aux/tap-driver.sh \
- $(top_srcdir)/tp/Texinfo/ModulePath.pm.in ABOUT-NLS AUTHORS \
+ $(top_srcdir)/build-aux/tap-driver.sh ABOUT-NLS AUTHORS \
COPYING ChangeLog INSTALL NEWS README TODO build-aux/ar-lib \
build-aux/compile build-aux/config.guess \
build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
@@ -398,6 +397,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -553,6 +553,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -620,11 +621,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -690,6 +693,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -710,6 +714,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -744,6 +749,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -758,6 +764,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -836,8 +843,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -853,14 +858,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -950,6 +954,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -983,6 +988,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -995,6 +1001,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1013,6 +1020,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1116,6 +1124,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1202,8 +1211,6 @@ $(srcdir)/config.in: $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-tp/Texinfo/ModulePath.pm: $(top_builddir)/config.status $(top_srcdir)/tp/Texinfo/ModulePath.pm.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
pre-inst-env: $(top_builddir)/config.status $(top_srcdir)/build-aux/pre-inst-env.in
cd $(top_builddir) && $(SHELL) ./config.status $@
diff --git a/macros/texinfo/texinfo/NEWS b/macros/texinfo/texinfo/NEWS
index b74a4b4e52..0186e4a20f 100644
--- a/macros/texinfo/texinfo/NEWS
+++ b/macros/texinfo/texinfo/NEWS
@@ -9,6 +9,44 @@ See the manual for detailed information.
------------------------------------------------------------------------------
+6.7 (23 September 2019)
+* Language:
+ . support of index subentries and sub-subentries with @subentry
+ . new commands @seeentry and @seealso in index entries
+ . no need to wrap Top node in @ifnottex - omitted automatically when
+ processed with TeX
+ . UTF-8 is the default input encoding
+
+* texi2any
+ . for HTML output, mark index nodes in menus and tables of contents
+ with the 'rel' attribute of the 'a' tag.
+ . TOP_NODE_UP is now only used in HTML if TOP_NODE_UP_URL is set.
+ Also TOP_NODE_UP should now be formatted in the output format.
+ In HTML TOP_NODE_UP should be suitable for inclusion in HTML
+ element attributes, so for instance should not contain elements.
+ . support of noderename.cnf files has been removed
+ . INPUT_PERL_ENCODING, INPUT_ENCODING_NAME, NODE_FILE_EXTENSION,
+ NODE_FILENAMES, SHORTEXTN and TOP_NODE_FILE removed as customization
+ variables.
+ . TOP_NODE_FILE_TARGET now contains the extension.
+ . error messages translated when the XS parser module is in use
+
+* texi2dvi
+ . unconditionally run in --batch mode, i.e. without stopping if there
+ is a TeX error
+ . keep on going after a TeX error if the index files changed
+ . with --tidy (or --build-dir), avoid reading index files from previous
+ runs where --tidy was not used
+
+* info
+ . for a tree search (with M-/), '}' and '{' work as well as 'M-}' and
+ 'M-{' to go through the results
+
+* Distribution:
+ . Several obsolete portability checks removed
+ . gettext 0.20.1, automake 1.16.1
+
+
6.6 (16 February 2019)
* Language:
. new commands @&, @ampchar{}
diff --git a/macros/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.in b/macros/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.in
index f8296e2772..a25863a6ae 100644
--- a/macros/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.in
+++ b/macros/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -498,6 +498,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -653,6 +654,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -720,11 +722,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -790,6 +794,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -810,6 +815,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -844,6 +850,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -858,6 +865,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -936,8 +944,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -953,14 +959,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1050,6 +1055,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1083,6 +1089,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1095,6 +1102,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1113,6 +1121,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1216,6 +1225,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/README-hacking b/macros/texinfo/texinfo/README-hacking
index a6062b2aa2..9b658086fb 100644
--- a/macros/texinfo/texinfo/README-hacking
+++ b/macros/texinfo/texinfo/README-hacking
@@ -26,8 +26,6 @@ and then, for example,
and then
make
-After the initial autogen && configure, simply running make should suffice.
-
The -C tells configure to cache test results, which usually speeds
things up a bit.
@@ -41,6 +39,17 @@ Other -W options can be useful too, and patches are welcome to resolve
diagnostics; however, removing all possible warning messages, or
warnings with nonfree compilers, is explicitly not a goal.
+After the initial autogen && configure, simply running make should suffice.
+
+Gettext or help2man not installed do not cause configure to fail,
+though configure shows if they were found. This is because a release
+does not require those tools. Indeed, both prerequisites and
+result files are shipped in a release, such that the tools are only
+needed if the prerequisite changed. The tools are needed when building
+from developpement sources, however, as result files are not under version
+control. Make will fail with an explicit missing command for help2man,
+and with a command not found error for a Gettext utility command.
+
Running make in one particular subdirectory is possible, for example
make -C info. However there are interdependencies between the
subdirectories, notably on gnulib, so if you don't want to run "make",
diff --git a/macros/texinfo/texinfo/aclocal.m4 b/macros/texinfo/texinfo/aclocal.m4
index 8f81852f55..011b57b042 100644
--- a/macros/texinfo/texinfo/aclocal.m4
+++ b/macros/texinfo/texinfo/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/macros/texinfo/texinfo/build-aux/texinfo.tex b/macros/texinfo/texinfo/build-aux/texinfo.tex
index 5e260ed8f9..af857cbbb0 100644
--- a/macros/texinfo/texinfo/build-aux/texinfo.tex
+++ b/macros/texinfo/texinfo/build-aux/texinfo.tex
@@ -3,12 +3,9 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2016-08-16.20}
+\def\texinfoversion{2019-09-20.22}
%
-% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
-% Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -21,7 +18,7 @@
% General Public License for more details.
%
% You should have received a copy of the GNU General Public License
-% along with this program. If not, see <http://www.gnu.org/licenses/>.
+% along with this program. If not, see <https://www.gnu.org/licenses/>.
%
% As a special exception, when this file is read by TeX when processing
% a Texinfo source document, you may use the result without
@@ -30,9 +27,9 @@
%
% Please try the latest version of texinfo.tex before submitting bug
% reports; you can get the latest version from:
-% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
-% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
-% http://www.gnu.org/software/texinfo/ (the Texinfo home page)
+% https://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
+% https://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
+% https://www.gnu.org/software/texinfo/ (the Texinfo home page)
% The texinfo.tex in any given distribution could well be out
% of date, so if that's what you're using, please check.
%
@@ -56,7 +53,7 @@
% extent. You can get the existing language-specific files from the
% full Texinfo distribution.
%
-% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
+% The GNU Texinfo home page is https://www.gnu.org/software/texinfo.
\message{Loading texinfo [version \texinfoversion]:}
@@ -165,6 +162,9 @@
% Give the space character the catcode for a space.
\def\spaceisspace{\catcode`\ =10\relax}
+% Likewise for ^^M, the end of line character.
+\def\endlineisspace{\catcode13=10\relax}
+
\chardef\dashChar = `\-
\chardef\slashChar = `\/
\chardef\underChar = `\_
@@ -241,17 +241,7 @@
%
\def\finalout{\overfullrule=0pt }
-% Do @cropmarks to get crop marks.
-%
-\newif\ifcropmarks
-\let\cropmarks = \cropmarkstrue
-%
-% Dimensions to add cropmarks at corners.
-% Added by P. A. MacKay, 12 Nov. 1986
-%
\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
-\newdimen\cornerlong \cornerlong=1pc
-\newdimen\cornerthick \cornerthick=.3pt
\newdimen\topandbottommargin \topandbottommargin=.75in
% Output a mark which sets \thischapter, \thissection and \thiscolor.
@@ -267,8 +257,8 @@
% \domark is called twice inside \chapmacro, to add one
% mark before the section break, and one after.
-% In the second call \prevchapterdefs is the same as \lastchapterdefs,
-% and \prevsectiondefs is the same as \lastsectiondefs.
+% In the second call \prevchapterdefs is the same as \currentchapterdefs,
+% and \prevsectiondefs is the same as \currentsectiondefs.
% Then if the page is not broken at the mark, some of the previous
% section appears on the page, and we can get the name of this section
% from \firstmark for @everyheadingmarks top.
@@ -276,11 +266,11 @@
%
% See page 260 of The TeXbook.
\def\domark{%
- \toks0=\expandafter{\lastchapterdefs}%
- \toks2=\expandafter{\lastsectiondefs}%
+ \toks0=\expandafter{\currentchapterdefs}%
+ \toks2=\expandafter{\currentsectiondefs}%
\toks4=\expandafter{\prevchapterdefs}%
\toks6=\expandafter{\prevsectiondefs}%
- \toks8=\expandafter{\lastcolordefs}%
+ \toks8=\expandafter{\currentcolordefs}%
\mark{%
\the\toks0 \the\toks2 % 0: marks for @everyheadingmarks top
\noexpand\or \the\toks4 \the\toks6 % 1: for @everyheadingmarks bottom
@@ -297,19 +287,19 @@
% @setcolor (or @url, or @link, etc.) between @contents and the very
% first @chapter.
\def\gettopheadingmarks{%
- \ifcase0\topmark\fi
+ \ifcase0\the\savedtopmark\fi
\ifx\thischapter\empty \ifcase0\firstmark\fi \fi
}
\def\getbottomheadingmarks{\ifcase1\botmark\fi}
-\def\getcolormarks{\ifcase2\topmark\fi}
+\def\getcolormarks{\ifcase2\the\savedtopmark\fi}
% Avoid "undefined control sequence" errors.
-\def\lastchapterdefs{}
-\def\lastsectiondefs{}
-\def\lastsection{}
+\def\currentchapterdefs{}
+\def\currentsectiondefs{}
+\def\currentsection{}
\def\prevchapterdefs{}
\def\prevsectiondefs{}
-\def\lastcolordefs{}
+\def\currentcolordefs{}
% Margin to add to right of even pages, to left of odd pages.
\newdimen\bindingoffset
@@ -319,39 +309,57 @@
% Main output routine.
%
\chardef\PAGE = 255
-\output = {\onepageout{\pagecontents\PAGE}}
+\newtoks\defaultoutput
+\defaultoutput = {\savetopmark\onepageout{\pagecontents\PAGE}}
+\output=\expandafter{\the\defaultoutput}
\newbox\headlinebox
\newbox\footlinebox
+% When outputting the double column layout for indices, an output routine
+% is run several times, which hides the original value of \topmark. This
+% can lead to a page heading being output and duplicating the chapter heading
+% of the index. Hence, save the contents of \topmark at the beginning of
+% the output routine. The saved contents are valid until we actually
+% \shipout a page.
+%
+% (We used to run a short output routine to actually set \topmark and
+% \firstmark to the right values, but if this was called with an empty page
+% containing whatsits for writing index entries, the whatsits would be thrown
+% away and the index auxiliary file would remain empty.)
+%
+\newtoks\savedtopmark
+\newif\iftopmarksaved
+\topmarksavedtrue
+\def\savetopmark{%
+ \iftopmarksaved\else
+ \global\savedtopmark=\expandafter{\topmark}%
+ \global\topmarksavedtrue
+ \fi
+}
+
% \onepageout takes a vbox as an argument.
-% \shipout a vbox for a single page, adding an optional header, footer,
-% cropmarks, and footnote. This also causes index entries for this page
-% to be written to the auxiliary files.
+% \shipout a vbox for a single page, adding an optional header, footer
+% and footnote. This also causes index entries for this page to be written
+% to the auxiliary files.
%
\def\onepageout#1{%
- \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
+ \hoffset=\normaloffset
%
\ifodd\pageno \advance\hoffset by \bindingoffset
\else \advance\hoffset by -\bindingoffset\fi
%
- % Common context changes for both heading and footing.
- % Do this outside of the \shipout so @code etc. will be expanded in
- % the headline as they should be, not taken literally (outputting ''code).
- \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
- %
% Retrieve the information for the headings from the marks in the page,
% and call Plain TeX's \makeheadline and \makefootline, which use the
% values in \headline and \footline.
%
% This is used to check if we are on the first page of a chapter.
- \ifcase1\topmark\fi
+ \ifcase1\the\savedtopmark\fi
\let\prevchaptername\thischaptername
\ifcase0\firstmark\fi
\let\curchaptername\thischaptername
%
\ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
- \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
%
\ifx\curchaptername\prevchaptername
\let\thischapterheading\thischapter
@@ -362,7 +370,14 @@
\def\thischapterheading{}%
\fi
%
+ % Common context changes for both heading and footing.
+ % Do this outside of the \shipout so @code etc. will be expanded in
+ % the headline as they should be, not taken literally (outputting ''code).
+ \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
+ %
\global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
+ %
+ \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
\global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}%
%
{%
@@ -371,37 +386,12 @@
% take effect in \write's, yet the group defined by the \vbox ends
% before the \shipout runs.
%
- \indexdummies % don't expand commands in the output.
- \normalturnoffactive % \ in index entries must not stay \, e.g., if
- % the page break happens to be in the middle of an example.
- % We don't want .vr (or whatever) entries like this:
- % \entry{{\indexbackslash }acronym}{32}{\code {\acronym}}
- % "\acronym" won't work when it's read back in;
- % it needs to be
- % {\code {{\backslashcurfont }acronym}
+ \atdummies % don't expand commands in the output.
+ \turnoffactive
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
\ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
%
- \ifcropmarks \vbox to \outervsize\bgroup
- \hsize = \outerhsize
- \vskip-\topandbottommargin
- \vtop to0pt{%
- \line{\ewtop\hfil\ewtop}%
- \nointerlineskip
- \line{%
- \vbox{\moveleft\cornerthick\nstop}%
- \hfill
- \vbox{\moveright\cornerthick\nstop}%
- }%
- \vss}%
- \vskip\topandbottommargin
- \line\bgroup
- \hfil % center the page within the outer (page) hsize.
- \ifodd\pageno\hskip\bindingoffset\fi
- \vbox\bgroup
- \fi
- %
\unvbox\headlinebox
\pagebody{#1}%
\ifdim\ht\footlinebox > 0pt
@@ -412,24 +402,9 @@
\unvbox\footlinebox
\fi
%
- \ifcropmarks
- \egroup % end of \vbox\bgroup
- \hfil\egroup % end of (centering) \line\bgroup
- \vskip\topandbottommargin plus1fill minus1fill
- \boxmaxdepth = \cornerthick
- \vbox to0pt{\vss
- \line{%
- \vbox{\moveleft\cornerthick\nsbot}%
- \hfill
- \vbox{\moveright\cornerthick\nsbot}%
- }%
- \nointerlineskip
- \line{\ewbot\hfil\ewbot}%
- }%
- \egroup % \vbox from first cropmarks clause
- \fi
- }% end of \shipout\vbox
- }% end of group with \indexdummies
+ }%
+ }%
+ \global\topmarksavedfalse
\advancepageno
\ifnum\outputpenalty>-20000 \else\dosupereject\fi
}
@@ -448,17 +423,6 @@
\ifr@ggedbottom \kern-\dimen@ \vfil \fi}
}
-% Here are the rules for the cropmarks. Note that they are
-% offset so that the space between them is truly \outerhsize or \outervsize
-% (P. A. MacKay, 12 November, 1986)
-%
-\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
-\def\nstop{\vbox
- {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
-\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
-\def\nsbot{\vbox
- {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
-
% Argument parsing
@@ -484,11 +448,10 @@
}%
}
-% First remove any @comment, then any @c comment. Also remove a @texinfoc
-% comment (see \scanmacro for details). Pass the result on to \argcheckspaces.
+% First remove any @comment, then any @c comment. Pass the result on to
+% \argcheckspaces.
\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
-\def\argremovec#1\c#2\ArgTerm{\argremovetexinfoc #1\texinfoc\ArgTerm}
-\def\argremovetexinfoc#1\texinfoc#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
+\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
%
@@ -862,36 +825,6 @@ where each line of input produces a line of output.}
\temp
}
-% @| inserts a changebar to the left of the current line. It should
-% surround any changed text. This approach does *not* work if the
-% change spans more than two lines of output. To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change). This command
-% is not documented, not supported, and doesn't work.
-%
-\def\|{%
- % \vadjust can only be used in horizontal mode.
- \leavevmode
- %
- % Append this vertical mode material after the current line in the output.
- \vadjust{%
- % We want to insert a rule with the height and depth of the current
- % leading; that is exactly what \strutbox is supposed to record.
- \vskip-\baselineskip
- %
- % \vadjust-items are inserted at the left edge of the type. So
- % the \llap here moves out into the left-hand margin.
- \llap{%
- %
- % For a thicker or thinner bar, change the `1pt'.
- \vrule height\baselineskip width1pt
- %
- % This is the space between the bar and the text.
- \hskip 12pt
- }%
- }%
-}
-
% @include FILE -- \input text of FILE.
%
\def\include{\parseargusing\filenamecatcodes\includezzz}
@@ -980,21 +913,14 @@ where each line of input produces a line of output.}
% @comment ...line which is ignored...
% @c is the same as @comment
% @ignore ... @end ignore is another way to write a comment
-%
-\def\comment{\begingroup \catcode`\^^M=\active%
-\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other\commentxxx}%
-{\catcode`\^^M=\active%
-\gdef\commentxxx#1^^M{\endgroup%
-\futurelet\nexttoken\commentxxxx}%
-\gdef\commentxxxx{\ifx\nexttoken\aftermacro\expandafter\comment\fi}%
-}
\def\c{\begingroup \catcode`\^^M=\active%
\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
\cxxx}
{\catcode`\^^M=\active \gdef\cxxx#1^^M{\endgroup}}
-% See comment in \scanmacro about why the definitions of @c and @comment differ
+%
+\let\comment\c
% @paragraphindent NCHARS
% We'll use ems for NCHARS, close enough.
@@ -1126,7 +1052,7 @@ where each line of input produces a line of output.}
tex.sprint(
string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o',
- (c / 256), (c % 256)))
+ math.floor(c / 256), math.floor(c % 256)))
else
c = c - 0x10000
local c_hi = c / 1024 + 0xd800
@@ -1136,8 +1062,8 @@ where each line of input produces a line of output.}
string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o',
- (c_hi / 256), (c_hi % 256),
- (c_lo / 256), (c_lo % 256)))
+ math.floor(c_hi / 256), math.floor(c_hi % 256),
+ math.floor(c_lo / 256), math.floor(c_lo % 256)))
end
end
end
@@ -1150,15 +1076,19 @@ where each line of input produces a line of output.}
function PDFescstr(str)
for c in string.bytes(str) do
if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then
- tex.sprint(
+ tex.sprint(-2,
string.format(string.char(0x5c) .. string.char(0x25) .. '03o',
c))
else
- tex.sprint(string.char(c))
+ tex.sprint(-2, string.char(c))
end
end
end
}
+ % The -2 in the arguments here gives all the input to TeX catcode 12
+ % (other) or 10 (space), preventing undefined control sequence errors. See
+ % https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html
+ %
\endgroup
\def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}}
\ifnum\luatexversion>84
@@ -1197,6 +1127,16 @@ where each line of input produces a line of output.}
\fi
\fi
+\newif\ifpdforxetex
+\pdforxetexfalse
+\ifpdf
+ \pdforxetextrue
+\fi
+\ifx\XeTeXrevision\thisisundefined\else
+ \pdforxetextrue
+\fi
+
+
% PDF uses PostScript string constants for the names of xref targets,
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
@@ -1253,7 +1193,7 @@ output) for that.)}
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
\def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
\domark
\pdfsetcolor{#1}%
}
@@ -1261,7 +1201,7 @@ output) for that.)}
\def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
+ \def\currentcolordefs{}
%
\def\makefootline{%
\baselineskip24pt
@@ -1562,6 +1502,9 @@ output) for that.)}
\startlink attr{/Border [0 0 0]}%
user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
\endgroup}
+ % \pdfgettoks - Surround page numbers in #1 with @pdflink. #1 may
+ % be a simple number, or a list of numbers in the case of an index
+ % entry.
\def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
\def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
@@ -1636,7 +1579,7 @@ output) for that.)}
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
\def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
\domark
\pdfsetcolor{#1}%
}
@@ -1644,7 +1587,7 @@ output) for that.)}
\def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
+ \def\currentcolordefs{}
%
\def\makefootline{%
\baselineskip24pt
@@ -1885,40 +1828,9 @@ output) for that.)}
}
\fi
-\message{fonts,}
-
-% Change the current font style to #1, remembering it in \curfontstyle.
-% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
-% italics, not bold italics.
-%
-\def\setfontstyle#1{%
- \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
- \csname ten#1\endcsname % change the current font
-}
-% Select #1 fonts with the current style.
%
-\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
-
-\def\rm{\fam=0 \setfontstyle{rm}}
-\def\it{\fam=\itfam \setfontstyle{it}}
-\def\sl{\fam=\slfam \setfontstyle{sl}}
-\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
-\def\tt{\fam=\ttfam \setfontstyle{tt}}
-
-% Unfortunately, we have to override this for titles and the like, since
-% in those cases "rm" is bold. Sigh.
-\def\rmisbold{\rm\def\curfontstyle{bf}}
-
-% Texinfo sort of supports the sans serif font style, which plain TeX does not.
-% So we set up a \sf.
-\newfam\sffam
-\def\sf{\fam=\sffam \setfontstyle{sf}}
-\let\li = \sf % Sometimes we call it \li, not \sf.
-
-% We don't need math for this font style.
-\def\ttsl{\setfontstyle{ttsl}}
-
+\message{fonts,}
% Set the baselineskip to #1, and the lineskip and strut size
% correspondingly. There is no deep meaning behind these magic numbers
@@ -2267,10 +2179,10 @@ end
% A few fonts for @defun names and args.
\setfont\defbf\bfshape{10}{\magstep1}{OT1}
\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
-\setfont\defsl\slshape{10}{\magstep1}{OT1TT}
+\setfont\defsl\slshape{10}{\magstep1}{OT1}
\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf
-\let\tenttsl=\defttsl \let\tensl=\defsl \bf}
+\def\df{\let\ttfont=\deftt \let\bffont = \defbf
+\let\ttslfont=\defttsl \let\slfont=\defsl \bf}
% Fonts for indices, footnotes, small examples (9pt).
\def\smallnominalsize{9pt}
@@ -2300,6 +2212,20 @@ end
\font\smallersy=cmsy8
\def\smallerecsize{0800}
+% Fonts for math mode superscripts (7pt).
+\def\sevennominalsize{7pt}
+\setfont\sevenrm\rmshape{7}{1000}{OT1}
+\setfont\seventt\ttshape{10}{700}{OT1TT}
+\setfont\sevenbf\bfshape{10}{700}{OT1}
+\setfont\sevenit\itshape{7}{1000}{OT1IT}
+\setfont\sevensl\slshape{10}{700}{OT1}
+\setfont\sevensf\sfshape{10}{700}{OT1}
+\setfont\sevensc\scshape{10}{700}{OT1}
+\setfont\seventtsl\ttslshape{10}{700}{OT1TT}
+\font\seveni=cmmi7
+\font\sevensy=cmsy7
+\def\sevenecsize{0700}
+
% Fonts for title page (20.4pt):
\def\titlenominalsize{20pt}
\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
@@ -2357,7 +2283,7 @@ end
\font\ssecsy=cmsy10 scaled 1315
\def\ssececsize{1200}
-% Reduced fonts for @acro in text (10pt).
+% Reduced fonts for @acronym in text (10pt).
\def\reducednominalsize{10pt}
\setfont\reducedrm\rmshape{10}{1000}{OT1}
\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
@@ -2401,10 +2327,10 @@ end
% A few fonts for @defun names and args.
\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
-\setfont\defsl\slshape{10}{\magstephalf}{OT1TT}
+\setfont\defsl\slshape{10}{\magstephalf}{OT1}
\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf
-\let\tensl=\defsl \let\tenttsl=\defttsl \bf}
+\def\df{\let\ttfont=\deftt \let\bffont = \defbf
+\let\slfont=\defsl \let\ttslfont=\defttsl \bf}
% Fonts for indices, footnotes, small examples (9pt).
\def\smallnominalsize{9pt}
@@ -2434,6 +2360,20 @@ end
\font\smallersy=cmsy8
\def\smallerecsize{0800}
+% Fonts for math mode superscripts (7pt).
+\def\sevennominalsize{7pt}
+\setfont\sevenrm\rmshape{7}{1000}{OT1}
+\setfont\seventt\ttshape{10}{700}{OT1TT}
+\setfont\sevenbf\bfshape{10}{700}{OT1}
+\setfont\sevenit\itshape{7}{1000}{OT1IT}
+\setfont\sevensl\slshape{10}{700}{OT1}
+\setfont\sevensf\sfshape{10}{700}{OT1}
+\setfont\sevensc\scshape{10}{700}{OT1}
+\setfont\seventtsl\ttslshape{10}{700}{OT1TT}
+\font\seveni=cmmi7
+\font\sevensy=cmsy7
+\def\sevenecsize{0700}
+
% Fonts for title page (20.4pt):
\def\titlenominalsize{20pt}
\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
@@ -2490,7 +2430,7 @@ end
\font\ssecsy=cmsy10
\def\ssececsize{1000}
-% Reduced fonts for @acro in text (9pt).
+% Reduced fonts for @acronym in text (9pt).
\def\reducednominalsize{9pt}
\setfont\reducedrm\rmshape{9}{1000}{OT1}
\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
@@ -2510,6 +2450,12 @@ end
\rm
} % end of 10pt text font size definitions, \definetextfontsizex
+% Fonts for short table of contents.
+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
+\setfont\shortcontsl\slshape{12}{1000}{OT1}
+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
+
% We provide the user-level command
% @fonttextsize 10
@@ -2536,20 +2482,57 @@ end
\endgroup
}
+%
+% Change the current font style to #1, remembering it in \curfontstyle.
+% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
+% italics, not bold italics.
+%
+\def\setfontstyle#1{%
+ \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
+ \csname #1font\endcsname % change the current font
+}
+
+\def\rm{\fam=0 \setfontstyle{rm}}
+\def\it{\fam=\itfam \setfontstyle{it}}
+\def\sl{\fam=\slfam \setfontstyle{sl}}
+\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
+\def\tt{\fam=\ttfam \setfontstyle{tt}}
+
+% Texinfo sort of supports the sans serif font style, which plain TeX does not.
+% So we set up a \sf.
+\newfam\sffam
+\def\sf{\fam=\sffam \setfontstyle{sf}}
+
+% We don't need math for this font style.
+\def\ttsl{\setfontstyle{ttsl}}
+
+
% In order for the font changes to affect most math symbols and letters,
-% we have to define the \textfont of the standard families. We don't
-% bother to reset \scriptfont and \scriptscriptfont; awaiting user need.
+% we have to define the \textfont of the standard families.
+% We don't bother to reset \scriptscriptfont; awaiting user need.
%
\def\resetmathfonts{%
- \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
- \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
- \textfont\ttfam=\tentt \textfont\sffam=\tensf
+ \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont
+ \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont
+ \textfont\ttfam=\ttfont \textfont\sffam=\sffont
+ %
+ % Fonts for superscript. Note that the 7pt fonts are used regardless
+ % of the current font size.
+ \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy
+ \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl
+ \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt
+ \scriptfont\sffam=\sevensf
}
-% The font-changing commands redefine the meanings of \tenSTYLE, instead
-% of just \STYLE. We do this because \STYLE needs to also set the
-% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire
-% \tenSTYLE to set the current font.
+%
+
+% The font-changing commands (all called \...fonts) redefine the meanings
+% of \STYLEfont, instead of just \STYLE. We do this because \STYLE needs
+% to also set the current \fam for math mode. Our \STYLE (e.g., \rm)
+% commands hardwire \STYLEfont to set the current font.
+%
+% The fonts used for \ifont are for "math italics" (\itfont is for italics
+% in regular text). \syfont is also used in math mode only.
%
% Each font-changing command also sets the names \lsize (one size lower)
% and \lllsize (three sizes lower). These relative commands are used
@@ -2557,78 +2540,63 @@ end
%
% This all needs generalizing, badly.
%
-\def\textfonts{%
- \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
- \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
- \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
- \let\tenttsl=\textttsl
- \def\curfontsize{text}%
- \def\lsize{reduced}\def\lllsize{smaller}%
- \resetmathfonts \setleading{\textleading}}
-\def\titlefonts{%
- \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
- \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
- \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
- \let\tenttsl=\titlettsl
- \def\curfontsize{title}%
- \def\lsize{chap}\def\lllsize{subsec}%
- \resetmathfonts \setleading{27pt}}
-\def\titlefont#1{{\titlefonts\rmisbold #1}}
-\def\chapfonts{%
- \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
- \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
- \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
- \let\tenttsl=\chapttsl
- \def\curfontsize{chap}%
- \def\lsize{sec}\def\lllsize{text}%
- \resetmathfonts \setleading{19pt}}
-\def\secfonts{%
- \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
- \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
- \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
- \let\tenttsl=\secttsl
- \def\curfontsize{sec}%
- \def\lsize{subsec}\def\lllsize{reduced}%
- \resetmathfonts \setleading{17pt}}
-\def\subsecfonts{%
- \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
- \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
- \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
- \let\tenttsl=\ssecttsl
- \def\curfontsize{ssec}%
- \def\lsize{text}\def\lllsize{small}%
- \resetmathfonts \setleading{15pt}}
-\let\subsubsecfonts = \subsecfonts
-\def\reducedfonts{%
- \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
- \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
- \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
- \let\tenttsl=\reducedttsl
- \def\curfontsize{reduced}%
- \def\lsize{small}\def\lllsize{smaller}%
- \resetmathfonts \setleading{10.5pt}}
-\def\smallfonts{%
- \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
- \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
- \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
- \let\tenttsl=\smallttsl
- \def\curfontsize{small}%
- \def\lsize{smaller}\def\lllsize{smaller}%
- \resetmathfonts \setleading{10.5pt}}
-\def\smallerfonts{%
- \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
- \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
- \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
- \let\tenttsl=\smallerttsl
- \def\curfontsize{smaller}%
- \def\lsize{smaller}\def\lllsize{smaller}%
- \resetmathfonts \setleading{9.5pt}}
-% Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}{OT1}
-\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
-\setfont\shortcontsl\slshape{12}{1000}{OT1}
-\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
+\def\assignfonts#1{%
+ \expandafter\let\expandafter\rmfont\csname #1rm\endcsname
+ \expandafter\let\expandafter\itfont\csname #1it\endcsname
+ \expandafter\let\expandafter\slfont\csname #1sl\endcsname
+ \expandafter\let\expandafter\bffont\csname #1bf\endcsname
+ \expandafter\let\expandafter\ttfont\csname #1tt\endcsname
+ \expandafter\let\expandafter\smallcaps\csname #1sc\endcsname
+ \expandafter\let\expandafter\sffont \csname #1sf\endcsname
+ \expandafter\let\expandafter\ifont \csname #1i\endcsname
+ \expandafter\let\expandafter\syfont \csname #1sy\endcsname
+ \expandafter\let\expandafter\ttslfont\csname #1ttsl\endcsname
+}
+
+\newif\ifrmisbold
+
+% Select smaller font size with the current style. Used to change font size
+% in, e.g., the LaTeX logo and acronyms. If we are using bold fonts for
+% normal roman text, also use bold fonts for roman text in the smaller size.
+\def\switchtolllsize{%
+ \expandafter\assignfonts\expandafter{\lllsize}%
+ \ifrmisbold
+ \let\rmfont\bffont
+ \fi
+ \csname\curfontstyle\endcsname
+}%
+
+\def\switchtolsize{%
+ \expandafter\assignfonts\expandafter{\lsize}%
+ \ifrmisbold
+ \let\rmfont\bffont
+ \fi
+ \csname\curfontstyle\endcsname
+}%
+
+\def\definefontsetatsize#1#2#3#4#5{%
+\expandafter\def\csname #1fonts\endcsname{%
+ \def\curfontsize{#1}%
+ \def\lsize{#2}\def\lllsize{#3}%
+ \csname rmisbold#5\endcsname
+ \assignfonts{#1}%
+ \resetmathfonts
+ \setleading{#4}%
+}}
+
+\definefontsetatsize{text} {reduced}{smaller}{\textleading}{false}
+\definefontsetatsize{title} {chap} {subsec} {27pt} {true}
+\definefontsetatsize{chap} {sec} {text} {19pt} {true}
+\definefontsetatsize{sec} {subsec} {reduced}{17pt} {true}
+\definefontsetatsize{ssec} {text} {small} {15pt} {true}
+\definefontsetatsize{reduced}{small} {smaller}{10.5pt}{false}
+\definefontsetatsize{small} {smaller}{smaller}{10.5pt}{false}
+\definefontsetatsize{smaller}{smaller}{smaller}{9.5pt} {false}
+
+\def\titlefont#1{{\titlefonts\rm #1}}
+\let\subsecfonts = \ssecfonts
+\let\subsubsecfonts = \ssecfonts
% Define these just so they can be easily changed for other fonts.
\def\angleleft{$\langle$}
@@ -2666,26 +2634,11 @@ end
% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
% define and register \INITMACRO to be called on markup style changes.
% \INITMACRO can check \currentmarkupstyle for the innermost
-% style and the set of \ifmarkupSTYLE switches for all styles
-% currently in effect.
-\newif\ifmarkupvar
-\newif\ifmarkupsamp
-\newif\ifmarkupkey
-%\newif\ifmarkupfile % @file == @samp.
-%\newif\ifmarkupoption % @option == @samp.
-\newif\ifmarkupcode
-\newif\ifmarkupkbd
-%\newif\ifmarkupenv % @env == @code.
-%\newif\ifmarkupcommand % @command == @code.
-\newif\ifmarkuptex % @tex (and part of @math, for now).
-\newif\ifmarkupexample
-\newif\ifmarkupverb
-\newif\ifmarkupverbatim
+% style.
\let\currentmarkupstyle\empty
\def\setupmarkupstyle#1{%
- \csname markup#1true\endcsname
\def\currentmarkupstyle{#1}%
\markupstylesetup
}
@@ -2747,11 +2700,15 @@ end
% lilypond developers report. xpdf does work with the regular 0x27.
%
\def\codequoteright{%
- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
- '%
+ \ifmonospace
+ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+ '%
+ \else \char'15 \fi
\else \char'15 \fi
- \else \char'15 \fi
+ \else
+ '%
+ \fi
}
%
% and a similar option for the left quote char vs. a grave accent.
@@ -2759,13 +2716,17 @@ end
% the code environments to do likewise.
%
\def\codequoteleft{%
- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
- % [Knuth] pp. 380,381,391
- % \relax disables Spanish ligatures ?` and !` of \tt font.
- \relax`%
+ \ifmonospace
+ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+ % [Knuth] pp. 380,381,391
+ % \relax disables Spanish ligatures ?` and !` of \tt font.
+ \relax`%
+ \else \char'22 \fi
\else \char'22 \fi
- \else \char'22 \fi
+ \else
+ \relax`%
+ \fi
}
% Commands to set the quote options.
@@ -2889,7 +2850,7 @@ end
% @t, explicit typewriter.
\def\t#1{%
- {\tt \rawbackslash \plainfrenchspacing #1}%
+ {\tt \plainfrenchspacing #1}%
\null
}
@@ -2916,7 +2877,6 @@ end
% Turn off hyphenation.
\nohyphenation
%
- \rawbackslash
\plainfrenchspacing
#1%
}%
@@ -3103,41 +3063,33 @@ end
\global\def/{\normalslash}
}
-% we put a little stretch before and after the breakable chars, to help
-% line breaking of long url's. The unequal skips make look better in
-% cmtt at least, especially for dots.
-\def\urefprestretchamount{.13em}
-\def\urefpoststretchamount{.1em}
-\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax}
-\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax}
-%
-\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
-\def\urefcodedot{\urefprestretch .\urefpoststretch}
-\def\urefcodehash{\urefprestretch \#\urefpoststretch}
-\def\urefcodequest{\urefprestretch ?\urefpoststretch}
+\def\urefcodeamp{\urefprebreak \&\urefpostbreak}
+\def\urefcodedot{\urefprebreak .\urefpostbreak}
+\def\urefcodehash{\urefprebreak \#\urefpostbreak}
+\def\urefcodequest{\urefprebreak ?\urefpostbreak}
\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
{
\catcode`\/=\active
\global\def\urefcodeslashfinish{%
- \urefprestretch \slashChar
+ \urefprebreak \slashChar
% Allow line break only after the final / in a sequence of
% slashes, to avoid line break between the slashes in http://.
- \ifx\next/\else \urefpoststretch \fi
+ \ifx\next/\else \urefpostbreak \fi
}
}
-% One more complication: by default we'll break after the special
-% characters, but some people like to break before the special chars, so
-% allow that. Also allow no breaking at all, for manual control.
+% By default we'll break after the special characters, but some people like to
+% break before the special chars, so allow that. Also allow no breaking at
+% all, for manual control.
%
\parseargdef\urefbreakstyle{%
\def\txiarg{#1}%
\ifx\txiarg\wordnone
\def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
\else\ifx\txiarg\wordbefore
- \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
+ \def\urefprebreak{\urefallowbreak}\def\urefpostbreak{\nobreak}
\else\ifx\txiarg\wordafter
- \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
+ \def\urefprebreak{\nobreak}\def\urefpostbreak{\urefallowbreak}
\else
\errhelp = \EMsimple
\errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
@@ -3147,6 +3099,14 @@ end
\def\wordbefore{before}
\def\wordnone{none}
+% Allow a ragged right output to aid breaking long URL's. Putting stretch in
+% between characters of the URL doesn't look good.
+\def\urefallowbreak{%
+ \hskip 0pt plus 4 em\relax
+ \allowbreak
+ \hskip 0pt plus -4 em\relax
+}
+
\urefbreakstyle after
% @url synonym for @uref, since that's how everyone uses it.
@@ -3157,7 +3117,7 @@ end
% So now @email is just like @uref, unless we are pdf.
%
%\def\email#1{\angleleft{\tt #1}\angleright}
-\ifpdf
+\ifpdforxetex
\def\email#1{\doemail#1,,\finish}
\def\doemail#1,#2,#3\finish{\begingroup
\unsepspaces
@@ -3167,18 +3127,7 @@ end
\endlink
\endgroup}
\else
- \ifx\XeTeXrevision\thisisundefined
- \let\email=\uref
- \else
- \def\email#1{\doemail#1,,\finish}
- \def\doemail#1,#2,#3\finish{\begingroup
- \unsepspaces
- \pdfurl{mailto:#1}%
- \setbox0 = \hbox{\ignorespaces #2}%
- \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
- \endlink
- \endgroup}
- \fi
+ \let\email=\uref
\fi
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
@@ -3253,7 +3202,7 @@ end
%
\def\acronym#1{\doacronym #1,,\finish}
\def\doacronym#1,#2,#3\finish{%
- {\selectfonts\lsize #1}%
+ {\switchtolsize #1}%
\def\temp{#2}%
\ifx\temp\empty \else
\space ({\unsepspaces \ignorespaces \temp \unskip})%
@@ -3346,10 +3295,10 @@ end
% fix it (significant additions to font machinery) until someone notices.
%
\def\sub{\ifmmode \expandafter\sb \else \expandafter\finishsub\fi}
-\def\finishsub#1{$\sb{\hbox{\selectfonts\lllsize #1}}$}%
+\def\finishsub#1{$\sb{\hbox{\switchtolllsize #1}}$}%
%
\def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi}
-\def\finishsup#1{$\ptexsp{\hbox{\selectfonts\lllsize #1}}$}%
+\def\finishsup#1{$\ptexsp{\hbox{\switchtolllsize #1}}$}%
% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
@@ -3434,8 +3383,8 @@ end
% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
\def\questiondown{?`}
\def\exclamdown{!`}
-\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
-\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
+\def\ordf{\leavevmode\raise1ex\hbox{\switchtolllsize \underbar{a}}}
+\def\ordm{\leavevmode\raise1ex\hbox{\switchtolllsize \underbar{o}}}
% Dotless i and dotless j, used for accents.
\def\imacro{i}
@@ -3464,12 +3413,12 @@ end
{\setbox0=\hbox{T}%
\vbox to \ht0{\hbox{%
\ifx\textnominalsize\xwordpt
- % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX.
+ % for 10pt running text, lllsize (8pt) is too small for the A in LaTeX.
% Revert to plain's \scriptsize, which is 7pt.
\count255=\the\fam $\fam\count255 \scriptstyle A$%
\else
% For 11pt, we can use our lllsize.
- \selectfonts\lllsize A%
+ \switchtolllsize A%
\fi
}%
\vss
@@ -3535,7 +3484,7 @@ end
%
\newbox\errorbox
%
-{\tentt \global\dimen0 = 3em}% Width of the box.
+{\ttfont \global\dimen0 = 3em}% Width of the box.
\dimen2 = .55pt % Thickness of rules
% The text. (`r' is open on the right, `e' somewhat less so on the left.)
\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt}
@@ -3686,7 +3635,7 @@ end
% Adapted from the plain.tex definition of \copyright.
%
\def\registeredsymbol{%
- $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
+ $^{{\ooalign{\hfil\raise.07ex\hbox{\switchtolllsize R}%
\hfil\crcr\Orb}}%
}$%
}
@@ -3780,12 +3729,11 @@ end
% Settings used for typesetting titles: no hyphenation, no indentation,
% don't worry much about spacing, ragged right. This should be used
-% inside a \vbox, and fonts need to be set appropriately first. Because
-% it is always used for titles, nothing else, we call \rmisbold. \par
-% should be specified before the end of the \vbox, since a vbox is a group.
+% inside a \vbox, and fonts need to be set appropriately first. \par should
+% be specified before the end of the \vbox, since a vbox is a group.
%
\def\raggedtitlesettings{%
- \rmisbold
+ \rm
\hyphenpenalty=10000
\parindent=0pt
\tolerance=5000
@@ -3794,7 +3742,7 @@ end
% Macros to be used within @titlepage:
-\let\subtitlerm=\tenrm
+\let\subtitlerm=\rmfont
\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
\parseargdef\title{%
@@ -3820,7 +3768,7 @@ end
\else
\checkenv\titlepage
\ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
- {\secfonts\rmisbold \leftline{#1}}%
+ {\secfonts\rm \leftline{#1}}%
\fi
}
@@ -4713,19 +4661,6 @@ end
}
}
-% We have this subroutine so that we can handle at least some @value's
-% properly in indexes (we call \makevalueexpandable in \indexdummies).
-% The command has to be fully expandable (if the variable is set), since
-% the result winds up in the index file. This means that if the
-% variable's value contains other Texinfo commands, it's almost certain
-% it will fail (although perhaps we could fix that with sufficient work
-% to do a one-level expansion on the result, instead of complete).
-%
-% Unfortunately, this has the consequence that when _ is in the *value*
-% of an @set, it does not print properly in the roman fonts (get the cmr
-% dot accent at position 126 instead). No fix comes to mind, and it's
-% been this way since 2003 or earlier, so just ignore it.
-%
\def\expandablevalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
{[No value for ``#1'']}%
@@ -4744,7 +4679,7 @@ end
% NB flag names containing - or _ may not work here.
\def\dummyvalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
- \noexpand\value{#1}%
+ \string\value{#1}%
\else
\csname SET#1\endcsname
\fi
@@ -4754,7 +4689,7 @@ end
% if possible, otherwise sort late.
\def\indexnofontsvalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
- ZZZZZZZ
+ ZZZZZZZ%
\else
\csname SET#1\endcsname
\fi
@@ -4904,29 +4839,15 @@ end
\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
-% Used when writing an index entry out to an index file to prevent
-% expansion of Texinfo commands that can appear in an index entry.
-%
-\def\indexdummies{%
- \escapechar = `\\ % use backslash in output files.
- \definedummyletter\@%
- \definedummyletter\ %
- %
- % For texindex which always views { and } as separators.
- \def\{{\lbracechar{}}%
- \def\}{\rbracechar{}}%
- %
- % Do the redefinitions.
- \definedummies
-}
-
-% Used for the aux and toc files, where @ is the escape character.
+% Used for the aux, toc and index files to prevent expansion of Texinfo
+% commands.
%
\def\atdummies{%
\definedummyletter\@%
\definedummyletter\ %
\definedummyletter\{%
\definedummyletter\}%
+ \definedummyletter\&%
%
% Do the redefinitions.
\definedummies
@@ -4950,8 +4871,7 @@ end
\def\definedummyletter#1{\def#1{\string#1}}%
\let\definedummyaccent\definedummyletter
-% Called from \indexdummies and \atdummies, to effectively prevent
-% the expansion of commands.
+% Called from \atdummies to prevent the expansion of commands.
%
\def\definedummies{%
%
@@ -4998,8 +4918,10 @@ end
\definedummyword\TeX
%
% Assorted special characters.
+ \definedummyword\ampchar
\definedummyword\atchar
\definedummyword\arrow
+ \definedummyword\backslashchar
\definedummyword\bullet
\definedummyword\comma
\definedummyword\copyright
@@ -5036,6 +4958,8 @@ end
\definedummyword\sup
\definedummyword\textdegree
%
+ \definedummyword\subentry
+ %
% We want to disable all macros so that they are not expanded by \write.
\macrolist
\let\value\dummyvalue
@@ -5116,11 +5040,10 @@ end
\commondummyword\xref
}
-% For testing: output @{ and @} in index sort strings as \{ and \}.
-\newif\ifusebracesinindexes
-
\let\indexlbrace\relax
\let\indexrbrace\relax
+\let\indexatchar\relax
+\let\indexbackslash\relax
{\catcode`\@=0
\catcode`\\=13
@@ -5154,10 +5077,8 @@ end
}
\gdef\indexnonalnumreappear{%
- \useindexbackslash
\let-\normaldash
\let<\normalless
- \def\@{@}%
}
}
@@ -5268,36 +5189,16 @@ end
-\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
-
-% Most index entries go through here, but \dosubind is the general case.
% #1 is the index name, #2 is the entry text.
-\def\doind#1#2{\dosubind{#1}{#2}{}}
-
-% There is also \dosubind {index}{topic}{subtopic}
-% which makes an entry in a two-level index such as the operation index.
-% TODO: Two-level index? Operation index?
-
-% Workhorse for all indexes.
-% #1 is name of index, #2 is stuff to put there, #3 is subentry --
-% empty if called from \doind, as we usually are (the main exception
-% is with most defuns, which call us directly).
-%
-\def\dosubind#1#2#3{%
+\def\doind#1#2{%
\iflinks
{%
- \requireopenindexfile{#1}%
- % Store the main index entry text (including the third arg).
- \toks0 = {#2}%
- % If third arg is present, precede it with a space.
- \def\thirdarg{#3}%
- \ifx\thirdarg\empty \else
- \toks0 = \expandafter{\the\toks0 \space #3}%
- \fi
%
+ \requireopenindexfile{#1}%
\edef\writeto{\csname#1indfile\endcsname}%
%
- \safewhatsit\dosubindwrite
+ \def\indextext{#2}%
+ \safewhatsit\doindwrite
}%
\fi
}
@@ -5319,21 +5220,7 @@ end
\fi}
\def\indexisfl{fl}
-% Output \ as {\indexbackslash}, because \ is an escape character in
-% the index files.
-\let\indexbackslash=\relax
-{\catcode`\@=0 \catcode`\\=\active
- @gdef@useindexbackslash{@def\{{@indexbackslash}}}
-}
-
-% Definition for writing index entry text.
-\def\sortas#1{\ignorespaces}%
-
-% Definition for writing index entry sort key. Should occur at the at
-% the beginning of the index entry, like
-% @cindex @sortas{september} \september
-% The \ignorespaces takes care of following space, but there's no way
-% to remove space before it.
+% Definition for writing index entry sort key.
{
\catcode`\-=13
\gdef\indexwritesortas{%
@@ -5344,51 +5231,150 @@ end
\xdef\indexsortkey{#1}\endgroup}
}
+\def\indexwriteseealso#1{
+ \gdef\pagenumbertext{\string\seealso{#1}}%
+}
+\def\indexwriteseeentry#1{
+ \gdef\pagenumbertext{\string\seeentry{#1}}%
+}
+
+% The default definitions
+\def\sortas#1{}%
+\def\seealso#1{\i{\putwordSeeAlso}\ #1}% for sorted index file only
+\def\putwordSeeAlso{See also}
+\def\seeentry#1{\i{\putwordSee}\ #1}% for sorted index file only
+
+
+% Given index entry text like "aaa @subentry bbb @sortas{ZZZ}":
+% * Set \bracedtext to "{aaa}{bbb}"
+% * Set \fullindexsortkey to "aaa @subentry ZZZ"
+% * If @seealso occurs, set \pagenumbertext
+%
+\def\splitindexentry#1{%
+ \gdef\fullindexsortkey{}%
+ \xdef\bracedtext{}%
+ \def\sep{}%
+ \def\seealso##1{}%
+ \def\seeentry##1{}%
+ \expandafter\doindexsegment#1\subentry\finish\subentry
+}
+
+% append the results from the next segment
+\def\doindexsegment#1\subentry{%
+ \def\segment{#1}%
+ \ifx\segment\isfinish
+ \else
+ %
+ % Fully expand the segment, throwing away any @sortas directives, and
+ % trim spaces.
+ \edef\trimmed{\segment}%
+ \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+ %
+ \xdef\bracedtext{\bracedtext{\trimmed}}%
+ %
+ % Get the string to sort by. Process the segment with all
+ % font commands turned off.
+ \bgroup
+ \let\sortas\indexwritesortas
+ \let\seealso\indexwriteseealso
+ \let\seeentry\indexwriteseeentry
+ \indexnofonts
+ % The braces around the commands are recognized by texindex.
+ \def\lbracechar{{\string\indexlbrace}}%
+ \def\rbracechar{{\string\indexrbrace}}%
+ \let\{=\lbracechar
+ \let\}=\rbracechar
+ \def\@{{\string\indexatchar}}%
+ \def\atchar##1{\@}%
+ \def\backslashchar{{\string\indexbackslash}}%
+ \uccode`\~=`\\ \uppercase{\let~\backslashchar}%
+ %
+ \let\indexsortkey\empty
+ \global\let\pagenumbertext\empty
+ % Execute the segment and throw away the typeset output. This executes
+ % any @sortas or @seealso commands in this segment.
+ \setbox\dummybox = \hbox{\segment}%
+ \ifx\indexsortkey\empty{%
+ \indexnonalnumdisappear
+ \xdef\trimmed{\segment}%
+ \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+ \xdef\indexsortkey{\trimmed}%
+ \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
+ }\fi
+ %
+ % Append to \fullindexsortkey.
+ \edef\tmp{\gdef\noexpand\fullindexsortkey{%
+ \fullindexsortkey\sep\indexsortkey}}%
+ \tmp
+ \egroup
+ \def\sep{\subentry}%
+ %
+ \expandafter\doindexsegment
+ \fi
+}
+\def\isfinish{\finish}%
+\newbox\dummybox % used above
+
+\let\subentry\relax
+
+% Use \ instead of @ in index files. To support old texi2dvi and texindex.
+% This works without changing the escape character used in the toc or aux
+% files because the index entries are fully expanded here, and \string uses
+% the current value of \escapechar.
+\def\escapeisbackslash{\escapechar=`\\}
-% Write the entry in \toks0 to the index file.
+% Use \ in index files by default. texi2dvi didn't support @ as the escape
+% character (as it checked for "\entry" in the files, and not "@entry"). When
+% the new version of texi2dvi has had a chance to become more prevalent, then
+% the escape character can change back to @ again. This should be an easy
+% change to make now because both @ and \ are only used as escape characters in
+% index files, never standing for themselves.
%
-\def\dosubindwrite{%
- % Put the index entry in the margin if desired.
- \ifx\SETmarginindex\relax\else
- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
+\set txiindexescapeisbackslash
+
+% Write the entry in \indextext to the index file.
+%
+\def\doindwrite{%
+ \maybemarginindex
+ %
+ \atdummies
+ %
+ \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else
+ \escapeisbackslash
\fi
%
- % Remember, we are within a group.
- \indexdummies % Must do this here, since \bf, etc expand at this stage
- \useindexbackslash % \indexbackslash isn't defined now so it will be output
- % as is; and it will print as backslash.
- % The braces around \indexbrace are recognized by texindex.
- %
- % Get the string to sort by, by processing the index entry with all
- % font commands turned off.
- {\indexnofonts
- \def\lbracechar{{\indexlbrace}}%
- \def\rbracechar{{\indexrbrace}}%
- \let\{=\lbracechar
- \let\}=\rbracechar
- \indexnonalnumdisappear
- \xdef\indexsortkey{}%
- \let\sortas=\indexwritesortas
- \edef\temp{\the\toks0}%
- \setbox\dummybox = \hbox{\temp}% Make sure to execute any \sortas
- \ifx\indexsortkey\empty
- \xdef\indexsortkey{\temp}%
- \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
- \fi
- }%
+ % For texindex which always views { and } as separators.
+ \def\{{\lbracechar{}}%
+ \def\}{\rbracechar{}}%
+ \uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}%
+ %
+ % Split the entry into primary entry and any subentries, and get the index
+ % sort key.
+ \splitindexentry\indextext
%
% Set up the complete index entry, with both the sort key and
% the original text, including any font commands. We write
% three arguments to \entry to the .?? file (four in the
% subentry case), texindex reduces to two when writing the .??s
% sorted result.
+ %
\edef\temp{%
\write\writeto{%
- \string\entry{\indexsortkey}{\noexpand\folio}{\the\toks0}}%
+ \string\entry{\fullindexsortkey}%
+ {\ifx\pagenumbertext\empty\noexpand\folio\else\pagenumbertext\fi}%
+ \bracedtext}%
}%
\temp
}
-\newbox\dummybox % used above
+
+% Put the index entry in the margin if desired (undocumented).
+\def\maybemarginindex{%
+ \ifx\SETmarginindex\relax\else
+ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}%
+ \fi
+}
+\let\SETmarginindex=\relax
+
% Take care of unwanted page breaks/skips around a whatsit:
%
@@ -5476,9 +5462,14 @@ end
% \entry {topic}{pagelist}
% for a topic that is used without subtopics
% \primary {topic}
+% \entry {topic}{}
% for the beginning of a topic that is used with subtopics
% \secondary {subtopic}{pagelist}
% for each subtopic.
+% \secondary {subtopic}{}
+% for a subtopic with sub-subtopics
+% \tertiary {subtopic}{subsubtopic}{pagelist}
+% for each sub-subtopic.
% Define the user-accessible indexing commands
% @findex, @vindex, @kindex, @cindex.
@@ -5490,11 +5481,6 @@ end
\def\tindex {\tpindex}
\def\pindex {\pgindex}
-\def\cindexsub {\begingroup\obeylines\cindexsub}
-{\obeylines %
-\gdef\cindexsub "#1" #2^^M{\endgroup %
-\dosubind{cp}{#2}{#1}}}
-
% Define the macros used in formatting output of the sorted index material.
% @printindex causes a particular index (the ??s file) to get printed.
@@ -5508,14 +5494,10 @@ end
\plainfrenchspacing
\everypar = {}% don't want the \kern\-parindent from indentation suppression.
%
- % See if the index file exists and is nonempty.
- % Change catcode of @ here so that if the index file contains
- % \initial {@}
- % as its first line, TeX doesn't complain about mismatched braces
- % (because it thinks @} is a control sequence).
- \catcode`\@ = 12
% See comment in \requireopenindexfile.
\def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi
+ %
+ % See if the index file exists and is nonempty.
\openin 1 \jobname.\indexname s
\ifeof 1
% \enddoublecolumns gets confused if there is no text in the index,
@@ -5525,8 +5507,6 @@ end
\putwordIndexNonexistent
\typeout{No file \jobname.\indexname s.}%
\else
- \catcode`\\ = 0
- %
% If the index file exists but is empty, then \openin leaves \ifeof
% false. We have to make TeX try to read something from the file, so
% it can discover if there is anything in it.
@@ -5534,41 +5514,51 @@ end
\ifeof 1
\putwordIndexIsEmpty
\else
- % Index files are almost Texinfo source, but we use \ as the escape
- % character. It would be better to use @, but that's too big a change
- % to make right now.
- \def\indexbackslash{\ttbackslash}%
- \let\indexlbrace\{ % Likewise, set these sequences for braces
- \let\indexrbrace\} % used in the sort key.
- \begindoublecolumns
- \let\entrywidowpenalty=\indexwidowpenalty
- %
- % Read input from the index file line by line.
- \loopdo
- \ifeof1
- \let\firsttoken\relax
- \else
- \read 1 to \nextline
- \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}%
- \act
- \fi
- \thisline
- %
- \ifeof1\else
- \let\thisline\nextline
- \repeat
- %%
- \enddoublecolumns
+ \expandafter\printindexzz\thisline\relax\relax\finish%
\fi
\fi
\closein 1
\endgroup}
-\def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken}
-\long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1}
-
-\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx}
-\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next}
+% If the index file starts with a backslash, forgo reading the index
+% file altogether. If somebody upgrades texinfo.tex they may still have
+% old index files using \ as the escape character. Reading this would
+% at best lead to typesetting garbage, at worst a TeX syntax error.
+\def\printindexzz#1#2\finish{%
+ \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax
+ \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1
+ \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax
+\errmessage{%
+ERROR: A sorted index file in an obsolete format was skipped.
+To fix this problem, please upgrade your version of 'texi2dvi'
+or 'texi2pdf' to that at <https://ftp.gnu.org/gnu/texinfo>.
+If you are using an old version of 'texindex' (part of the Texinfo
+distribution), you may also need to upgrade to a newer version (at least 6.0).
+You may be able to typeset the index if you run
+'texindex \jobname.\indexname' yourself.
+You could also try setting the 'txiindexescapeisbackslash' flag by
+running a command like
+'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do
+this, Texinfo will try to use index files in the old format.
+If you continue to have problems, deleting the index files and starting again
+might help (with 'rm \jobname.?? \jobname.??s')%
+}%
+ \else
+ (Skipped sorted index file in obsolete format)
+ \fi
+ \else
+ \begindoublecolumns
+ \input \jobname.\indexname s
+ \enddoublecolumns
+ \fi
+ \else
+ \begindoublecolumns
+ \catcode`\\=0\relax
+ \catcode`\@=12\relax
+ \input \jobname.\indexname s
+ \enddoublecolumns
+ \fi
+}
% These macros are used by the sorted index file itself.
% Change them to control the appearance of the index.
@@ -5577,12 +5567,19 @@ end
\catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13
\catcode`\$=3
\gdef\initialglyphs{%
+ % special control sequences used in the index sort key
+ \let\indexlbrace\{%
+ \let\indexrbrace\}%
+ \let\indexatchar\@%
+ \def\indexbackslash{\math{\backslash}}%
+ %
% Some changes for non-alphabetic characters. Using the glyphs from the
% math fonts looks more consistent than the typewriter font used elsewhere
% for these characters.
- \def\indexbackslash{\math{\backslash}}%
- \let\\=\indexbackslash
+ \uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}}
%
+ % In case @\ is used for backslash
+ \uppercase{\let\\=~}
% Can't get bold backslash so don't use bold forward slash
\catcode`\/=13
\def/{{\secrmnotbold \normalslash}}%
@@ -5642,12 +5639,6 @@ end
\def\entry{%
\begingroup
%
- % For pdfTeX and XeTeX.
- % The redefinition of \domark stops marks being added in \pdflink to
- % preserve coloured links across page boundaries. Otherwise the marks
- % would get in the way of \lastbox in \insertindexentrybox.
- \let\domark\relax
- %
% Start a new paragraph if necessary, so our assignments below can't
% affect previous text.
\par
@@ -5680,35 +5671,31 @@ end
\gdef\finishentry#1{%
\egroup % end box A
\dimen@ = \wd\boxA % Length of text of entry
- \global\setbox\boxA=\hbox\bgroup\unhbox\boxA
- % #1 is the page number.
- %
- % Get the width of the page numbers, and only use
- % leaders if they are present.
- \global\setbox\boxB = \hbox{#1}%
- \ifdim\wd\boxB = 0pt
- \null\nobreak\hfill\ %
- \else
- %
- \null\nobreak\indexdotfill % Have leaders before the page number.
+ \global\setbox\boxA=\hbox\bgroup
+ \unhbox\boxA
+ % #1 is the page number.
%
- \ifpdf
- \pdfgettoks#1.%
- \hskip\skip\thinshrinkable\the\toksA
+ % Get the width of the page numbers, and only use
+ % leaders if they are present.
+ \global\setbox\boxB = \hbox{#1}%
+ \ifdim\wd\boxB = 0pt
+ \null\nobreak\hfill\ %
\else
- \ifx\XeTeXrevision\thisisundefined
- \hskip\skip\thinshrinkable #1%
- \else
+ %
+ \null\nobreak\indexdotfill % Have leaders before the page number.
+ %
+ \ifpdforxetex
\pdfgettoks#1.%
\hskip\skip\thinshrinkable\the\toksA
+ \else
+ \hskip\skip\thinshrinkable #1%
\fi
\fi
- \fi
\egroup % end \boxA
\ifdim\wd\boxB = 0pt
- \global\setbox\entryindexbox=\vbox{\unhbox\boxA}%
- \else
- \global\setbox\entryindexbox=\vbox\bgroup
+ \noindent\unhbox\boxA\par
+ \nobreak
+ \else\bgroup
% We want the text of the entries to be aligned to the left, and the
% page numbers to be aligned to the right.
%
@@ -5738,10 +5725,13 @@ end
\advance\dimen@ii by 1\dimen@i
\ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line
\ifdim\dimen@ > 0.8\dimen@ii % due to long index text
- \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly
+ % Try to split the text roughly evenly. \dimen@ will be the length of
+ % the first line.
+ \dimen@ = 0.7\dimen@
\dimen@ii = \hsize
\ifnum\dimen@>\dimen@ii
- % If the entry is too long, use the whole line
+ % If the entry is too long (for example, if it needs more than
+ % two lines), use all the space in the first line.
\dimen@ = \dimen@ii
\fi
\advance\leftskip by 0pt plus 1fill % ragged right
@@ -5751,8 +5741,9 @@ end
% instead of using \parshape with explicit line lengths, but TeX
% doesn't seem to provide a way to do such a thing.
%
- \leftskip = 1em
- \parindent = -1em
+ % Indent all lines but the first one.
+ \advance\leftskip by 1em
+ \advance\parindent by -1em
\fi\fi
\indent % start paragraph
\unhbox\boxA
@@ -5770,57 +5761,11 @@ end
\egroup % The \vbox
\fi
\endgroup
- % delay text of entry until after penalty
- \bgroup\aftergroup\insertindexentrybox
- \entrywidowpenalty
}}
\newskip\thinshrinkable
\skip\thinshrinkable=.15em minus .15em
-\newbox\entryindexbox
-\def\insertindexentrybox{%
- \ourunvbox\entryindexbox
-}
-
-% Use \lastbox to take apart vbox box by box, and add each sub-box
-% to the current vertical list.
-\def\ourunvbox#1{%
-\bgroup % for local binding of \delayedbox
- % Remove the last box from box #1
- \global\setbox#1=\vbox{%
- \unvbox#1%
- \unskip % remove any glue
- \unpenalty
- \global\setbox\interbox=\lastbox
- }%
- \setbox\delayedbox=\box\interbox
- \ifdim\ht#1=0pt\else
- \ourunvbox#1 % Repeat on what's left of the box
- \nobreak
- \fi
- \box\delayedbox
-\egroup
-}
-\newbox\delayedbox
-\newbox\interbox
-
-% Default is no penalty
-\let\entrywidowpenalty\egroup
-
-% Used from \printindex. \firsttoken should be the first token
-% after the \entry. If it's not another \entry, we are at the last
-% line of a group of index entries, so insert a penalty to discourage
-% widowed index entries.
-\long\def\indexwidowpenalty{%
- \def\isentry{\entry}%
- \ifx\firsttoken\isentry
- \else
- \penalty 9000
- \fi
- \egroup % now comes the box added with \aftergroup
-}
-
% Like plain.tex's \dotfill, except uses up at least 1 em.
% The filll stretch here overpowers both the fil and fill stretch to push
% the page number to the right.
@@ -5830,24 +5775,15 @@ end
\def\primary #1{\line{#1\hfil}}
-\newskip\secondaryindent \secondaryindent=0.5cm
-\def\secondary#1#2{{%
- \parfillskip=0in
- \parskip=0in
- \hangindent=1in
- \hangafter=1
- \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
- \ifpdf
- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
- \else
- \ifx\XeTeXrevision\thisisundefined
- #2
- \else
- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
- \fi
- \fi
- \par
-}}
+\def\secondary{\indententry{0.5cm}}
+\def\tertiary{\indententry{1cm}}
+
+\def\indententry#1#2#3{%
+ \bgroup
+ \leftskip=#1
+ \entry{#2}{#3}%
+ \egroup
+}
% Define two-column mode, which we use to typeset indexes.
% Adapted from the TeXbook, page 416, which is to say,
@@ -5857,60 +5793,21 @@ end
\newbox\partialpage
\newdimen\doublecolumnhsize
-% Use inside an output routine to save \topmark and \firstmark
-\def\savemarks{%
- \global\savedtopmark=\expandafter{\topmark }%
- \global\savedfirstmark=\expandafter{\firstmark }%
-}
-\newtoks\savedtopmark
-\newtoks\savedfirstmark
-
-% Set \topmark and \firstmark for next time \output runs.
-% Can't be run from withinside \output (because any material
-% added while an output routine is active, including
-% penalties, is saved for after it finishes). The page so far
-% should be empty, otherwise what's on it will be thrown away.
-\def\restoremarks{%
- \mark{\the\savedtopmark}%
- \bgroup\output = {%
- \setbox\dummybox=\box\PAGE
- }abc\eject\egroup
- % "abc" because output routine doesn't fire for a completely empty page.
- \mark{\the\savedfirstmark}%
-}
-
\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
% If not much space left on page, start a new page.
\ifdim\pagetotal>0.8\vsize\vfill\eject\fi
%
% Grab any single-column material above us.
\output = {%
- %
- % Here is a possibility not foreseen in manmac: if we accumulate a
- % whole lot of material, we might end up calling this \output
- % routine twice in a row (see the doublecol-lose test, which is
- % essentially a couple of indexes with @setchapternewpage off). In
- % that case we just ship out what is in \partialpage with the normal
- % output routine. Generally, \partialpage will be empty when this
- % runs and this will be a no-op. See the indexspread.tex test case.
- \ifvoid\partialpage \else
- \onepageout{\pagecontents\partialpage}%
- \fi
+ \savetopmark
%
\global\setbox\partialpage = \vbox{%
% Unvbox the main output page.
\unvbox\PAGE
\kern-\topskip \kern\baselineskip
}%
- \savemarks
}%
\eject % run that output routine to set \partialpage
- \restoremarks
- %
- % We recover the two marks that the last output routine saved in order
- % to propagate the information in marks added around a chapter heading,
- % which could be otherwise be lost by the time the final page is output.
- %
%
% Use the double-column output routine for subsequent pages.
\output = {\doublecolumnout}%
@@ -5936,8 +5833,10 @@ end
\divide\doublecolumnhsize by 2
\hsize = \doublecolumnhsize
%
- % Double the \vsize as well. (We don't need a separate register here,
- % since nobody clobbers \vsize.)
+ % Get the available space for the double columns -- the normal
+ % (undoubled) page height minus any material left over from the
+ % previous page.
+ \advance\vsize by -\ht\partialpage
\vsize = 2\vsize
%
% For the benefit of balancing columns
@@ -5949,18 +5848,16 @@ end
%
\def\doublecolumnout{%
%
+ \savetopmark
\splittopskip=\topskip \splitmaxdepth=\maxdepth
- % Get the available space for the double columns -- the normal
- % (undoubled) page height minus any material left over from the
- % previous page.
\dimen@ = \vsize
\divide\dimen@ by 2
- \advance\dimen@ by -\ht\partialpage
%
% box0 will be the left-hand column, box2 the right.
- \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
- \onepageout\pagesofar
- \unvbox255
+ \setbox0=\vsplit\PAGE to\dimen@ \setbox2=\vsplit\PAGE to\dimen@
+ \global\advance\vsize by 2\ht\partialpage
+ \onepageout\pagesofar % empty except for the first time we are called
+ \unvbox\PAGE
\penalty\outputpenalty
}
%
@@ -5975,7 +5872,7 @@ end
}
-% Finished with with double columns.
+% Finished with double columns.
\def\enddoublecolumns{%
% The following penalty ensures that the page builder is exercised
% _before_ we change the output routine. This is necessary in the
@@ -6007,26 +5904,31 @@ end
%
\output = {%
% Split the last of the double-column material.
- \savemarks
+ \savetopmark
\balancecolumns
- %
+ }%
+ \eject % call the \output just set
+ \ifdim\pagetotal=0pt
% Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
% definition right away.
- \global\output = {\onepageout{\pagecontents\PAGE}}%
- }%
- \eject
- \endgroup % started in \begindoublecolumns
- \restoremarks
- % Leave the double-column material on the current page, no automatic
- % page break.
- \box\balancedcolumns
- %
- % \pagegoal was set to the doubled \vsize above, since we restarted
- % the current page. We're now back to normal single-column
- % typesetting, so reset \pagegoal to the normal \vsize (after the
- % \endgroup where \vsize got restored).
- \pagegoal = \vsize
+ \global\output=\expandafter{\the\defaultoutput}
+ %
+ \endgroup % started in \begindoublecolumns
+ % Leave the double-column material on the current page, no automatic
+ % page break.
+ \box\balancedcolumns
+ %
+ % \pagegoal was set to the doubled \vsize above, since we restarted
+ % the current page. We're now back to normal single-column
+ % typesetting, so reset \pagegoal to the normal \vsize.
+ \global\vsize = \txipageheight %
+ \pagegoal = \txipageheight %
+ \else
+ % We had some left-over material. This might happen when \doublecolumnout
+ % is called in \balancecolumns. Try again.
+ \expandafter\enddoublecolumns
+ \fi
}
\newbox\balancedcolumns
\setbox\balancedcolumns=\vbox{shouldnt see this}%
@@ -6034,14 +5936,16 @@ end
% Only called for the last of the double column material. \doublecolumnout
% does the others.
\def\balancecolumns{%
- \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
+ \setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120.
\dimen@ = \ht0
- \advance\dimen@ by \topskip
- \advance\dimen@ by-\baselineskip
- \ifdim\dimen@<5\baselineskip
+ \ifdim\dimen@<7\baselineskip
% Don't split a short final column in two.
\setbox2=\vbox{}%
+ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
\else
+ % double the leading vertical space
+ \advance\dimen@ by \topskip
+ \advance\dimen@ by-\baselineskip
\divide\dimen@ by 2 % target to split to
\dimen@ii = \dimen@
\splittopskip = \topskip
@@ -6056,15 +5960,15 @@ end
\repeat
}%
% Now the left column is in box 1, and the right column in box 3.
+ %
% Check whether the left column has come out higher than the page itself.
% (Note that we have doubled \vsize for the double columns, so
% the actual height of the page is 0.5\vsize).
\ifdim2\ht1>\vsize
- % Just split the last of the double column material roughly in half.
- \setbox2=\box0
- \setbox0 = \vsplit2 to \dimen@ii
- \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}%
- \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}%
+ % It appears that we have been called upon to balance too much material.
+ % Output some of it with \doublecolumnout, leaving the rest on the page.
+ \setbox\PAGE=\box0
+ \doublecolumnout
\else
% Compare the heights of the two columns.
\ifdim4\ht1>5\ht3
@@ -6077,10 +5981,10 @@ end
\setbox2=\vbox to\ht1{\unvbox3\unskip}%
\setbox0=\vbox to\ht1{\unvbox1\unskip}%
\fi
+ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
\fi
\fi
%
- \global\setbox\balancedcolumns=\vbox{\pagesofar}%
}
\catcode`\@ = \other
@@ -6095,7 +5999,7 @@ end
\null
\vskip.3\vsize % move it down on the page a bit
\begingroup
- \noindent \titlefonts\rmisbold #1\par % the text
+ \noindent \titlefonts\rm #1\par % the text
\let\lastnode=\empty % no node to associate with
\writetocentry{part}{#1}{}% but put it in the toc
\headingsoff % no headline or footline on the part page
@@ -6176,11 +6080,9 @@ end
% @raisesections: treat @section as chapter, @subsection as section, etc.
\def\raisesections{\global\advance\secbase by -1}
-\let\up=\raisesections % original BFox name
% @lowersections: treat @chapter as section, @section as subsection, etc.
\def\lowersections{\global\advance\secbase by 1}
-\let\down=\lowersections % original BFox name
% we only have subsub.
\chardef\maxseclevel = 3
@@ -6525,27 +6427,22 @@ end
\expandafter\ifx\thisenv\titlepage\else
\checkenv{}% chapters, etc., should not start inside an environment.
\fi
- % FIXME: \chapmacro is currently called from inside \titlepage when
- % \setcontentsaftertitlepage to print the "Table of Contents" heading, but
- % this should probably be done by \sectionheading with an option to print
- % in chapter size.
- %
% Insert the first mark before the heading break (see notes for \domark).
- \let\prevchapterdefs=\lastchapterdefs
- \let\prevsectiondefs=\lastsectiondefs
- \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+ \let\prevchapterdefs=\currentchapterdefs
+ \let\prevsectiondefs=\currentsectiondefs
+ \gdef\currentsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
\gdef\thissection{}}%
%
\def\temptype{#2}%
\ifx\temptype\Ynothingkeyword
- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
\gdef\thischapter{\thischaptername}}%
\else\ifx\temptype\Yomitfromtockeyword
- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
\gdef\thischapter{}}%
\else\ifx\temptype\Yappendixkeyword
\toks0={#1}%
- \xdef\lastchapterdefs{%
+ \xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\appendixletter}%
% \noexpand\putwordAppendix avoids expanding indigestible
@@ -6556,7 +6453,7 @@ end
}%
\else
\toks0={#1}%
- \xdef\lastchapterdefs{%
+ \xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\the\chapno}%
% \noexpand\putwordChapter avoids expanding indigestible
@@ -6576,18 +6473,18 @@ end
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \let\prevchapterdefs=\lastchapterdefs
- \let\prevsectiondefs=\lastsectiondefs
+ \let\prevchapterdefs=\currentchapterdefs
+ \let\prevsectiondefs=\currentsectiondefs
\domark
%
{%
- \chapfonts \rmisbold
+ \chapfonts \rm
\let\footnote=\errfootnoteheading % give better error message
%
- % Have to define \lastsection before calling \donoderef, because the
+ % Have to define \currentsection before calling \donoderef, because the
% xref code eventually uses it. On the other hand, it has to be called
% after \pchapsepmacro, or the headline will change too soon.
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
%
% Only insert the separating space if we have a chapter/appendix
% number, and don't print the unnumbered ``number''.
@@ -6673,13 +6570,13 @@ end
\let\footnote=\errfootnoteheading
%
% Switch to the right set of fonts.
- \csname #2fonts\endcsname \rmisbold
+ \csname #2fonts\endcsname \rm
%
% Insert first mark before the heading break (see notes for \domark).
- \let\prevsectiondefs=\lastsectiondefs
+ \let\prevsectiondefs=\currentsectiondefs
\ifx\temptype\Ynothingkeyword
\ifx\sectionlevel\seckeyword
- \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+ \gdef\currentsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
\gdef\thissection{\thissectionname}}%
\fi
\else\ifx\temptype\Yomitfromtockeyword
@@ -6687,7 +6584,7 @@ end
\else\ifx\temptype\Yappendixkeyword
\ifx\sectionlevel\seckeyword
\toks0={#1}%
- \xdef\lastsectiondefs{%
+ \xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
% \noexpand\putwordSection avoids expanding indigestible
@@ -6700,7 +6597,7 @@ end
\else
\ifx\sectionlevel\seckeyword
\toks0={#1}%
- \xdef\lastsectiondefs{%
+ \xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
% \noexpand\putwordSection avoids expanding indigestible
@@ -6726,28 +6623,28 @@ end
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \global\let\prevsectiondefs=\lastsectiondefs
+ \global\let\prevsectiondefs=\currentsectiondefs
\domark
%
% Only insert the space after the number if we have a section number.
\ifx\temptype\Ynothingkeyword
\setbox0 = \hbox{}%
\def\toctype{unn}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\else\ifx\temptype\Yomitfromtockeyword
% for @headings -- no section number, don't include in toc,
- % and don't redefine \lastsection.
+ % and don't redefine \currentsection.
\setbox0 = \hbox{}%
\def\toctype{omit}%
\let\sectionlevel=\empty
\else\ifx\temptype\Yappendixkeyword
\setbox0 = \hbox{#4\enspace}%
\def\toctype{app}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\else
\setbox0 = \hbox{#4\enspace}%
\def\toctype{num}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\fi\fi\fi
%
% Write the toc entry (before \donoderef). See comments in \chapmacro.
@@ -6837,13 +6734,8 @@ end
% 1 and 2 (the page numbers aren't printed), and so are the first
% two pages of the document. Thus, we'd have two destinations named
% `1', and two named `2'.
- \ifpdf
+ \ifpdforxetex
\global\pdfmakepagedesttrue
- \else
- \ifx\XeTeXrevision\thisisundefined
- \else
- \global\pdfmakepagedesttrue
- \fi
\fi
}
@@ -6987,7 +6879,15 @@ end
% exist, with an empty box. Let's hope all the numbers have the same width.
% Also ignore the page number, which is conventionally not printed.
\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}}
-\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}}
+\def\partentry#1#2#3#4{%
+ % Add stretch and a bonus for breaking the page before the part heading.
+ % This reduces the chance of the page being broken immediately after the
+ % part heading, before a following chapter heading.
+ \vskip 0pt plus 5\baselineskip
+ \penalty-300
+ \vskip 0pt plus -5\baselineskip
+ \dochapentry{\numeralbox\labelspace#1}{}%
+}
%
% Parts, in the short toc.
\def\shortpartentry#1#2#3#4{%
@@ -7198,11 +7098,7 @@ end
% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
% environment contents.
-\font\circle=lcircle10
-\newdimen\circthick
-\newdimen\cartouter\newdimen\cartinner
-\newskip\normbskip\newskip\normpskip\newskip\normlskip
-\circthick=\fontdimen8\circle
+
%
\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
\def\ctr{{\hskip 6pt\circle\char'010}}
@@ -7217,7 +7113,18 @@ end
%
\newskip\lskip\newskip\rskip
+% only require the font if @cartouche is actually used
+\def\cartouchefontdefs{%
+ \font\circle=lcircle10\relax
+ \circthick=\fontdimen8\circle
+}
+\newdimen\circthick
+\newdimen\cartouter\newdimen\cartinner
+\newskip\normbskip\newskip\normpskip\newskip\normlskip
+
+
\envdef\cartouche{%
+ \cartouchefontdefs
\ifhmode\par\fi % can't be in the midst of a paragraph.
\startsavinginserts
\lskip=\leftskip \rskip=\rightskip
@@ -7396,13 +7303,9 @@ end
% @raggedright does more-or-less normal line breaking but no right
-% justification. From plain.tex. Don't stretch around special
-% characters in urls in this environment, since the stretch at the right
-% should be enough.
+% justification. From plain.tex.
\envdef\raggedright{%
\rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax
- \def\urefprestretchamount{0pt}%
- \def\urefpoststretchamount{0pt}%
}
\let\Eraggedright\par
@@ -7564,7 +7467,7 @@ end
\nonfillstart
\tt % easiest (and conventionally used) font for verbatim
% The \leavevmode here is for blank lines. Otherwise, we would
- % never \starttabox and the \egroup would end verbatim mode.
+ % never \starttabbox and the \egroup would end verbatim mode.
\def\par{\leavevmode\egroup\box\verbbox\endgraf}%
\tabexpand
\setupmarkupstyle{verbatim}%
@@ -7627,9 +7530,12 @@ end
{%
\makevalueexpandable
\setupverbatim
- \indexnofonts % Allow `@@' and other weird things in file names.
- \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
- \input #1
+ {%
+ \indexnofonts % Allow `@@' and other weird things in file names.
+ \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
+ \edef\tmp{\noexpand\input #1 }
+ \expandafter
+ }\tmp
\afterenvbreak
}%
}
@@ -7774,6 +7680,21 @@ end
\fi\fi
}
+% \dosubind {index}{topic}{subtopic}
+%
+% If SUBTOPIC is present, precede it with a space, and call \doind.
+% (At some time during the 20th century, this made a two-level entry in an
+% index such as the operation index. Nobody seemed to notice the change in
+% behaviour though.)
+\def\dosubind#1#2#3{%
+ \def\thirdarg{#3}%
+ \ifx\thirdarg\empty
+ \doind{#1}{#2}%
+ \else
+ \doind{#1}{#2\space#3}%
+ \fi
+}
+
% Untyped functions:
% @deffn category name args
@@ -7788,7 +7709,6 @@ end
% \deffngeneral {subind}category name args
%
\def\deffngeneral#1#2 #3 #4\endheader{%
- % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
\dosubind{fn}{\code{#3}}{#1}%
\defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
}
@@ -7946,7 +7866,7 @@ end
\fi % no return type
#3% output function name
}%
- {\rm\enskip}% hskip 0.5 em of \tenrm
+ {\rm\enskip}% hskip 0.5 em of \rmfont
%
\boldbrax
% arguments will be output next, if any.
@@ -7995,6 +7915,7 @@ end
\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
\gdef\magicamp{\let&=\amprm}
}
+\let\ampchar\&
\newcount\parencount
@@ -8075,44 +7996,18 @@ end
}
\fi
-\let\aftermacroxxx\relax
-\def\aftermacro{\aftermacroxxx}
-
-% alias because \c means cedilla in @tex or @math
-\let\texinfoc=\c
-
-\newcount\savedcatcodeone
-\newcount\savedcatcodetwo
-
% Used at the time of macro expansion.
% Argument is macro body with arguments substituted
\def\scanmacro#1{%
\newlinechar`\^^M
\def\xeatspaces{\eatspaces}%
%
- % Temporarily undo catcode changes of \printindex. Set catcode of @ to
- % 0 so that @-commands in macro expansions aren't printed literally when
- % formatting an index file, where \ is used as the escape character.
- \savedcatcodeone=\catcode`\@
- \savedcatcodetwo=\catcode`\\
- \catcode`\@=0
- \catcode`\\=\active
- %
% Process the macro body under the current catcode regime.
- \scantokens{#1@texinfoc}\aftermacro%
+ \scantokens{#1@comment}%
%
- \catcode`\@=\savedcatcodeone
- \catcode`\\=\savedcatcodetwo
- %
- % The \texinfoc is to remove the \newlinechar added by \scantokens, and
- % can be noticed by \parsearg.
- % The \aftermacro allows a \comment at the end of the macro definition
- % to duplicate itself past the final \newlinechar added by \scantokens:
- % this is used in the definition of \group to comment out a newline. We
- % don't do the same for \c to support Texinfo files with macros that ended
- % with a @c, which should no longer be necessary.
- % We avoid surrounding the call to \scantokens with \bgroup and \egroup
- % to allow macros to open or close groups themselves.
+ % The \comment is to remove the \newlinechar added by \scantokens, and
+ % can be noticed by \parsearg. Note \c isn't used because this means cedilla
+ % in math mode.
}
% Used for copying and captions
@@ -8213,12 +8108,14 @@ end
\def\macroargctxt{%
\scanctxt
\catcode`\ =\active
+ \catcode`\@=\other
\catcode`\^^M=\other
\catcode`\\=\active
}
\def\macrolineargctxt{% used for whole-line arguments without braces
\scanctxt
+ \catcode`\@=\other
\catcode`\{=\other
\catcode`\}=\other
}
@@ -8582,6 +8479,13 @@ end
\ifcase\paramno
% 0
\expandafter\xdef\csname\the\macname\endcsname{%
+ \bgroup
+ \noexpand\spaceisspace
+ \noexpand\endlineisspace
+ \noexpand\expandafter % skip any whitespace after the macro name.
+ \expandafter\noexpand\csname\the\macname @@@\endcsname}%
+ \expandafter\xdef\csname\the\macname @@@\endcsname{%
+ \egroup
\noexpand\scanmacro{\macrobody}}%
\or % 1
\expandafter\xdef\csname\the\macname\endcsname{%
@@ -8775,9 +8679,29 @@ end
% also remove a trailing comma, in case of something like this:
% @node Help-Cross, , , Cross-refs
\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
-\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}\omittopnode}
+
+% Used so that the @top node doesn't have to be wrapped in an @ifnottex
+% conditional.
+% \doignore goes to more effort to skip nested conditionals but we don't need
+% that here.
+\def\omittopnode{%
+ \ifx\lastnode\wordTop
+ \expandafter\ignorenode\fi
+}
+\def\wordTop{Top}
+
+% Until the next @node or @bye command, divert output to a box that is not
+% output.
+\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}%
+\ignorenodebye
+}
+
+{\let\bye\relax
+\gdef\ignorenodebye{\let\bye\ignorenodebyedef}
+\gdef\ignorenodebyedef{\egroup(`Top' node ignored)\bye}}
+% The redefinition of \bye here is because it is declared \outer
-\let\nwnode=\node
\let\lastnode=\empty
% Write a cross-reference definition for the current node. #1 is the
@@ -8800,7 +8724,7 @@ end
% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
% anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \lastsection,
+% 1) NAME-title - the current sectioning name taken from \currentsection,
% or the anchor name.
% 2) NAME-snt - section number and type, passed as the SNT arg, or
% empty for anchors.
@@ -8822,7 +8746,7 @@ end
\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
##1}{##2}}% these are parameters of \writexrdef
}%
- \toks0 = \expandafter{\lastsection}%
+ \toks0 = \expandafter{\currentsection}%
\immediate \writexrdef{title}{\the\toks0 }%
\immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
\safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
@@ -9167,7 +9091,13 @@ end
\xdef\safexrefname{#1}%
}%
%
- \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
+ \bgroup
+ \expandafter\gdef\csname XR\safexrefname\endcsname{#2}%
+ \egroup
+ % We put the \gdef inside a group to avoid the definitions building up on
+ % TeX's save stack, which can cause it to run out of space for aux files with
+ % thousands of lines. \gdef doesn't use the save stack, but \csname does
+ % when it defines an unknown control sequence as \relax.
%
% Was that xref control sequence that we just defined for a float?
\expandafter\iffloat\csname XR\safexrefname\endcsname
@@ -9246,19 +9176,6 @@ end
\catcode`\^^]=\other
\catcode`\^^^=\other
\catcode`\^^_=\other
- % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
- % in xref tags, i.e., node names. But since ^^e4 notation isn't
- % supported in the main text, it doesn't seem desirable. Furthermore,
- % that is not enough: for node names that actually contain a ^
- % character, we would end up writing a line like this: 'xrdef {'hat
- % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
- % argument, and \hat is not an expandable control sequence. It could
- % all be worked out, but why? Either we support ^^ or we don't.
- %
- % The other change necessary for this was to define \auxhat:
- % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
- % and then to call \auxhat in \setq.
- %
\catcode`\^=\other
%
% Special characters. Should be turned off anyway, but...
@@ -9276,14 +9193,7 @@ end
\catcode`\%=\other
\catcode`+=\other % avoid \+ for paranoia even though we've turned it off
%
- % This is to support \ in node names and titles, since the \
- % characters end up in a \csname. It's easier than
- % leaving it active and making its active definition an actual \
- % character. What I don't understand is why it works in the *value*
- % of the xrdef. Seems like it should be a catcode12 \, and that
- % should not typeset properly. But it works, so I'm moving on for
- % now. --karl, 15jan04.
- \catcode`\\=\other
+ \catcode`\\=\active
%
% @ is our escape character in .aux files, and we need braces.
\catcode`\{=1
@@ -9473,7 +9383,7 @@ end
\newif\ifwarnednoepsf
\newhelp\noepsfhelp{epsf.tex must be installed for images to
work. It is also included in the Texinfo distribution, or you can get
- it from ftp://tug.org/tex/epsf.tex.}
+ it from https://ctan.org/texarchive/macros/texinfo/texinfo/doc/epsf.tex.}
%
\def\image#1{%
\ifx\epsfbox\thisisundefined
@@ -9614,13 +9524,13 @@ end
\global\advance\floatno by 1
%
{%
- % This magic value for \lastsection is output by \setref as the
+ % This magic value for \currentsection is output by \setref as the
% XREFLABEL-title value. \xrefX uses it to distinguish float
% labels (which have a completely different output format) from
% node and anchor labels. And \xrdef uses it to construct the
% lists of floats.
%
- \edef\lastsection{\floatmagic=\safefloattype}%
+ \edef\currentsection{\floatmagic=\safefloattype}%
\setref{\floatlabel}{Yfloat}%
}%
\fi
@@ -9743,7 +9653,7 @@ end
% #1 is the control sequence we are passed; we expand into a conditional
% which is true if #1 represents a float ref. That is, the magic
-% \lastsection value which we \setref above.
+% \currentsection value which we \setref above.
%
\def\iffloat#1{\expandafter\doiffloat#1==\finish}
%
@@ -10063,18 +9973,18 @@ directory should work if nowhere else does.}
\gdefchar^^a0{\tie}
\gdefchar^^a1{\exclamdown}
\gdefchar^^a2{{\tcfont \char162}} % cent
- \gdefchar^^a3{\pounds}
+ \gdefchar^^a3{\pounds{}}
\gdefchar^^a4{{\tcfont \char164}} % currency
\gdefchar^^a5{{\tcfont \char165}} % yen
\gdefchar^^a6{{\tcfont \char166}} % broken bar
\gdefchar^^a7{\S}
\gdefchar^^a8{\"{}}
- \gdefchar^^a9{\copyright}
+ \gdefchar^^a9{\copyright{}}
\gdefchar^^aa{\ordf}
- \gdefchar^^ab{\guillemetleft}
+ \gdefchar^^ab{\guillemetleft{}}
\gdefchar^^ac{\ensuremath\lnot}
\gdefchar^^ad{\-}
- \gdefchar^^ae{\registeredsymbol}
+ \gdefchar^^ae{\registeredsymbol{}}
\gdefchar^^af{\={}}
%
\gdefchar^^b0{\textdegree}
@@ -10088,7 +9998,7 @@ directory should work if nowhere else does.}
\gdefchar^^b8{\cedilla\ }
\gdefchar^^b9{$^1$}
\gdefchar^^ba{\ordm}
- \gdefchar^^bb{\guillemetright}
+ \gdefchar^^bb{\guillemetright{}}
\gdefchar^^bc{$1\over4$}
\gdefchar^^bd{$1\over2$}
\gdefchar^^be{$3\over4$}
@@ -10168,7 +10078,7 @@ directory should work if nowhere else does.}
% Encoding is almost identical to Latin1.
\latonechardefs
%
- \gdefchar^^a4{\euro}
+ \gdefchar^^a4{\euro{}}
\gdefchar^^a6{\v S}
\gdefchar^^a8{\v s}
\gdefchar^^b4{\v Z}
@@ -10197,7 +10107,7 @@ directory should work if nowhere else does.}
\gdefchar^^ae{\v Z}
\gdefchar^^af{\dotaccent Z}
%
- \gdefchar^^b0{\textdegree}
+ \gdefchar^^b0{\textdegree{}}
\gdefchar^^b1{\ogonek{a}}
\gdefchar^^b2{\ogonek{ }}
\gdefchar^^b3{\l}
@@ -10509,18 +10419,18 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{00A0}{\tie}%
\DeclareUnicodeCharacter{00A1}{\exclamdown}%
\DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
- \DeclareUnicodeCharacter{00A3}{\pounds}%
+ \DeclareUnicodeCharacter{00A3}{\pounds{}}%
\DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency
\DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen
\DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar
\DeclareUnicodeCharacter{00A7}{\S}%
\DeclareUnicodeCharacter{00A8}{\"{ }}%
- \DeclareUnicodeCharacter{00A9}{\copyright}%
+ \DeclareUnicodeCharacter{00A9}{\copyright{}}%
\DeclareUnicodeCharacter{00AA}{\ordf}%
- \DeclareUnicodeCharacter{00AB}{\guillemetleft}%
+ \DeclareUnicodeCharacter{00AB}{\guillemetleft{}}%
\DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}%
\DeclareUnicodeCharacter{00AD}{\-}%
- \DeclareUnicodeCharacter{00AE}{\registeredsymbol}%
+ \DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}%
\DeclareUnicodeCharacter{00AF}{\={ }}%
%
\DeclareUnicodeCharacter{00B0}{\ringaccent{ }}%
@@ -10534,7 +10444,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{00B8}{\cedilla{ }}%
\DeclareUnicodeCharacter{00B9}{$^1$}%
\DeclareUnicodeCharacter{00BA}{\ordm}%
- \DeclareUnicodeCharacter{00BB}{\guillemetright}%
+ \DeclareUnicodeCharacter{00BB}{\guillemetright{}}%
\DeclareUnicodeCharacter{00BC}{$1\over4$}%
\DeclareUnicodeCharacter{00BD}{$1\over2$}%
\DeclareUnicodeCharacter{00BE}{$3\over4$}%
@@ -11006,36 +10916,36 @@ directory should work if nowhere else does.}
% Punctuation
\DeclareUnicodeCharacter{2013}{--}%
\DeclareUnicodeCharacter{2014}{---}%
- \DeclareUnicodeCharacter{2018}{\quoteleft}%
- \DeclareUnicodeCharacter{2019}{\quoteright}%
- \DeclareUnicodeCharacter{201A}{\quotesinglbase}%
- \DeclareUnicodeCharacter{201C}{\quotedblleft}%
- \DeclareUnicodeCharacter{201D}{\quotedblright}%
- \DeclareUnicodeCharacter{201E}{\quotedblbase}%
+ \DeclareUnicodeCharacter{2018}{\quoteleft{}}%
+ \DeclareUnicodeCharacter{2019}{\quoteright{}}%
+ \DeclareUnicodeCharacter{201A}{\quotesinglbase{}}%
+ \DeclareUnicodeCharacter{201C}{\quotedblleft{}}%
+ \DeclareUnicodeCharacter{201D}{\quotedblright{}}%
+ \DeclareUnicodeCharacter{201E}{\quotedblbase{}}%
\DeclareUnicodeCharacter{2020}{\ensuremath\dagger}%
\DeclareUnicodeCharacter{2021}{\ensuremath\ddagger}%
- \DeclareUnicodeCharacter{2022}{\bullet}%
+ \DeclareUnicodeCharacter{2022}{\bullet{}}%
\DeclareUnicodeCharacter{202F}{\thinspace}%
- \DeclareUnicodeCharacter{2026}{\dots}%
- \DeclareUnicodeCharacter{2039}{\guilsinglleft}%
- \DeclareUnicodeCharacter{203A}{\guilsinglright}%
+ \DeclareUnicodeCharacter{2026}{\dots{}}%
+ \DeclareUnicodeCharacter{2039}{\guilsinglleft{}}%
+ \DeclareUnicodeCharacter{203A}{\guilsinglright{}}%
%
- \DeclareUnicodeCharacter{20AC}{\euro}%
+ \DeclareUnicodeCharacter{20AC}{\euro{}}%
%
- \DeclareUnicodeCharacter{2192}{\expansion}%
- \DeclareUnicodeCharacter{21D2}{\result}%
+ \DeclareUnicodeCharacter{2192}{\expansion{}}%
+ \DeclareUnicodeCharacter{21D2}{\result{}}%
%
% Mathematical symbols
\DeclareUnicodeCharacter{2200}{\ensuremath\forall}%
\DeclareUnicodeCharacter{2203}{\ensuremath\exists}%
\DeclareUnicodeCharacter{2208}{\ensuremath\in}%
- \DeclareUnicodeCharacter{2212}{\minus}%
+ \DeclareUnicodeCharacter{2212}{\minus{}}%
\DeclareUnicodeCharacter{2217}{\ast}%
\DeclareUnicodeCharacter{221E}{\ensuremath\infty}%
\DeclareUnicodeCharacter{2225}{\ensuremath\parallel}%
\DeclareUnicodeCharacter{2227}{\ensuremath\wedge}%
\DeclareUnicodeCharacter{2229}{\ensuremath\cap}%
- \DeclareUnicodeCharacter{2261}{\equiv}%
+ \DeclareUnicodeCharacter{2261}{\equiv{}}%
\DeclareUnicodeCharacter{2264}{\ensuremath\leq}%
\DeclareUnicodeCharacter{2265}{\ensuremath\geq}%
\DeclareUnicodeCharacter{2282}{\ensuremath\subset}%
@@ -11048,7 +10958,6 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{2113}{\ensuremath\ell}%
\DeclareUnicodeCharacter{2118}{\ensuremath\wp}%
\DeclareUnicodeCharacter{211C}{\ensuremath\Re}%
- \DeclareUnicodeCharacter{2127}{\ensuremath\mho}%
\DeclareUnicodeCharacter{2135}{\ensuremath\aleph}%
\DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow}%
\DeclareUnicodeCharacter{2191}{\ensuremath\uparrow}%
@@ -11064,7 +10973,6 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow}%
\DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup}%
\DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown}%
- \DeclareUnicodeCharacter{21BE}{\ensuremath\upharpoonright}%
\DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup}%
\DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown}%
\DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons}%
@@ -11073,8 +10981,6 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow}%
\DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow}%
\DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow}%
- \DeclareUnicodeCharacter{21DD}{\ensuremath\leadsto}%
- \DeclareUnicodeCharacter{2201}{\ensuremath\complement}%
\DeclareUnicodeCharacter{2202}{\ensuremath\partial}%
\DeclareUnicodeCharacter{2205}{\ensuremath\emptyset}%
\DeclareUnicodeCharacter{2207}{\ensuremath\nabla}%
@@ -11108,8 +11014,6 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{2283}{\ensuremath\supset}%
\DeclareUnicodeCharacter{2286}{\ensuremath\subseteq}%
\DeclareUnicodeCharacter{228E}{\ensuremath\uplus}%
- \DeclareUnicodeCharacter{228F}{\ensuremath\sqsubset}%
- \DeclareUnicodeCharacter{2290}{\ensuremath\sqsupset}%
\DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq}%
\DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq}%
\DeclareUnicodeCharacter{2293}{\ensuremath\sqcap}%
@@ -11124,8 +11028,6 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop}%
\DeclareUnicodeCharacter{22A5}{\ensuremath\bot}%
\DeclareUnicodeCharacter{22A8}{\ensuremath\models}%
- \DeclareUnicodeCharacter{22B4}{\ensuremath\unlhd}%
- \DeclareUnicodeCharacter{22B5}{\ensuremath\unrhd}%
\DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge}%
\DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee}%
\DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap}%
@@ -11141,12 +11043,11 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{2322}{\ensuremath\frown}%
\DeclareUnicodeCharacter{2323}{\ensuremath\smile}%
%
- \DeclareUnicodeCharacter{25A1}{\ensuremath\Box}%
\DeclareUnicodeCharacter{25B3}{\ensuremath\triangle}%
\DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright}%
\DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown}%
\DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft}%
- \DeclareUnicodeCharacter{25C7}{\ensuremath\Diamond}%
+ \DeclareUnicodeCharacter{25C7}{\ensuremath\diamond}%
\DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit}%
\DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}%
\DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}%
@@ -11168,7 +11069,6 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes}%
\DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus}%
\DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup}%
- \DeclareUnicodeCharacter{2A1D}{\ensuremath\Join}%
\DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg}%
\DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq}%
\DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq}%
@@ -11241,21 +11141,14 @@ directory should work if nowhere else does.}
\relax
}
-% define all Unicode characters we know about, for the sake of @U.
+% Define all Unicode characters we know about. This makes UTF-8 the default
+% input encoding and allows @U to work.
\iftxinativeunicodecapable
\nativeunicodechardefsatu
\else
\utfeightchardefs
\fi
-
-% Make non-ASCII characters printable again for compatibility with
-% existing Texinfo documents that may use them, even without declaring a
-% document encoding.
-%
-\setnonasciicharscatcode \other
-
-
\message{formatting,}
\newdimen\defaultparindent \defaultparindent = 15pt
@@ -11323,6 +11216,7 @@ directory should work if nowhere else does.}
\pdfvorigin = 1 true in
\else
\ifx\XeTeXrevision\thisisundefined
+ \special{papersize=#8,#7}%
\else
\pdfpageheight #7\relax
\pdfpagewidth #8\relax
@@ -11360,7 +11254,6 @@ directory should work if nowhere else does.}
%
\lispnarrowing = 0.3in
\tolerance = 700
- \hfuzz = 1pt
\contentsrightmargin = 0pt
\defbodyindent = .5cm
}}
@@ -11378,7 +11271,6 @@ directory should work if nowhere else does.}
%
\lispnarrowing = 0.25in
\tolerance = 700
- \hfuzz = 1pt
\contentsrightmargin = 0pt
\defbodyindent = .4cm
}}
@@ -11404,7 +11296,6 @@ directory should work if nowhere else does.}
{297mm}{210mm}%
%
\tolerance = 700
- \hfuzz = 1pt
\contentsrightmargin = 0pt
\defbodyindent = 5mm
}}
@@ -11423,7 +11314,6 @@ directory should work if nowhere else does.}
%
\lispnarrowing = 0.2in
\tolerance = 800
- \hfuzz = 1.2pt
\contentsrightmargin = 0pt
\defbodyindent = 2mm
\tableindent = 12mm
@@ -11465,9 +11355,11 @@ directory should work if nowhere else does.}
%
\dimen0 = #1\relax
\advance\dimen0 by \voffset
+ \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page
%
\dimen2 = \hsize
\advance\dimen2 by \normaloffset
+ \advance\dimen2 by 1in % reference point is 1 inch from left edge of page
%
\internalpagesizes{#1}{\hsize}%
{\voffset}{\normaloffset}%
@@ -11479,6 +11371,9 @@ directory should work if nowhere else does.}
%
\letterpaper
+% Default value of \hfuzz, for suppressing warnings about overfull hboxes.
+\hfuzz = 1pt
+
\message{and turning on texinfo input format.}
@@ -11569,11 +11464,9 @@ directory should work if nowhere else does.}
% \backslashcurfont outputs one backslash character in current font,
% as in \char`\\.
\global\chardef\backslashcurfont=`\\
-\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
-% \realbackslash is an actual character `\' with catcode other, and
-% \doublebackslash is two of them (for the pdf outlines).
-{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
+% \realbackslash is an actual character `\' with catcode other.
+{\catcode`\\=\other @gdef@realbackslash{\}}
% In Texinfo, backslash is an active character; it prints the backslash
% in fixed width font.
@@ -11591,10 +11484,8 @@ directory should work if nowhere else does.}
@def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
@let@backslashchar = @ttbackslash % @backslashchar{} is for user documents.
-% \rawbackslash defines an active \ to do \backslashcurfont.
% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other. We switch back and forth between these.
-@gdef@rawbackslash{@let\=@backslashcurfont}
+% catcode other.
@gdef@otherbackslash{@let\=@realbackslash}
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
@@ -11644,6 +11535,9 @@ directory should work if nowhere else does.}
@def ^^M{@let^^M@secondlinenl}%
% Definition for a newline in the main Texinfo file.
@gdef @secondlinenl{@fixbackslash}%
+ % In case the first line has a whole-line command on it
+ @let@originalparsearg@parsearg
+ @def@parsearg{@fixbackslash@originalparsearg}
}}
{@catcode`@^=7 @catcode`@^^M=13%
@@ -11663,7 +11557,8 @@ directory should work if nowhere else does.}
@ifx\@eatinput @let\ = @ttbackslash @fi
@catcode13=5 % regular end of line
@enableemergencynewline
- @let@c=@texinfoc
+ @let@c=@comment
+ @let@parsearg@originalparsearg
% Also turn back on active characters that might appear in the input
% file name, in case not using a pre-dumped format.
@catcode`+=@active
@@ -11708,7 +11603,7 @@ directory should work if nowhere else does.}
@markupsetuprqdefault
@c Local variables:
-@c eval: (add-hook 'write-file-hooks 'time-stamp)
+@c eval: (add-hook 'before-save-hook 'time-stamp)
@c page-delimiter: "^\\\\message\\|emacs-page"
@c time-stamp-start: "def\\\\texinfoversion{"
@c time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -11717,7 +11612,4 @@ directory should work if nowhere else does.}
@c vim:sw=2:
-@ignore
- arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
-@end ignore
@enablebackslashhack
diff --git a/macros/texinfo/texinfo/config.in b/macros/texinfo/texinfo/config.in
index c3f628730a..ba46089c52 100644
--- a/macros/texinfo/texinfo/config.in
+++ b/macros/texinfo/texinfo/config.in
@@ -165,13 +165,14 @@
/* Define to 1 if you have the `btowc' function. */
#undef HAVE_BTOWC
-/* Define to 1 if you have the `bzero' function. */
-#undef HAVE_BZERO
-
/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
+/* Define to 1 if you have the Mac OS X function
+ CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
+
/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
@@ -207,10 +208,6 @@
otherwise. */
#undef HAVE_DECL_MBSWIDTH_IN_WCHAR_H
-/* Define to 1 if you have the declaration of `memchr', and to 0 if you don't.
- */
-#undef HAVE_DECL_MEMCHR
-
/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
don't. */
#undef HAVE_DECL_MEMRCHR
@@ -223,18 +220,10 @@
and to 0 if you don't. */
#undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
-/* Define to 1 if you have the declaration of `strcoll', and to 0 if you
- don't. */
-#undef HAVE_DECL_STRCOLL
-
/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't.
*/
#undef HAVE_DECL_STRDUP
-/* Define to 1 if you have the declaration of `strerror', and to 0 if you
- don't. */
-#undef HAVE_DECL_STRERROR
-
/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
don't. */
#undef HAVE_DECL_STRERROR_R
@@ -271,21 +260,12 @@
*/
#undef HAVE_DECL___ARGV
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
/* Define to 1 if the system has the type `error_t'. */
#undef HAVE_ERROR_T
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
/* Define to 1 if you have the <features.h> header file. */
#undef HAVE_FEATURES_H
-/* Define to 1 if you have the `getcwd' function. */
-#undef HAVE_GETCWD
-
/* Define to 1 if you have the `getexecname' function. */
#undef HAVE_GETEXECNAME
@@ -338,9 +318,6 @@
/* Define to 1 if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H
-/* Define to 1 if you have the `bsd' library (-lbsd). */
-#undef HAVE_LIBBSD
-
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
@@ -372,11 +349,8 @@
/* Define to 1 if <wchar.h> declares mbstate_t. */
#undef HAVE_MBSTATE_T
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
+/* Define to 1 if you have the `mbtowc' function. */
+#undef HAVE_MBTOWC
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -387,9 +361,6 @@
/* Define to 1 if you have the `memrchr' function. */
#undef HAVE_MEMRCHR
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
/* Define to 1 if you have the `mprotect' function. */
#undef HAVE_MPROTECT
@@ -422,9 +393,6 @@
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
-/* Define to 1 if you have the `setvbuf' function. */
-#undef HAVE_SETVBUF
-
/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION
@@ -440,9 +408,6 @@
/* Define to 1 if you have the `sigprocmask' function. */
#undef HAVE_SIGPROCMASK
-/* Define to 1 if you have the `sigsetmask' function. */
-#undef HAVE_SIGSETMASK
-
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
@@ -470,19 +435,9 @@
/* Define to 1 if you have the `strcasestr' function. */
#undef HAVE_STRCASESTR
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strcoll' function and it is properly defined.
- */
-#undef HAVE_STRCOLL
-
/* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
/* Define to 1 if you have the `strerror_r' function. */
#undef HAVE_STRERROR_R
@@ -510,12 +465,6 @@
/* Define to 1 if you have the <sys/cdefs.h> header file. */
#undef HAVE_SYS_CDEFS_H
-/* Define to 1 if you have the <sys/fcntl.h> header file. */
-#undef HAVE_SYS_FCNTL_H
-
-/* Define to 1 if you have the <sys/file.h> header file. */
-#undef HAVE_SYS_FILE_H
-
/* Define to 1 if you have the <sys/inttypes.h> header file. */
#undef HAVE_SYS_INTTYPES_H
@@ -525,24 +474,15 @@
/* Define to 1 if you have the <sys/mman.h> header file. */
#undef HAVE_SYS_MMAN_H
-/* Define to 1 if you have the <sys/ptem.h> header file. */
-#undef HAVE_SYS_PTEM_H
-
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
-/* Define to 1 if you have the <sys/stream.h> header file. */
-#undef HAVE_SYS_STREAM_H
-
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
-/* Define to 1 if you have the <sys/ttold.h> header file. */
-#undef HAVE_SYS_TTOLD_H
-
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
@@ -555,8 +495,8 @@
/* Define to 1 if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H
-/* Define to 1 if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
+/* Define to 1 if you have the <threads.h> header file. */
+#undef HAVE_THREADS_H
/* Define to 1 if you have the `towlower' function. */
#undef HAVE_TOWLOWER
@@ -576,9 +516,6 @@
/* Define to 1 if you have the `vasprintf' function. */
#undef HAVE_VASPRINTF
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
/* Define to 1 if you have the <wchar.h> header file. */
#undef HAVE_WCHAR_H
@@ -699,9 +636,6 @@
/* Define if vasnprintf exists but is overridden by gnulib. */
#undef REPLACE_VASNPRINTF
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
'sig_atomic_t'. */
#undef SIG_ATOMIC_T_SUFFIX
@@ -724,18 +658,12 @@
STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-#undef STAT_MACROS_BROKEN
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 if strerror_r returns char *. */
#undef STRERROR_R_CHAR_P
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
/* Define if the POSIX multithreading library can be used. */
#undef USE_POSIX_THREADS
@@ -743,20 +671,6 @@
weak. */
#undef USE_POSIX_THREADS_WEAK
-/* Define if the GNU Pth multithreading library can be used. */
-#undef USE_PTH_THREADS
-
-/* Define if references to the GNU Pth multithreading library should be made
- weak. */
-#undef USE_PTH_THREADS_WEAK
-
-/* Define if the old Solaris multithreading library can be used. */
-#undef USE_SOLARIS_THREADS
-
-/* Define if references to the old Solaris multithreading library should be
- made weak. */
-#undef USE_SOLARIS_THREADS_WEAK
-
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
@@ -867,10 +781,13 @@
/* The _Noreturn keyword of C11. */
#ifndef _Noreturn
-# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# if (defined __cplusplus \
+ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
+ || (defined _MSC_VER && 1900 <= _MSC_VER)))
# define _Noreturn [[noreturn]]
-# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
- || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+# elif ((!defined __cplusplus || defined __clang__) \
+ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
+ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)))
/* _Noreturn works as-is. */
# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
# define _Noreturn __attribute__ ((__noreturn__))
@@ -912,8 +829,32 @@
/* Define so that glibc/gnulib argp.h does not typedef error_t. */
#undef __error_t_defined
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* The _GL_ASYNC_SAFE marker should be attached to functions that are
+ signal handlers (for signals other than SIGABRT, SIGPIPE) or can be
+ invoked from such signal handlers. Such functions have some restrictions:
+ * All functions that it calls should be marked _GL_ASYNC_SAFE as well,
+ or should be listed as async-signal-safe in POSIX
+ <http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04>
+ section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in
+ particular, are NOT async-signal-safe.
+ * All memory locations (variables and struct fields) that these functions
+ access must be marked 'volatile'. This holds for both read and write
+ accesses. Otherwise the compiler might optimize away stores to and
+ reads from such locations that occur in the program, depending on its
+ data flow analysis. For example, when the program contains a loop
+ that is intended to inspect a variable set from within a signal handler
+ while (!signal_occurred)
+ ;
+ the compiler is allowed to transform this into an endless loop if the
+ variable 'signal_occurred' is not declared 'volatile'.
+ Additionally, recall that:
+ * A signal handler should not modify errno (except if it is a handler
+ for a fatal signal and ends by raising the same signal again, thus
+ provoking the termination of the process). If it invokes a function
+ that may clobber errno, it needs to save and restore the value of
+ errno. */
+#define _GL_ASYNC_SAFE
+
/* Define to a type to use for 'error_t' if it is not otherwise available. */
#undef error_t
diff --git a/macros/texinfo/texinfo/configure b/macros/texinfo/texinfo/configure
index 836a2057a5..81c146abb4 100644
--- a/macros/texinfo/texinfo/configure
+++ b/macros/texinfo/texinfo/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU Texinfo 6.6.
+# Generated by GNU Autoconf 2.69 for GNU Texinfo 6.7.
#
# Report bugs to <bug-texinfo@gnu.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU Texinfo'
PACKAGE_TARNAME='texinfo'
-PACKAGE_VERSION='6.6'
-PACKAGE_STRING='GNU Texinfo 6.6'
+PACKAGE_VERSION='6.7'
+PACKAGE_STRING='GNU Texinfo 6.7'
PACKAGE_BUGREPORT='bug-texinfo@gnu.org'
PACKAGE_URL='http://www.gnu.org/software/texinfo/'
@@ -623,6 +623,7 @@ ac_includes_default="\
#endif"
gl_use_threads_default=
+gl_use_winpthreads_default=
gl_getopt_required=POSIX
ac_header_list=
ac_func_list=
@@ -634,6 +635,7 @@ gl_LIBOBJS
am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
+LIBOBJS
HOST_IS_WINDOWS_FALSE
HOST_IS_WINDOWS_TRUE
POD_SIMPLE_TEXINFO_TESTS_FALSE
@@ -651,11 +653,11 @@ POSUB
INTLLIBS
INTL_MACOSX_LIBS
XGETTEXT_EXTRA_OPTIONS
+MSGMERGE_FOR_MSGFMT_OPTION
MSGMERGE
XGETTEXT_015
XGETTEXT
GMSGFMT_015
-MSGFMT_015
GMSGFMT
MSGFMT
GETTEXT_MACRO_VERSION
@@ -674,7 +676,6 @@ TOOLS_ONLY_TRUE
native_tools
have_ptys_FALSE
have_ptys_TRUE
-LIBOBJS
DIFF_A_OPTION
DIFF_U_OPTION
MKINSTALLDIRS
@@ -686,6 +687,14 @@ LIBGNU_LIBDEPS
gltests_WITNESS
gl_GNULIB_ENABLED_xsize_FALSE
gl_GNULIB_ENABLED_xsize_TRUE
+gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef_FALSE
+gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef_TRUE
+gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354_FALSE
+gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354_TRUE
+gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab_FALSE
+gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab_TRUE
+gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440_FALSE
+gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440_TRUE
gl_GNULIB_ENABLED_wcrtomb_FALSE
gl_GNULIB_ENABLED_wcrtomb_TRUE
gl_GNULIB_ENABLED_vasnprintf_FALSE
@@ -740,9 +749,6 @@ LTLIBMULTITHREAD
LIBMULTITHREAD
LTLIBTHREAD
LIBTHREAD
-LIBPTH_PREFIX
-LTLIBPTH
-LIBPTH
NEXT_AS_FIRST_DIRECTIVE_LOCALE_H
NEXT_LOCALE_H
HAVE_XLOCALE_H
@@ -1120,11 +1126,14 @@ GNULIB_WCTOB
GNULIB_BTOWC
REPLACE_WCTOMB
REPLACE_UNSETENV
+REPLACE_STRTOLD
REPLACE_STRTOD
+REPLACE_SETSTATE
REPLACE_SETENV
REPLACE_REALPATH
REPLACE_REALLOC
REPLACE_RANDOM_R
+REPLACE_RANDOM
REPLACE_QSORT_R
REPLACE_PUTENV
REPLACE_PTSNAME_R
@@ -1132,6 +1141,7 @@ REPLACE_PTSNAME
REPLACE_MKSTEMP
REPLACE_MBTOWC
REPLACE_MALLOC
+REPLACE_INITSTATE
REPLACE_CANONICALIZE_FILE_NAME
REPLACE_CALLOC
HAVE_DECL_UNSETENV
@@ -1140,8 +1150,10 @@ HAVE_SYS_LOADAVG_H
HAVE_STRUCT_RANDOM_DATA
HAVE_STRTOULL
HAVE_STRTOLL
+HAVE_STRTOLD
HAVE_STRTOD
HAVE_DECL_SETSTATE
+HAVE_SETSTATE
HAVE_DECL_SETENV
HAVE_SETENV
HAVE_SECURE_GETENV
@@ -1160,7 +1172,9 @@ HAVE_MKSTEMP
HAVE_MKOSTEMPS
HAVE_MKOSTEMP
HAVE_MKDTEMP
+HAVE_MBTOWC
HAVE_DECL_INITSTATE
+HAVE_INITSTATE
HAVE_GRANTPT
HAVE_GETSUBOPT
HAVE_DECL_GETLOADAVG
@@ -1173,6 +1187,7 @@ GNULIB_UNLOCKPT
GNULIB_SYSTEM_POSIX
GNULIB_STRTOULL
GNULIB_STRTOLL
+GNULIB_STRTOLD
GNULIB_STRTOD
GNULIB_SETENV
GNULIB_SECURE_GETENV
@@ -1315,6 +1330,7 @@ HAVE_FACCESSAT
HAVE_EUIDACCESS
HAVE_DUP3
HAVE_DUP2
+HAVE_COPY_FILE_RANGE
HAVE_CHOWN
GNULIB_WRITE
GNULIB_USLEEP
@@ -1363,6 +1379,7 @@ GNULIB_ENVIRON
GNULIB_DUP3
GNULIB_DUP2
GNULIB_DUP
+GNULIB_COPY_FILE_RANGE
GNULIB_CLOSE
GNULIB_CHOWN
GNULIB_CHDIR
@@ -1390,6 +1407,7 @@ INCLUDE_NEXT
GL_GENERATE_ARGZ_H_FALSE
GL_GENERATE_ARGZ_H_TRUE
ARGZ_H
+HAVE_ALLOCA_H
GL_GENERATE_ALLOCA_H_FALSE
GL_GENERATE_ALLOCA_H_TRUE
ALLOCA_H
@@ -1480,6 +1498,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -1510,7 +1529,6 @@ with_gnu_ld
enable_rpath
with_libiconv_prefix
with_included_regex
-with_libpth_prefix
enable_multiplatform
enable_install_warnings
with_external_Unicode_EastAsianWidth
@@ -1575,6 +1593,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1827,6 +1846,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1964,7 +1992,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -2077,7 +2105,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU Texinfo 6.6 to adapt to many kinds of systems.
+\`configure' configures GNU Texinfo 6.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2117,6 +2145,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2147,7 +2176,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Texinfo 6.6:";;
+ short | recursive ) echo "Configuration of GNU Texinfo 6.7:";;
esac
cat <<\_ACEOF
@@ -2161,7 +2190,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
- --enable-threads={posix|solaris|pth|windows}
+ --enable-threads={posix|windows}
specify multithreading API
--disable-threads build without multithread safety
--disable-rpath do not hardcode runtime library paths
@@ -2188,8 +2217,6 @@ Optional Packages:
don't compile regex; this is the default on systems
with recent-enough versions of the GNU C Library
(use with caution on other systems).
- --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib
- --without-libpth-prefix don't search for libpth in includedir and libdir
--with-external-Unicode-EastAsianWidth
use external Unicode-EastAsianWidth (default: no)
--with-external-Text-Unidecode
@@ -2285,7 +2312,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Texinfo configure 6.6
+GNU Texinfo configure 6.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2994,7 +3021,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU Texinfo $as_me 6.6, which was
+It was created by GNU Texinfo $as_me 6.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3303,6 +3330,7 @@ as_fn_append ac_func_list " wcwidth"
as_fn_append ac_func_list " btowc"
as_fn_append ac_header_list " langinfo.h"
as_fn_append ac_header_list " xlocale.h"
+as_fn_append ac_header_list " threads.h"
as_fn_append ac_func_list " _set_invalid_parameter_handler"
as_fn_append ac_func_list " nl_langinfo"
as_fn_append ac_header_list " sys/socket.h"
@@ -3895,7 +3923,7 @@ fi
# Define the identity of the package.
PACKAGE='texinfo'
- VERSION='6.6'
+ VERSION='6.7'
cat >>confdefs.h <<_ACEOF
@@ -6437,6 +6465,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
# Check whether --enable-threads was given.
if test "${enable_threads+set}" = set; then :
enableval=$enable_threads; gl_use_threads=$enableval
@@ -6445,13 +6474,20 @@ else
gl_use_threads="$gl_use_threads_default"
else
case "$host_os" in
- osf*) gl_use_threads=no ;;
- cygwin*)
+ osf*) gl_use_threads=no ;;
+ cygwin*)
case `uname -r` in
1.[0-5].*) gl_use_threads=no ;;
*) gl_use_threads=yes ;;
esac
;;
+ mingw*)
+ case "$gl_use_winpthreads_default" in
+ yes) gl_use_threads=posix ;;
+ no) gl_use_threads=windows ;;
+ *) gl_use_threads=yes ;;
+ esac
+ ;;
*) gl_use_threads=yes ;;
esac
fi
@@ -6587,6 +6623,10 @@ fi
# Code from module wcrtomb:
# Code from module wctype-h:
# Code from module wcwidth:
+ # Code from module windows-mutex:
+ # Code from module windows-once:
+ # Code from module windows-recmutex:
+ # Code from module windows-rwlock:
# Code from module xalloc:
# Code from module xalloc-die:
# Code from module xalloc-oversized:
@@ -6599,6 +6639,7 @@ fi
+
LIBC_FATAL_STDERR_=1
export LIBC_FATAL_STDERR_
@@ -7482,6 +7523,7 @@ fi
GNULIB_CHDIR=0;
GNULIB_CHOWN=0;
GNULIB_CLOSE=0;
+ GNULIB_COPY_FILE_RANGE=0;
GNULIB_DUP=0;
GNULIB_DUP2=0;
GNULIB_DUP3=0;
@@ -7530,6 +7572,7 @@ fi
GNULIB_USLEEP=0;
GNULIB_WRITE=0;
HAVE_CHOWN=1;
+ HAVE_COPY_FILE_RANGE=1;
HAVE_DUP2=1;
HAVE_DUP3=1;
HAVE_EUIDACCESS=1;
@@ -10180,6 +10223,7 @@ fi
GNULIB_SECURE_GETENV=0;
GNULIB_SETENV=0;
GNULIB_STRTOD=0;
+ GNULIB_STRTOLD=0;
GNULIB_STRTOLL=0;
GNULIB_STRTOULL=0;
GNULIB_SYSTEM_POSIX=0;
@@ -10192,7 +10236,9 @@ fi
HAVE_DECL_GETLOADAVG=1;
HAVE_GETSUBOPT=1;
HAVE_GRANTPT=1;
+ HAVE_INITSTATE=1;
HAVE_DECL_INITSTATE=1;
+ HAVE_MBTOWC=1;
HAVE_MKDTEMP=1;
HAVE_MKOSTEMP=1;
HAVE_MKOSTEMPS=1;
@@ -10211,8 +10257,10 @@ fi
HAVE_SECURE_GETENV=1;
HAVE_SETENV=1;
HAVE_DECL_SETENV=1;
+ HAVE_SETSTATE=1;
HAVE_DECL_SETSTATE=1;
HAVE_STRTOD=1;
+ HAVE_STRTOLD=1;
HAVE_STRTOLL=1;
HAVE_STRTOULL=1;
HAVE_STRUCT_RANDOM_DATA=1;
@@ -10221,6 +10269,7 @@ fi
HAVE_DECL_UNSETENV=1;
REPLACE_CALLOC=0;
REPLACE_CANONICALIZE_FILE_NAME=0;
+ REPLACE_INITSTATE=0;
REPLACE_MALLOC=0;
REPLACE_MBTOWC=0;
REPLACE_MKSTEMP=0;
@@ -10228,11 +10277,14 @@ fi
REPLACE_PTSNAME_R=0;
REPLACE_PUTENV=0;
REPLACE_QSORT_R=0;
+ REPLACE_RANDOM=0;
REPLACE_RANDOM_R=0;
REPLACE_REALLOC=0;
REPLACE_REALPATH=0;
REPLACE_SETENV=0;
+ REPLACE_SETSTATE=0;
REPLACE_STRTOD=0;
+ REPLACE_STRTOLD=0;
REPLACE_UNSETENV=0;
REPLACE_WCTOMB=0;
@@ -10290,11 +10342,11 @@ else
if test "$cross_compiling" = yes; then :
case "$host_os" in
# Guess yes on platforms where we know the result.
- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
+ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
| hpux* | solaris* | cygwin* | mingw*)
- ac_cv_func_malloc_0_nonnull=yes ;;
+ ac_cv_func_malloc_0_nonnull="guessing yes" ;;
# If we don't know, assume the worst.
- *) ac_cv_func_malloc_0_nonnull=no ;;
+ *) ac_cv_func_malloc_0_nonnull="guessing no" ;;
esac
else
@@ -10331,11 +10383,14 @@ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
- if test $ac_cv_func_malloc_0_nonnull = yes; then :
- gl_cv_func_malloc_0_nonnull=1
-else
- gl_cv_func_malloc_0_nonnull=0
-fi
+ case "$ac_cv_func_malloc_0_nonnull" in
+ *yes)
+ gl_cv_func_malloc_0_nonnull=1
+ ;;
+ *)
+ gl_cv_func_malloc_0_nonnull=0
+ ;;
+ esac
cat >>confdefs.h <<_ACEOF
@@ -11263,6 +11318,8 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
# memchr should not dereference overestimated length after a match
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737
# https://sourceware.org/bugzilla/show_bug.cgi?id=10162
+ # memchr should cast the second argument to 'unsigned char'.
+ # This bug exists in Android 4.3.
# Assume that memchr works on platforms that lack mprotect.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
$as_echo_n "checking whether memchr works... " >&6; }
@@ -11271,10 +11328,12 @@ if ${gl_cv_func_memchr_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on native Windows.
- mingw*) gl_cv_func_memchr_works="guessing yes" ;;
- # Be pessimistic for now.
- *) gl_cv_func_memchr_works="guessing no" ;;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_memchr_works="guessing no" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_memchr_works="guessing yes" ;;
+ # Be pessimistic for now.
+ *) gl_cv_func_memchr_works="guessing no" ;;
esac
else
@@ -11327,6 +11386,15 @@ main ()
if (memchr (fence - 1, 0, 3) != fence - 1)
result |= 4;
}
+ /* Test against bug on Android 4.3. */
+ {
+ char input[3];
+ input[0] = 'a';
+ input[1] = 'b';
+ input[2] = 'c';
+ if (memchr (input, 0x789abc00 | 'b', 3) != input + 1)
+ result |= 8;
+ }
return result;
;
@@ -12695,6 +12763,8 @@ else
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;;
# Guess yes on native Windows.
mingw*) gl_cv_func_strerror_0_works="guessing yes" ;;
# If we don't know, assume the worst.
@@ -13341,6 +13411,8 @@ $as_echo "$gt_cv_locale_fr" >&6; }
+
+
gl_threads_api=none
LIBTHREAD=
LTLIBTHREAD=
@@ -13416,74 +13488,10 @@ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
$as_echo "$gl_cv_have_weak" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports --as-needed" >&5
-$as_echo_n "checking whether the linker supports --as-needed... " >&6; }
-if ${gl_cv_linker_have_as_needed+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$GCC"; then
- gl_saved_ldflags="$LDFLAGS"
- LDFLAGS="$gl_saved_ldflags -Wl,--as-needed -Wl,--no-as-needed"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gl_cv_linker_have_as_needed=yes
-else
- gl_cv_linker_have_as_needed=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$gl_saved_ldflags"
- else
- gl_cv_linker_have_as_needed=no
- fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_linker_have_as_needed" >&5
-$as_echo "$gl_cv_linker_have_as_needed" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports --push-state" >&5
-$as_echo_n "checking whether the linker supports --push-state... " >&6; }
-if ${gl_cv_linker_have_push_state+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$GCC"; then
- gl_saved_ldflags="$LDFLAGS"
- LDFLAGS="$gl_saved_ldflags -Wl,--push-state -Wl,--pop-state"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gl_cv_linker_have_push_state=yes
-else
- gl_cv_linker_have_push_state=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$gl_saved_ldflags"
- else
- gl_cv_linker_have_push_state=no
- fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_linker_have_push_state" >&5
-$as_echo "$gl_cv_linker_have_push_state" >&6; }
+ :
+ fi
if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
# On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
# it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
@@ -13696,647 +13704,9 @@ $as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
LIBTHREAD=
LTLIBTHREAD=
- case "$LIBMULTITHREAD" in
- "") ;;
- -pthread)
- if test $gl_cv_linker_have_as_needed = yes; then
- if test $gl_cv_linker_have_push_state = yes; then
- LIBMULTITHREAD="$LIBMULTITHREAD -Wl,--push-state -Wl,--no-as-needed -lpthread -Wl,--pop-state"
- else
- LIBMULTITHREAD="$LIBMULTITHREAD -Wl,--no-as-needed -lpthread"
- fi
- fi
- ;;
- *)
- if test $gl_cv_linker_have_as_needed = yes; then
- if test $gl_cv_linker_have_push_state = yes; then
- LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state"
- else
- LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD"
- fi
- fi
- ;;
- esac
- # TODO: May need to modify LTLIBMULTITHREAD similarly.
- fi
- fi
- fi
- fi
- fi
- if test -z "$gl_have_pthread"; then
- if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
- gl_have_solaristhread=
- gl_save_LIBS="$LIBS"
- LIBS="$LIBS -lthread"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <thread.h>
-#include <synch.h>
-
-int
-main ()
-{
-thr_self();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gl_have_solaristhread=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gl_save_LIBS"
- if test -n "$gl_have_solaristhread"; then
- gl_threads_api=solaris
- LIBTHREAD=-lthread
- LTLIBTHREAD=-lthread
- LIBMULTITHREAD="$LIBTHREAD"
- LTLIBMULTITHREAD="$LTLIBTHREAD"
-
-$as_echo "#define USE_SOLARIS_THREADS 1" >>confdefs.h
-
- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-
-$as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h
-
- LIBTHREAD=
- LTLIBTHREAD=
- if test $gl_cv_linker_have_as_needed = yes; then
- if test $gl_cv_linker_have_push_state = yes; then
- LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state"
- else
- LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD"
- fi
- fi
- # TODO: May need to modify LTLIBMULTITHREAD similarly.
- fi
- fi
- fi
- fi
- if test "$gl_use_threads" = pth; then
- gl_save_CPPFLAGS="$CPPFLAGS"
-
-
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5
-$as_echo_n "checking how to link with libpth... " >&6; }
-if ${ac_cv_libpth_libs+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-
-
-
-
-
-
- use_additional=yes
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
-
-# Check whether --with-libpth-prefix was given.
-if test "${with_libpth_prefix+set}" = set; then :
- withval=$with_libpth_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && test ! -d "$withval/$acl_libdirstem"; then
- additional_libdir="$withval/$acl_libdirstem2"
- fi
- fi
- fi
-
-fi
-
- LIBPTH=
- LTLIBPTH=
- INCPTH=
- LIBPTH_PREFIX=
- HAVE_LIBPTH=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='pth '
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIBPTH="${LIBPTH}${LIBPTH:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$value"
- else
- :
- fi
- else
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no \
- || test "X$found_dir" = "X/usr/$acl_libdirstem" \
- || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- if test "$acl_hardcode_direct" = yes; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- haveit=
- for x in $LDFLAGS $LIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }$found_a"
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir -l$name"
- fi
- fi
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- if test "$name" = 'pth'; then
- LIBPTH_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- */$acl_libdirstem2 | */$acl_libdirstem2/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
- if test "$name" = 'pth'; then
- LIBPTH_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INCPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- INCPTH="${INCPTH}${INCPTH:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- if test -n "$found_la"; then
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
- && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
- || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBPTH="${LIBPTH}${LIBPTH:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIBPTH; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- LIBPTH="${LIBPTH}${LIBPTH:+ }$dep"
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$dep"
- ;;
- esac
- done
- fi
- else
- LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
- else
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
- LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-R$found_dir"
- done
- fi
-
-
-
-
-
- ac_cv_libpth_libs="$LIBPTH"
- ac_cv_libpth_ltlibs="$LTLIBPTH"
- ac_cv_libpth_cppflags="$INCPTH"
- ac_cv_libpth_prefix="$LIBPTH_PREFIX"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libpth_libs" >&5
-$as_echo "$ac_cv_libpth_libs" >&6; }
- LIBPTH="$ac_cv_libpth_libs"
- LTLIBPTH="$ac_cv_libpth_ltlibs"
- INCPTH="$ac_cv_libpth_cppflags"
- LIBPTH_PREFIX="$ac_cv_libpth_prefix"
-
- for element in $INCPTH; do
- haveit=
- for x in $CPPFLAGS; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
-
-
-
-
- HAVE_LIBPTH=yes
-
-
-
- gl_have_pth=
- gl_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBPTH"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <pth.h>
-int
-main ()
-{
-pth_self();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gl_have_pth=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gl_save_LIBS"
- if test -n "$gl_have_pth"; then
- gl_threads_api=pth
- LIBTHREAD="$LIBPTH"
- LTLIBTHREAD="$LTLIBPTH"
- LIBMULTITHREAD="$LIBTHREAD"
- LTLIBMULTITHREAD="$LTLIBTHREAD"
-
-$as_echo "#define USE_PTH_THREADS 1" >>confdefs.h
-
- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-
-$as_echo "#define USE_PTH_THREADS_WEAK 1" >>confdefs.h
-
- LIBTHREAD=
- LTLIBTHREAD=
- if test $gl_cv_linker_have_as_needed = yes; then
- if test $gl_cv_linker_have_push_state = yes; then
- LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state"
- else
- LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD"
- fi
fi
- # TODO: May need to modify LTLIBMULTITHREAD similarly.
fi
fi
- else
- CPPFLAGS="$gl_save_CPPFLAGS"
fi
fi
if test -z "$gl_have_pthread"; then
@@ -14979,6 +14349,8 @@ else
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
@@ -15001,6 +14373,8 @@ else
netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on MSVC, no on mingw.
mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15189,6 +14563,13 @@ else
fi
+ if test $ac_cv_working_alloca_h = yes; then
+ HAVE_ALLOCA_H=1
+ else
+ HAVE_ALLOCA_H=0
+ fi
+
+
:
@@ -18508,6 +17889,8 @@ else
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_working_strerror="guessing yes" ;;
# If we don't know, assume the worst.
*) gl_cv_func_working_strerror="guessing no" ;;
esac
@@ -19426,7 +18809,7 @@ $as_echo "$gl_cv_func_wcwidth_macro" >&6; }
if test $ac_cv_func_wcwidth = yes || test $gl_cv_func_wcwidth_macro = yes; then
HAVE_WCWIDTH=1
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
$as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; }
if ${gl_cv_func_wcwidth_works+:} false; then :
$as_echo_n "(cached) " >&6
@@ -19435,9 +18818,13 @@ else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on glibc and AIX 7 systems.
- *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
- *) gl_cv_func_wcwidth_works="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_wcwidth_works="guessing yes";;
+ # Guess yes on AIX 7 systems.
+ aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
+ *) gl_cv_func_wcwidth_works="guessing no";;
esac
else
@@ -19465,7 +18852,7 @@ int wcwidth (int);
int main ()
{
int result = 0;
- if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
+ if (setlocale (LC_ALL, "en_US.UTF-8") != NULL)
{
if (wcwidth (0x0301) > 0)
result |= 1;
@@ -19475,6 +18862,8 @@ int main ()
result |= 4;
if (wcwidth (0xFF1A) == 0)
result |= 8;
+ if (wcwidth (0x2202) > 1)
+ result |= 16;
}
return result;
}
@@ -19556,6 +18945,10 @@ $as_echo "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h
gl_gnulib_enabled_threadlib=false
gl_gnulib_enabled_vasnprintf=false
gl_gnulib_enabled_wcrtomb=false
+ gl_gnulib_enabled_503a4cb75d69c787103d0aa2ab7d8440=false
+ gl_gnulib_enabled_68a4501daeca58988392c7e60b4917ab=false
+ gl_gnulib_enabled_f0efff84a70f4afba30902bb8ffe9354=false
+ gl_gnulib_enabled_8bb827fe37eaccf1b97feb0c87bc92ef=false
gl_gnulib_enabled_xsize=false
func_gl_gnulib_m4code_btowc ()
{
@@ -20578,6 +19971,18 @@ _ACEOF
gl_gnulib_enabled_lock=true
func_gl_gnulib_m4code_threadlib
+ if test $gl_threads_api = windows; then
+ func_gl_gnulib_m4code_503a4cb75d69c787103d0aa2ab7d8440
+ fi
+ if test $gl_threads_api = windows; then
+ func_gl_gnulib_m4code_68a4501daeca58988392c7e60b4917ab
+ fi
+ if test $gl_threads_api = windows; then
+ func_gl_gnulib_m4code_f0efff84a70f4afba30902bb8ffe9354
+ fi
+ if test $gl_threads_api = windows; then
+ func_gl_gnulib_m4code_8bb827fe37eaccf1b97feb0c87bc92ef
+ fi
fi
}
func_gl_gnulib_m4code_mbtowc ()
@@ -20586,11 +19991,26 @@ _ACEOF
- if false; then
- REPLACE_MBTOWC=1
+ for ac_func in mbtowc
+do :
+ ac_fn_c_check_func "$LINENO" "mbtowc" "ac_cv_func_mbtowc"
+if test "x$ac_cv_func_mbtowc" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_MBTOWC 1
+_ACEOF
+
+fi
+done
+
+ if test $ac_cv_func_mbtowc = no; then
+ HAVE_MBTOWC=0
+ else
+ if false; then
+ REPLACE_MBTOWC=1
+ fi
fi
- if test $REPLACE_MBTOWC = 1; then
+ if test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1; then
@@ -21397,9 +20817,6 @@ $as_echo "#define GNULIB_TEST_STRSTR 1" >>confdefs.h
{
if ! $gl_gnulib_enabled_threadlib; then
-
-
-
gl_gnulib_enabled_threadlib=true
fi
}
@@ -21677,13 +21094,70 @@ _ACEOF
else
if test $REPLACE_MBSTATE_T = 1; then
REPLACE_WCRTOMB=1
- else
+ fi
+ if test $REPLACE_WCRTOMB = 0; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb works in the C locale" >&5
+$as_echo_n "checking whether wcrtomb works in the C locale... " >&6; }
+if ${gl_cv_func_wcrtomb_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_wcrtomb_works="guessing no";;
+ # Guess yes otherwise.
+ *) gl_cv_func_wcrtomb_works="guessing yes";;
+ esac
+
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <string.h>
+#include <stdlib.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+ <wchar.h>.
+ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+ included before <wchar.h>. */
+#include <stddef.h>
+#include <stdio.h>
+#include <wchar.h>
+int main ()
+{
+ mbstate_t state;
+ char out[64];
+ int count;
+ memset (&state, 0, sizeof (state));
+ out[0] = 'x';
+ count = wcrtomb (out, L'a', &state);
+ return !(count == 1 && out[0] == 'a');
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ gl_cv_func_wcrtomb_works=yes
+else
+ gl_cv_func_wcrtomb_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_works" >&5
+$as_echo "$gl_cv_func_wcrtomb_works" >&6; }
+ case "$gl_cv_func_wcrtomb_works" in
+ *yes) ;;
+ *) REPLACE_WCRTOMB=1 ;;
+ esac
+ fi
+ if test $REPLACE_WCRTOMB = 0; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5
$as_echo_n "checking whether wcrtomb return value is correct... " >&6; }
if ${gl_cv_func_wcrtomb_retval+:} false; then :
$as_echo_n "(cached) " >&6
@@ -21794,6 +21268,90 @@ $as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h
gl_gnulib_enabled_wcrtomb=true
fi
}
+ func_gl_gnulib_m4code_503a4cb75d69c787103d0aa2ab7d8440 ()
+ {
+ if ! $gl_gnulib_enabled_503a4cb75d69c787103d0aa2ab7d8440; then
+
+ case "$host_os" in
+ mingw*)
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS windows-mutex.$ac_objext"
+
+ ;;
+ esac
+ gl_gnulib_enabled_503a4cb75d69c787103d0aa2ab7d8440=true
+ fi
+ }
+ func_gl_gnulib_m4code_68a4501daeca58988392c7e60b4917ab ()
+ {
+ if ! $gl_gnulib_enabled_68a4501daeca58988392c7e60b4917ab; then
+
+ case "$host_os" in
+ mingw*)
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS windows-once.$ac_objext"
+
+ ;;
+ esac
+ gl_gnulib_enabled_68a4501daeca58988392c7e60b4917ab=true
+ fi
+ }
+ func_gl_gnulib_m4code_f0efff84a70f4afba30902bb8ffe9354 ()
+ {
+ if ! $gl_gnulib_enabled_f0efff84a70f4afba30902bb8ffe9354; then
+
+ case "$host_os" in
+ mingw*)
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS windows-recmutex.$ac_objext"
+
+ ;;
+ esac
+ gl_gnulib_enabled_f0efff84a70f4afba30902bb8ffe9354=true
+ fi
+ }
+ func_gl_gnulib_m4code_8bb827fe37eaccf1b97feb0c87bc92ef ()
+ {
+ if ! $gl_gnulib_enabled_8bb827fe37eaccf1b97feb0c87bc92ef; then
+
+ case "$host_os" in
+ mingw*)
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS windows-rwlock.$ac_objext"
+
+ ;;
+ esac
+ gl_gnulib_enabled_8bb827fe37eaccf1b97feb0c87bc92ef=true
+ fi
+ }
func_gl_gnulib_m4code_xsize ()
{
if ! $gl_gnulib_enabled_xsize; then
@@ -21837,6 +21395,9 @@ done
if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
func_gl_gnulib_m4code_localcharset
fi
+ if test $HAVE_MBRTOWC = 0 || { test $REPLACE_MBRTOWC = 1 && { test $HAVE_MBSINIT = 0 || test $REPLACE_MBSTATE_T = 1; }; }; then
+ func_gl_gnulib_m4code_lock
+ fi
if test $ac_use_included_regex = yes; then
func_gl_gnulib_m4code_btowc
fi
@@ -22066,6 +21627,38 @@ else
gl_GNULIB_ENABLED_wcrtomb_FALSE=
fi
+ if $gl_gnulib_enabled_503a4cb75d69c787103d0aa2ab7d8440; then
+ gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440_TRUE=
+ gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440_FALSE='#'
+else
+ gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440_TRUE='#'
+ gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440_FALSE=
+fi
+
+ if $gl_gnulib_enabled_68a4501daeca58988392c7e60b4917ab; then
+ gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab_TRUE=
+ gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab_FALSE='#'
+else
+ gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab_TRUE='#'
+ gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab_FALSE=
+fi
+
+ if $gl_gnulib_enabled_f0efff84a70f4afba30902bb8ffe9354; then
+ gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354_TRUE=
+ gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354_FALSE='#'
+else
+ gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354_TRUE='#'
+ gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354_FALSE=
+fi
+
+ if $gl_gnulib_enabled_8bb827fe37eaccf1b97feb0c87bc92ef; then
+ gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef_TRUE=
+ gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef_FALSE='#'
+else
+ gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef_TRUE='#'
+ gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef_FALSE=
+fi
+
if $gl_gnulib_enabled_xsize; then
gl_GNULIB_ENABLED_xsize_TRUE=
gl_GNULIB_ENABLED_xsize_FALSE='#'
@@ -22213,218 +21806,10 @@ if test "z$diff_accepts_a_option" = 'zyes' ; then
fi
-# Needed on sysV68 for sigblock, sigsetmask. But check for it in libc first.
-ac_fn_c_check_func "$LINENO" "sigblock" "ac_cv_func_sigblock"
-if test "x$ac_cv_func_sigblock" = xyes; then :
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigblock in -lbsd" >&5
-$as_echo_n "checking for sigblock in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_sigblock+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sigblock ();
-int
-main ()
-{
-return sigblock ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_bsd_sigblock=yes
-else
- ac_cv_lib_bsd_sigblock=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_sigblock" >&5
-$as_echo "$ac_cv_lib_bsd_sigblock" >&6; }
-if test "x$ac_cv_lib_bsd_sigblock" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBSD 1
-_ACEOF
-
- LIBS="-lbsd $LIBS"
-
-fi
-
-fi
-
-
# Checks for header files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
-$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if ${ac_cv_header_stat_broken+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined S_ISBLK && defined S_IFDIR
-extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-#endif
-
-#if defined S_ISBLK && defined S_IFCHR
-extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-#endif
-
-#if defined S_ISLNK && defined S_IFREG
-extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-#endif
-
-#if defined S_ISSOCK && defined S_IFREG
-extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stat_broken=no
-else
- ac_cv_header_stat_broken=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-$as_echo "$ac_cv_header_stat_broken" >&6; }
-if test $ac_cv_header_stat_broken = yes; then
-
-$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-for ac_header in fcntl.h io.h limits.h pwd.h string.h strings.h \
- termcap.h termio.h termios.h unistd.h \
- sys/fcntl.h sys/file.h sys/ioctl.h sys/stream.h \
- sys/time.h sys/ttold.h sys/wait.h
+for ac_header in io.h pwd.h \
+ termcap.h termios.h unistd.h \
+ sys/ioctl.h sys/time.h sys/wait.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -22438,24 +21823,6 @@ fi
done
-# sys/ptem.h requires sys/stream.h for mblk_t on Solaris.
-for ac_header in sys/ptem.h
-do :
- ac_fn_c_check_header_compile "$LINENO" "sys/ptem.h" "ac_cv_header_sys_ptem_h" "#if HAVE_SYS_STREAM_H
-#include <sys/stream.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_ptem_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_PTEM_H 1
-_ACEOF
-
-fi
-
-done
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking POSIX termios" >&5
$as_echo_n "checking POSIX termios... " >&6; }
if ${ac_cv_sys_posix_termios+:} false; then :
@@ -22488,7 +21855,6 @@ fi
$as_echo "$ac_cv_sys_posix_termios" >&6; }
-# Checks for typedefs, structures, and compiler characteristics.
ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
if test "x$ac_cv_type_off_t" = xyes; then :
@@ -22500,253 +21866,9 @@ _ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_type_signal=int
-else
- ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this sort of thing. */
- typedef int charset[2];
- const charset cs = { 0, 0 };
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *pcpcc;
- char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++pcpcc;
- ppc = (char**) pcpcc;
- pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this sort of thing. */
- char tx;
- char *t = &tx;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; } bx;
- struct s *b = &bx; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- if (!foo) return 0;
- }
- return !cs[0] && !zero.x;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_const=yes
-else
- ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
- int *p = &tm.tm_sec;
- return !p;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_struct_tm=time.h
-else
- ac_cv_struct_tm=sys/time.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
-
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
-
-fi
-
-
-# Checks for function declarations.
-ac_fn_c_check_decl "$LINENO" "memchr" "ac_cv_have_decl_memchr" "$ac_includes_default"
-if test "x$ac_cv_have_decl_memchr" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MEMCHR $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "strcoll" "ac_cv_have_decl_strcoll" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strcoll" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRCOLL $ac_have_decl
-_ACEOF
-ac_fn_c_check_decl "$LINENO" "strerror" "ac_cv_have_decl_strerror" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strerror" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR $ac_have_decl
-_ACEOF
-
# Checks for library functions.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
-$as_echo_n "checking for working strcoll... " >&6; }
-if ${ac_cv_func_strcoll_works+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- ac_cv_func_strcoll_works=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-return (strcoll ("abc", "def") >= 0 ||
- strcoll ("ABC", "DEF") >= 0 ||
- strcoll ("123", "456") >= 0)
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_strcoll_works=yes
-else
- ac_cv_func_strcoll_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
-$as_echo "$ac_cv_func_strcoll_works" >&6; }
-if test $ac_cv_func_strcoll_works = yes; then
-
-$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h
-
-fi
-
-for ac_func in vprintf
-do :
- ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_VPRINTF 1
-_ACEOF
-
-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
-
-$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-
-fi
-
-fi
-done
-
-
-# in theory only pre-sysvr3 systems needed this and it's not likely
-# that anyone compiling new texinfo still has such a thing? we'll see.
-# AC_FUNC_SETVBUF_REVERSED
-for ac_func in bzero getcwd memset setlocale setvbuf sigaction sigprocmask \
- sigsetmask strchr posix_openpt
+for ac_func in setlocale sigaction sigprocmask posix_openpt
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -22758,59 +21880,6 @@ _ACEOF
fi
done
-ac_fn_c_check_func "$LINENO" "memcpy" "ac_cv_func_memcpy"
-if test "x$ac_cv_func_memcpy" = xyes; then :
- $as_echo "#define HAVE_MEMCPY 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" memcpy.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS memcpy.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes; then :
- $as_echo "#define HAVE_MEMMOVE 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" memmove.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS memmove.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
-if test "x$ac_cv_func_strdup" = xyes; then :
- $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" strdup.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
- $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
-
-else
- case " $LIBOBJS " in
- *" strerror.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS strerror.$ac_objext"
- ;;
-esac
-
-fi
-
-
# Used for Info tests
if test x$ac_cv_func_posix_openpt = xyes; then
@@ -23169,7 +22238,7 @@ $as_echo "$USE_NLS" >&6; }
- GETTEXT_MACRO_VERSION=0.19
+ GETTEXT_MACRO_VERSION=0.20
@@ -23284,12 +22353,7 @@ fi
- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-
- case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
*) GMSGFMT_015=$GMSGFMT ;;
esac
@@ -23441,7 +22505,15 @@ $as_echo "no" >&6; }
fi
- test -n "$localedir" || localedir='${datadir}/locale'
+ if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
+ MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
+ else
+ if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
+ MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
+ else
+ MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
+ fi
+ fi
test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
@@ -23473,7 +22545,6 @@ fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
@@ -23542,8 +22613,44 @@ $as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; }
+if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyPreferredLanguages();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_CFLocaleCopyPreferredLanguages=yes
+else
+ gt_cv_func_CFLocaleCopyPreferredLanguages=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+
+ fi
INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
fi
@@ -24941,7 +24048,7 @@ fi
# The config files to generate.
-ac_config_files="$ac_config_files Makefile doc/Makefile doc/tp_api/Makefile gnulib/lib/Makefile info/Makefile install-info/Makefile install-info/tests/Makefile man/Makefile po/Makefile.in po_document/Makefile.in util/Makefile texindex/Makefile tp/Makefile tp/Texinfo/ModulePath.pm tp/tests/Makefile tp/tests/many_input_files/Makefile tp/tests/sectioning/Makefile tp/tests/formatting/Makefile tp/tests/indices/Makefile tp/tests/contents/Makefile tp/tests/nested_formats/Makefile tp/tests/layout/Makefile tp/tests/tex_html/Makefile tp/defs Pod-Simple-Texinfo/Makefile"
+ac_config_files="$ac_config_files Makefile doc/Makefile doc/tp_api/Makefile gnulib/lib/Makefile info/Makefile install-info/Makefile install-info/tests/Makefile man/Makefile po/Makefile.in po_document/Makefile.in util/Makefile texindex/Makefile tp/Makefile tp/tests/Makefile tp/tests/many_input_files/Makefile tp/tests/sectioning/Makefile tp/tests/formatting/Makefile tp/tests/indices/Makefile tp/tests/contents/Makefile tp/tests/nested_formats/Makefile tp/tests/layout/Makefile tp/tests/tex_html/Makefile tp/defs Pod-Simple-Texinfo/Makefile"
ac_config_files="$ac_config_files pre-inst-env:build-aux/pre-inst-env.in"
@@ -25225,6 +24332,22 @@ if test -z "${gl_GNULIB_ENABLED_wcrtomb_TRUE}" && test -z "${gl_GNULIB_ENABLED_w
as_fn_error $? "conditional \"gl_GNULIB_ENABLED_wcrtomb\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440_TRUE}" && test -z "${gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440_FALSE}"; then
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab_TRUE}" && test -z "${gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab_FALSE}"; then
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354_TRUE}" && test -z "${gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354_FALSE}"; then
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef_TRUE}" && test -z "${gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef_FALSE}"; then
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${gl_GNULIB_ENABLED_xsize_TRUE}" && test -z "${gl_GNULIB_ENABLED_xsize_FALSE}"; then
as_fn_error $? "conditional \"gl_GNULIB_ENABLED_xsize\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -25694,7 +24817,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU Texinfo $as_me 6.6, which was
+This file was extended by GNU Texinfo $as_me 6.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25762,7 +24885,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNU Texinfo config.status 6.6
+GNU Texinfo config.status 6.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -25883,9 +25006,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
+ OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
@@ -25915,7 +25037,6 @@ do
"util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
"texindex/Makefile") CONFIG_FILES="$CONFIG_FILES texindex/Makefile" ;;
"tp/Makefile") CONFIG_FILES="$CONFIG_FILES tp/Makefile" ;;
- "tp/Texinfo/ModulePath.pm") CONFIG_FILES="$CONFIG_FILES tp/Texinfo/ModulePath.pm" ;;
"tp/tests/Makefile") CONFIG_FILES="$CONFIG_FILES tp/tests/Makefile" ;;
"tp/tests/many_input_files/Makefile") CONFIG_FILES="$CONFIG_FILES tp/tests/many_input_files/Makefile" ;;
"tp/tests/sectioning/Makefile") CONFIG_FILES="$CONFIG_FILES tp/tests/sectioning/Makefile" ;;
@@ -26654,14 +25775,11 @@ See \`config.log' for more details" "$LINENO" 5; }
if test -n "$OBSOLETE_ALL_LINGUAS"; then
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
fi
# Compute POFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
diff --git a/macros/texinfo/texinfo/configure.ac b/macros/texinfo/texinfo/configure.ac
index f67c520753..a6673d6da9 100644
--- a/macros/texinfo/texinfo/configure.ac
+++ b/macros/texinfo/texinfo/configure.ac
@@ -10,7 +10,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-AC_INIT([GNU Texinfo], [6.6], [bug-texinfo@gnu.org])
+AC_INIT([GNU Texinfo], [6.7], [bug-texinfo@gnu.org])
dnl Must come before AM_INIT_AUTOMAKE.
AC_CONFIG_AUX_DIR([build-aux])
@@ -139,44 +139,17 @@ if test "z$diff_accepts_a_option" = 'zyes' ; then
fi
AC_SUBST([DIFF_A_OPTION])
-# Needed on sysV68 for sigblock, sigsetmask. But check for it in libc first.
-AC_CHECK_FUNC(sigblock, , [AC_CHECK_LIB(bsd, sigblock)])
-
# Checks for header files.
-AC_HEADER_STAT
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h io.h limits.h pwd.h string.h strings.h \
- termcap.h termio.h termios.h unistd.h \
- sys/fcntl.h sys/file.h sys/ioctl.h sys/stream.h \
- sys/time.h sys/ttold.h sys/wait.h)
-
-# sys/ptem.h requires sys/stream.h for mblk_t on Solaris.
-AC_CHECK_HEADERS([sys/ptem.h],,,
-[#if HAVE_SYS_STREAM_H
-#include <sys/stream.h>
-#endif
-])
+AC_CHECK_HEADERS(io.h pwd.h \
+ termcap.h termios.h unistd.h \
+ sys/ioctl.h sys/time.h sys/wait.h)
AC_SYS_POSIX_TERMIOS
-# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_OFF_T
-AC_TYPE_SIGNAL
-AC_C_CONST
-AC_STRUCT_TM
-
-# Checks for function declarations.
-AC_CHECK_DECLS([memchr, strcoll, strerror])
# Checks for library functions.
-AC_FUNC_STRCOLL
-AC_FUNC_VPRINTF
-# in theory only pre-sysvr3 systems needed this and it's not likely
-# that anyone compiling new texinfo still has such a thing? we'll see.
-# AC_FUNC_SETVBUF_REVERSED
-AC_CHECK_FUNCS(bzero getcwd memset setlocale setvbuf sigaction sigprocmask \
- sigsetmask strchr posix_openpt)
-AC_REPLACE_FUNCS(memcpy memmove strdup strerror)
+AC_CHECK_FUNCS(setlocale sigaction sigprocmask posix_openpt)
# Used for Info tests
AM_CONDITIONAL([have_ptys], [test x$ac_cv_func_posix_openpt = xyes])
@@ -339,7 +312,7 @@ AC_SUBST([USE_EXTERNAL_UNIDECODE])
# i18n support. To update to a new version of gettext, run:
# gettextize -f --po-dir=po --po-dir=po_document
# See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html.
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20])
AM_GNU_GETTEXT([external])
USE_EXTERNAL_LIBINTL=no
@@ -507,7 +480,6 @@ AC_CONFIG_FILES([\
util/Makefile
texindex/Makefile
tp/Makefile
- tp/Texinfo/ModulePath.pm
tp/tests/Makefile
tp/tests/many_input_files/Makefile
tp/tests/sectioning/Makefile
diff --git a/macros/texinfo/texinfo/doc/Makefile.am b/macros/texinfo/texinfo/doc/Makefile.am
index e890e7bcbb..732833e299 100644
--- a/macros/texinfo/texinfo/doc/Makefile.am
+++ b/macros/texinfo/texinfo/doc/Makefile.am
@@ -19,6 +19,7 @@ MAKEINFO_ENVIRONMENT = TEXINFO_DEV_SOURCE=1 ; export TEXINFO_DEV_SOURCE ; \
top_srcdir="$(top_srcdir)" ; export top_srcdir ; \
top_builddir="$(top_builddir)" ; export top_builddir ;
MAKEINFO = $(MAKEINFO_ENVIRONMENT) $(PERL) $(top_builddir)/tp/texi2any
+TEXI2DVI = $(top_srcdir)/util/texi2dvi
# We'd also like to use something like this, but Automake calls
# "install-info" directly.
@@ -63,6 +64,7 @@ install-tex:
test -n "$(TEXMF)" || (echo "TEXMF must be set." >&2; exit 1)
$(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips)
$(INSTALL_DATA) $(srcdir)/texinfo.tex $(DESTDIR)$(texmf_texinfo)/texinfo.tex
+ $(INSTALL_DATA) $(srcdir)/texinfo-ja.tex $(DESTDIR)$(texmf_texinfo)/texinfo-ja.tex
$(INSTALL_DATA) $(srcdir)/epsf.tex $(DESTDIR)$(texmf_dvips)/epsf.tex
for f in $(TXI_XLATE); do \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
diff --git a/macros/texinfo/texinfo/doc/Makefile.in b/macros/texinfo/texinfo/doc/Makefile.in
index e944850a2f..ddf2d5c16f 100644
--- a/macros/texinfo/texinfo/doc/Makefile.in
+++ b/macros/texinfo/texinfo/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -263,7 +263,6 @@ PDFS = texinfo.pdf info-stnd.pdf
PSS = texinfo.ps info-stnd.ps
HTMLS = texinfo.html info-stnd.html
TEXINFOS = texinfo.texi info-stnd.texi
-TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
@@ -421,6 +420,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -576,6 +576,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -643,11 +644,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -713,6 +716,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -733,6 +737,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -767,6 +772,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -781,6 +787,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -859,8 +866,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -876,14 +881,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = $(MAKEINFO_ENVIRONMENT) $(PERL) $(top_builddir)/tp/texi2any
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -973,6 +977,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1006,6 +1011,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1018,6 +1024,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1036,6 +1043,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1139,6 +1147,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1154,6 +1163,7 @@ MAKEINFO_ENVIRONMENT = TEXINFO_DEV_SOURCE=1 ; export TEXINFO_DEV_SOURCE ; \
top_srcdir="$(top_srcdir)" ; export top_srcdir ; \
top_builddir="$(top_builddir)" ; export top_builddir ;
+TEXI2DVI = $(top_srcdir)/util/texi2dvi
# We'd also like to use something like this, but Automake calls
# "install-info" directly.
@@ -1841,6 +1851,7 @@ install-tex:
test -n "$(TEXMF)" || (echo "TEXMF must be set." >&2; exit 1)
$(mkinstalldirs) $(DESTDIR)$(texmf_texinfo) $(DESTDIR)$(texmf_dvips)
$(INSTALL_DATA) $(srcdir)/texinfo.tex $(DESTDIR)$(texmf_texinfo)/texinfo.tex
+ $(INSTALL_DATA) $(srcdir)/texinfo-ja.tex $(DESTDIR)$(texmf_texinfo)/texinfo-ja.tex
$(INSTALL_DATA) $(srcdir)/epsf.tex $(DESTDIR)$(texmf_dvips)/epsf.tex
for f in $(TXI_XLATE); do \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
diff --git a/macros/texinfo/texinfo/doc/info-stnd.texi b/macros/texinfo/texinfo/doc/info-stnd.texi
index 86c92e867e..efeb36e807 100644
--- a/macros/texinfo/texinfo/doc/info-stnd.texi
+++ b/macros/texinfo/texinfo/doc/info-stnd.texi
@@ -24,14 +24,9 @@ Copyright @copyright{} 1992, 1993, 1996, 1997, 1998, 1999, 2001,
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
-and with the Back-Cover Texts as in (a) below. A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Texinfo manual.
-
-(a) The FSF's Back-Cover Text is: ``You have the freedom to
-copy and modify this GNU manual. Buying copies from the FSF
-supports it in developing GNU and promoting software freedom.''
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license is included in the section entitled
+``GNU Free Documentation License'' in the Texinfo manual.
@end quotation
This document is part of a collection distributed under the GNU Free
@@ -57,7 +52,6 @@ license to the document, as described in section 6 of the license.
@contents
-@ifnottex
@node Top
@top Stand-alone GNU Info
@@ -69,7 +63,6 @@ If you are new to the Info reader, then you can get started by typing
rest of this manual by typing @key{SPC} and @key{DEL} (or @key{Space}
and @key{Backspace}) to move forwards and backwards in it.
-@end ifnottex
@menu
* Stand-alone Info:: What is Info?
diff --git a/macros/texinfo/texinfo/doc/refcard/txirefcard.tex b/macros/texinfo/texinfo/doc/refcard/txirefcard.tex
index fa88c2b5e5..cde0a490d9 100644
--- a/macros/texinfo/texinfo/doc/refcard/txirefcard.tex
+++ b/macros/texinfo/texinfo/doc/refcard/txirefcard.tex
@@ -49,7 +49,7 @@
% Summary node in the Texinfo manual, originally written by Bob Chassell.
\def\versionyear{2019} % year manual was updated
-\def\versionTexinfo{6.6} % version of Texinfo this manual is for
+\def\versionTexinfo{6.7} % version of Texinfo this manual is for
\def\copyrightnotice{%
\vskip 1ex plus 1filll\begingroup\small
diff --git a/macros/texinfo/texinfo/doc/short-sample-ja.texi b/macros/texinfo/texinfo/doc/short-sample-ja.texi
index 560e40da8d..95c9693a3d 100644
--- a/macros/texinfo/texinfo/doc/short-sample-ja.texi
+++ b/macros/texinfo/texinfo/doc/short-sample-ja.texi
@@ -3,6 +3,8 @@
@documentencoding UTF-8
@documentlanguage ja
+@include version.texi
+
@settitle サンプル マニュアル 1.0 日本語版
@copying
@@ -21,14 +23,12 @@ Copyright @copyright{} 2016 Free Software Foundation, Inc.
@c 最åˆã«ç›®æ¬¡ã‚’出力ã—ã¾ã™ã€‚
@contents
-@ifnottex
@node Top
@top GNU サンプル
ã“ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã¯ GNU サンプル
(version @value{VERSION}, @value{UPDATED})
用ã§ã™ã€‚
-@end ifnottex
@menu
* 第一章:: 第一章ã¯
diff --git a/macros/texinfo/texinfo/doc/stamp-1 b/macros/texinfo/texinfo/doc/stamp-1
index bd8d35fb8b..f73a179aa9 100644
--- a/macros/texinfo/texinfo/doc/stamp-1
+++ b/macros/texinfo/texinfo/doc/stamp-1
@@ -1,4 +1,4 @@
-@set UPDATED 16 February 2019
-@set UPDATED-MONTH February 2019
-@set EDITION 6.6
-@set VERSION 6.6
+@set UPDATED 23 September 2019
+@set UPDATED-MONTH September 2019
+@set EDITION 6.7
+@set VERSION 6.7
diff --git a/macros/texinfo/texinfo/doc/stamp-vti b/macros/texinfo/texinfo/doc/stamp-vti
index bd8d35fb8b..f73a179aa9 100644
--- a/macros/texinfo/texinfo/doc/stamp-vti
+++ b/macros/texinfo/texinfo/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 16 February 2019
-@set UPDATED-MONTH February 2019
-@set EDITION 6.6
-@set VERSION 6.6
+@set UPDATED 23 September 2019
+@set UPDATED-MONTH September 2019
+@set EDITION 6.7
+@set VERSION 6.7
diff --git a/macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs b/macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs
index 834c9036d8..8a6134cdb8 100644
--- a/macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs
+++ b/macros/texinfo/texinfo/doc/texinfo-tex-test.WIDOWs
@@ -1,112 +1,112 @@
-\initial {K}
-\entry {\code {kbd}}{63}
-\entry {\code {kbdinputstyle}}{63}
-\entry {\code {key}}{64}
-\entry {\code {kindex}}{97}
-\initial {L}
-\entry {\code {l}}{109}
-\entry {\code {L}}{109}
-\entry {\code {LaTeX}}{112}
-\entry {\code {lbracechar\lbracechar \rbracechar \r {(literal \samp {\lbracechar })}}}{103}
-\entry {\code {leq}}{114}
-\entry {\code {{\tt \backslashcurfont }linkcolor}}{59}
-\entry {\code {lisp}}{76}
-\entry {\code {listoffloats}}{91}
-\entry {\code {lowersections}}{47}
-\initial {M}
-\entry {\code {macro}}{149}
-\entry {\code {{\tt \backslashcurfont }mag \r {(raw \TeX {} magnification)}}}{173}
-\entry {\code {majorheading}}{44}
-\entry {\code {makeinfo-buffer}}{199}
-\entry {\code {makeinfo-kill-job}}{200}
-\entry {\code {makeinfo-recenter-output-buffer}}{200}
-\entry {\code {makeinfo-region}}{199}
-\entry {\code {math}}{111}
-\entry {\code {{\tt \backslashcurfont }mathopsup}}{111}
-\entry {\code {menu}}{38}
-\entry {\code {minus}}{114}
-\entry {\code {move_index_entries_after_items}}{195}
-\entry {\code {multitable}}{87}
-\initial {N}
-\entry {\code {need}}{122}
-\entry {\code {<newline>}}{105}
-\entry {\code {next-error}}{199}
-\entry {\code {node}}{32}
-\entry {\code {noindent}}{78}
-\entry {\code {novalidate}}{165}
-\initial {O}
-\entry {\code {o}}{109}
-\entry {\code {O}}{109}
-\entry {\code {occur}}{277}
-\entry {\code {occur-mode-goto-occurrence}}{259}
-\entry {\code {oddfooting}}{270}
-\entry {\code {oddfootingmarks}}{272}
-\entry {\code {oddheading}}{270}
-\entry {\code {oddheadingmarks}}{272}
-\entry {\code {oe}}{109}
-\entry {\code {OE}}{109}
-\entry {\code {ogonek}}{108}
-\entry {\code {option}}{67}
-\entry {\code {ordf}}{109}
-\entry {\code {ordm}}{109}
-\initial {P}
-\entry {\code {page}}{121}
-\entry {\code {page\r {, within \code {\@titlepage}}}}{20}
-\entry {\code {pagesizes}}{172}
-\entry {\code {paragraphindent}}{29}
-\entry {\code {parse}}{185}
-\entry {\code {part}}{46}
-\entry {\code {pdf}}{185}
-\entry {\code {phoo}}{155}
-\entry {\code {pindex}}{97}
-\entry {\code {plaintexinfo}}{185}
-\entry {\code {plaintext}}{185}
-\entry {\code {point}}{116}
-\entry {\code {pounds}}{113}
-\entry {\code {print}}{115}
-\entry {\code {printindex}}{99}
-\entry {\code {ps}}{185}
-\entry {\code {pxref}}{55}
-\initial {Q}
-\entry {\code {questiondown}}{109}
-\entry {\code {quotation}}{73}
-\entry {\code {quotedblbase}}{110}
-\entry {\code {quotedblleft}}{110}
-\entry {\code {quotedblright}}{110}
-\entry {\code {quoteleft}}{110}
-\entry {\code {quoteright}}{110}
-\entry {\code {quotesinglbase}}{110}
-\initial {R}
-\entry {\code {r \r {(roman font)}}}{71}
-\entry {\code {raggedright}}{78}
-\entry {\code {raisesections}}{47}
-\entry {\code {rawtext}}{185}
-\entry {\code {rbracechar\lbracechar \rbracechar \r {(literal \samp {\rbracechar })}}}{103}
-\entry {\code {ref}}{55}
-\entry {\code {refill}}{237}
-\entry {\code {regenerate_master_menu}}{195}
-\entry {\code {registeredsymbol}}{112}
-\entry {\code {result}}{115}
-\entry {\code {ringaccent}}{108}
-\entry {\code {rmacro}}{150}
-\initial {S}
-\entry {\code {samp}}{65}
-\entry {\code {sansserif \r {(sans serif font)}}}{71}
-\entry {\code {sc \r {(small caps font)}}}{70}
-\entry {\code {section}}{44}
-\entry {\code {set}}{143}
-\entry {\code {setchapternewpage}}{27}
-\entry {\code {\@setcontentsaftertitlepage}}{244}
-\entry {\code {setfilename}}{17}
-\entry {\code {\@setshortcontentsaftertitlepage}}{244}
-\entry {\code {settitle}}{18}
-\entry {\code {shortcaption}}{91}
-\entry {\code {shortcontents}}{24}
-\entry {\code {shorttitlepage}}{21}
-\entry {\code {simple_menu}}{195}
-\entry {\code {slanted \r {(slanted font)}}}{71}
-\entry {\code {smallbook}}{171}
-\entry {\code {smalldisplay}}{76}
-\entry {\code {smallexample}}{80}
-\entry {\code {smallformat}}{77, 80}
-\entry {\code {smallindentedblock}}{74}
+@initial {K}
+@entry {@code {kbd}}{63}
+@entry {@code {kbdinputstyle}}{63}
+@entry {@code {key}}{64}
+@entry {@code {kindex}}{97}
+@initial {L}
+@entry {@code {l}}{109}
+@entry {@code {L}}{109}
+@entry {@code {LaTeX}}{112}
+@entry {@code {lbracechar@lbracechar @rbracechar @r {(literal @samp {@lbracechar })}}}{103}
+@entry {@code {leq}}{114}
+@entry {@code {{@tt @backslashcurfont }linkcolor}}{59}
+@entry {@code {lisp}}{76}
+@entry {@code {listoffloats}}{91}
+@entry {@code {lowersections}}{47}
+@initial {M}
+@entry {@code {macro}}{149}
+@entry {@code {{@tt @backslashcurfont }mag @r {(raw @TeX {} magnification)}}}{173}
+@entry {@code {majorheading}}{44}
+@entry {@code {makeinfo-buffer}}{199}
+@entry {@code {makeinfo-kill-job}}{200}
+@entry {@code {makeinfo-recenter-output-buffer}}{200}
+@entry {@code {makeinfo-region}}{199}
+@entry {@code {math}}{111}
+@entry {@code {{@tt @backslashcurfont }mathopsup}}{111}
+@entry {@code {menu}}{38}
+@entry {@code {minus}}{114}
+@entry {@code {move_index_entries_after_items}}{195}
+@entry {@code {multitable}}{87}
+@initial {N}
+@entry {@code {need}}{122}
+@entry {@code {<newline>}}{105}
+@entry {@code {next-error}}{199}
+@entry {@code {node}}{32}
+@entry {@code {noindent}}{78}
+@entry {@code {novalidate}}{165}
+@initial {O}
+@entry {@code {o}}{109}
+@entry {@code {O}}{109}
+@entry {@code {occur}}{277}
+@entry {@code {occur-mode-goto-occurrence}}{259}
+@entry {@code {oddfooting}}{270}
+@entry {@code {oddfootingmarks}}{272}
+@entry {@code {oddheading}}{270}
+@entry {@code {oddheadingmarks}}{272}
+@entry {@code {oe}}{109}
+@entry {@code {OE}}{109}
+@entry {@code {ogonek}}{108}
+@entry {@code {option}}{67}
+@entry {@code {ordf}}{109}
+@entry {@code {ordm}}{109}
+@initial {P}
+@entry {@code {page}}{121}
+@entry {@code {page@r {, within @code {@@titlepage}}}}{20}
+@entry {@code {pagesizes}}{172}
+@entry {@code {paragraphindent}}{29}
+@entry {@code {parse}}{185}
+@entry {@code {part}}{46}
+@entry {@code {pdf}}{185}
+@entry {@code {phoo}}{155}
+@entry {@code {pindex}}{97}
+@entry {@code {plaintexinfo}}{185}
+@entry {@code {plaintext}}{185}
+@entry {@code {point}}{116}
+@entry {@code {pounds}}{113}
+@entry {@code {print}}{115}
+@entry {@code {printindex}}{99}
+@entry {@code {ps}}{185}
+@entry {@code {pxref}}{55}
+@initial {Q}
+@entry {@code {questiondown}}{109}
+@entry {@code {quotation}}{73}
+@entry {@code {quotedblbase}}{110}
+@entry {@code {quotedblleft}}{110}
+@entry {@code {quotedblright}}{110}
+@entry {@code {quoteleft}}{110}
+@entry {@code {quoteright}}{110}
+@entry {@code {quotesinglbase}}{110}
+@initial {R}
+@entry {@code {r @r {(roman font)}}}{71}
+@entry {@code {raggedright}}{78}
+@entry {@code {raisesections}}{47}
+@entry {@code {rawtext}}{185}
+@entry {@code {rbracechar@lbracechar @rbracechar @r {(literal @samp {@rbracechar })}}}{103}
+@entry {@code {ref}}{55}
+@entry {@code {refill}}{237}
+@entry {@code {regenerate_master_menu}}{195}
+@entry {@code {registeredsymbol}}{112}
+@entry {@code {result}}{115}
+@entry {@code {ringaccent}}{108}
+@entry {@code {rmacro}}{150}
+@initial {S}
+@entry {@code {samp}}{65}
+@entry {@code {sansserif @r {(sans serif font)}}}{71}
+@entry {@code {sc @r {(small caps font)}}}{70}
+@entry {@code {section}}{44}
+@entry {@code {set}}{143}
+@entry {@code {setchapternewpage}}{27}
+@entry {@code {@@setcontentsaftertitlepage}}{244}
+@entry {@code {setfilename}}{17}
+@entry {@code {@@setshortcontentsaftertitlepage}}{244}
+@entry {@code {settitle}}{18}
+@entry {@code {shortcaption}}{91}
+@entry {@code {shortcontents}}{24}
+@entry {@code {shorttitlepage}}{21}
+@entry {@code {simple_menu}}{195}
+@entry {@code {slanted @r {(slanted font)}}}{71}
+@entry {@code {smallbook}}{171}
+@entry {@code {smalldisplay}}{76}
+@entry {@code {smallexample}}{80}
+@entry {@code {smallformat}}{77, 80}
+@entry {@code {smallindentedblock}}{74}
diff --git a/macros/texinfo/texinfo/doc/texinfo-tex-test.texi b/macros/texinfo/texinfo/doc/texinfo-tex-test.texi
index ad1d3bb9dd..5d6b90364e 100644
--- a/macros/texinfo/texinfo/doc/texinfo-tex-test.texi
+++ b/macros/texinfo/texinfo/doc/texinfo-tex-test.texi
@@ -1,6 +1,6 @@
% texinfo-tex-test.texi -- test file for texinfo.tex
%
-% Copyright 2015, 2016 Free Software Foundation, Inc.
+% Copyright 2015-2019 Free Software Foundation, Inc.
%
% This file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -365,7 +365,7 @@ in next paragraph now.
@set fc Fran@,cois
@mactwo{@value{fc},}@*
-@mactwo{Fran@,cois,}@*
+@c doesn't work: @mactwo{Fran@,cois,}@*
Fran@,cois+.
@section Macro in argument to @@math
@@ -416,21 +416,6 @@ And multiple paragraphs.
Like an argument to @b{@@footnote}.
}
-(The double space in the @code{@@example} and the fact the text is not
-in bold is due to the way @code{\scantokens} inserts spaces after
-control sequences. This could be worked around like
-
-@verbatim
-@tex
-@gdef@coolb#1#{@b}%
-@end tex
-@end verbatim
-
-@noindent and using @samp{@@coolb} instead of @samp{@@b}. This skips
-the active space token before the opening brace. In theory this could
-be done automatically, but this would be a lot of work in
-@file{texinfo.tex} to do for all commands.)
-
@tex
\gdef \commenceindexnopage{%
@@ -440,7 +425,6 @@ be done automatically, but this would be a lot of work in
\tolerance = 9500
\plainfrenchspacing
\everypar = {}%
-\catcode`\\=0 \catcode`\@=12
}
\gdef \commenceindex{%
@@ -449,7 +433,6 @@ be done automatically, but this would be a lot of work in
}
\gdef \finishindex{%
-\catcode`\@=0 \catcode`\\=13
\enddoublecolumns
\endgroup
\hrule
@@ -462,19 +445,31 @@ In these examples, a horizontal rule is at the end of each run of double
column material in order to show if any material extends below the
box containing it.
+@section No page number in index
+
+No leaders unless there is also a page number
+
+@commenceindex
+@entry {whatever}{}
+@entry {more}{}
+@entry {whatever}{123}
+@entry {again}{}
+@finishindex
+
+
@section Long index entries
@commenceindex
-\entry {\code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105,
+@entry {@code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105,
124, 125, 127, 129, 135, 139, 143, 145, 148, 187}
-\entry {\code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105,
+@entry {@code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105,
124, 125, 127, 129, 135, 139, 143, 145, 148}
-\entry{Testing for Texinfo Commands: \code {\@ifcommanddefined}, \code
-{\@ifcommandnotdefined}}{148}
-\entry {\code {--dereference-command-line-symlink-to-dir}}{78}
-\entry {built-in shell commands, conflicts with}{119, 139, 144, 145,
+@entry{Testing for Texinfo Commands: @code {@@ifcommanddefined}, @code
+{@@ifcommandnotdefined}}{148}
+@entry {@code {--dereference-command-line-symlink-to-dir}}{78}
+@entry {built-in shell commands, conflicts with}{119, 139, 144, 145,
148, 163, 191, 196, 197}
-\finishindex
+@finishindex
@section End-column glue
@@ -484,125 +479,125 @@ inter-baseline spacing. This test only works if the `R' initial is at
the start of a page.
@commenceindex
-\initial {P}
-\entry {\code {PACKAGE}}{196}
-\entry {\code {PACKAGE_AND_VERSION}}{196}
-\entry {\code {PACKAGE_NAME}}{196}
-\entry {\code {PACKAGE_URL}}{196}
-\entry {\code {PACKAGE_VERSION}}{196}
-\entry {Page breaks, awkward}{124}
-\entry {Page breaks, forcing}{126}
-\entry {Page delimiter in Texinfo mode}{261}
-\entry {Page headings}{270}
-\entry {Page numbering}{270}
-\entry {Page sizes for books}{175}
-\entry {Page sizes, customized}{175}
-\entry {\code {page-delimiter}}{261}
-\entry {Pages, starting odd}{29}
-\entry {Paper size, A4}{175}
-\entry {Paragraph indentation control}{31}
-\entry {Paragraph, marking text within}{66}
-\entry {\code {paragraphindent}}{187}
-\entry {Parameters to macros}{154}
-\entry {Parentheses in node name}{37}
-\entry {Parsing errors}{202}
-\entry {Part of file formatting and printing}{266}
-\entry {Part pages}{50}
-\entry {Partial documents, formatting}{168}
-\entry {Parts of a cross reference}{54}
-\entry {Parts of a master menu}{28}
-\entry {Parts of a menu}{43}
-\entry {Patches, contributing}{4}
-\entry {PCL file, for printing}{170}
-\entry {\code {pdf image inclusions}}{97}
-\entry {PDF output}{176}
-\entry {PDF output of urls}{64}
-\entry {PDF output, overview}{5}
-\entry {\code {pdfetex}}{167}
-\entry {\code {pdftex}}{176}
-\entry {\code {pdftex\r {, and images}}}{97}
-\entry {\code {pdftxei2dvi}}{166}
-\entry {Period in node name}{37}
-\entry {Periods, inserting}{111}
-\entry {Perl format strings for translation}{199}
-\entry {Perl POD, converting to Texinfo}{200}
-\entry {Permissions text, including}{22}
-\entry {Permissions, printed}{25}
-\entry {\code {pg} (program) index}{102}
-\entry {Picas}{98}
-\entry {Pictures, inserting}{97}
-\entry {Pinard, Fran\,{c}ois}{7}
-\entry {Plain \TeX {}}{146}
-\entry {Plain text output with \option {--plaintext}}{183}
-\entry {Plain text output, overview}{4}
-\entry {\code {png image format}}{97}
-\entry {POD, converting to Texinfo}{200}
-\entry {\code {pod2texi}}{200}
-\entry {Point, indicating in a buffer}{121}
-\entry {Pointer creation with \code {makeinfo}}{40}
-\entry {Pointer validation with \code {makeinfo}}{185}
-\entry {Pointer validation, suppressing}{168}
-\entry {Pointer validation, suppressing from command line}{182}
-\entry {Points (dimension)}{98}
-\entry {PostScript output, overview}{4}
-\entry {Pounds symbol}{118}
-\entry {\code {PRE_ABOUT}}{192}
-\entry {\code {PRE_BODY_CLOSE}}{192}
-\entry {Preamble, in Info format}{283}
-\entry {Predefined names for indices}{105}
-\entry {Preface, etc., and Docbook}{48}
-\entry {\code {PREFIX}}{196}
-\entry {Preparing for \TeX {}}{173}
-\entry {Preserving HTML links to old nodes}{221}
-\entry {Prev node of Top node}{38}
-\entry {Preventing first paragraph indentation}{32}
-\entry {Preventing line and page breaks}{124}
-\entry {Print and format in Texinfo mode}{170}
-\entry {Print, format from Emacs shell}{170}
-\entry {Printed book and manual characteristics}{6}
-\entry {Printed output, indicating}{120}
-\entry {Printed output, through \command {texi2any}}{185}
-\entry {Printed permissions}{25}
-\entry {Printing a region or buffer}{266}
-\entry {Printing an index}{104}
-\entry {Printing cost, reducing}{75}
-\entry {Printing cropmarks}{176}
-\entry {Printing DVI files, on MS-DOS/MS-Windows}{170}
-\entry {Printing hardcopy}{166}
-\entry {Problems, catching}{275}
-\entry {\code {PROGRAM}}{196}
-\entry {Program names, indicating}{72}
-\entry {\code {PROGRAM_NAME_IN_FOOTER}}{192}
-\entry {Programming, glyhs for}{119}
-\entry {Pronunciation of Texinfo}{3}
-\entry {Prototype row, column widths defined by}{93}
-\entry {Ragged left, without filling}{83}
-\entry {Ragged right, with filling}{84}
-\entry {Ragged right, without filling}{83}
-\entry {Raising and lowering sections}{51}
-\entry {Raw formatter commands}{146}
-\entry {Raw HTML}{213}
-\entry {raw text output}{188}
-\initial {Q}
-\entry {Quotation characters (`'), in source}{114}
-\entry {Quotation marks, French}{115}
-\entry {Quotation marks, German}{115}
-\entry {Quotation marks, inserting}{114}
-\entry {Quotations}{78}
-\entry {Quotations in smaller fonts}{82}
-\entry {Quote characters, inserting}{110}
-\entry {Quoting, automatic for some macros}{156}
-\initial {R}
-\entry {RCS $Id}{253}
-\entry {Recommended names for keys}{69}
-\entry {Rectangle, black in hardcopy}{174}
-\entry {Recursive macro invocations}{155}
-\entry {Reducing font size}{75}
-\entry {Reference implementation}{178}
-\entry {Reference to @-commands}{223}
-\entry {References}{53}
-\entry {References using \code {@inforef}}{62}
-\finishindex
+@initial {P}
+@entry {@code {PACKAGE}}{196}
+@entry {@code {PACKAGE_AND_VERSION}}{196}
+@entry {@code {PACKAGE_NAME}}{196}
+@entry {@code {PACKAGE_URL}}{196}
+@entry {@code {PACKAGE_VERSION}}{196}
+@entry {Page breaks, awkward}{124}
+@entry {Page breaks, forcing}{126}
+@entry {Page delimiter in Texinfo mode}{261}
+@entry {Page headings}{270}
+@entry {Page numbering}{270}
+@entry {Page sizes for books}{175}
+@entry {Page sizes, customized}{175}
+@entry {@code {page-delimiter}}{261}
+@entry {Pages, starting odd}{29}
+@entry {Paper size, A4}{175}
+@entry {Paragraph indentation control}{31}
+@entry {Paragraph, marking text within}{66}
+@entry {@code {paragraphindent}}{187}
+@entry {Parameters to macros}{154}
+@entry {Parentheses in node name}{37}
+@entry {Parsing errors}{202}
+@entry {Part of file formatting and printing}{266}
+@entry {Part pages}{50}
+@entry {Partial documents, formatting}{168}
+@entry {Parts of a cross reference}{54}
+@entry {Parts of a master menu}{28}
+@entry {Parts of a menu}{43}
+@entry {Patches, contributing}{4}
+@entry {PCL file, for printing}{170}
+@entry {@code {pdf image inclusions}}{97}
+@entry {PDF output}{176}
+@entry {PDF output of urls}{64}
+@entry {PDF output, overview}{5}
+@entry {@code {pdfetex}}{167}
+@entry {@code {pdftex}}{176}
+@entry {@code {pdftex@r {, and images}}}{97}
+@entry {@code {pdftxei2dvi}}{166}
+@entry {Period in node name}{37}
+@entry {Periods, inserting}{111}
+@entry {Perl format strings for translation}{199}
+@entry {Perl POD, converting to Texinfo}{200}
+@entry {Permissions text, including}{22}
+@entry {Permissions, printed}{25}
+@entry {@code {pg} (program) index}{102}
+@entry {Picas}{98}
+@entry {Pictures, inserting}{97}
+@entry {Pinard, Fran@,{c}ois}{7}
+@entry {Plain @TeX {}}{146}
+@entry {Plain text output with @option {--plaintext}}{183}
+@entry {Plain text output, overview}{4}
+@entry {@code {png image format}}{97}
+@entry {POD, converting to Texinfo}{200}
+@entry {@code {pod2texi}}{200}
+@entry {Point, indicating in a buffer}{121}
+@entry {Pointer creation with @code {makeinfo}}{40}
+@entry {Pointer validation with @code {makeinfo}}{185}
+@entry {Pointer validation, suppressing}{168}
+@entry {Pointer validation, suppressing from command line}{182}
+@entry {Points (dimension)}{98}
+@entry {PostScript output, overview}{4}
+@entry {Pounds symbol}{118}
+@entry {@code {PRE_ABOUT}}{192}
+@entry {@code {PRE_BODY_CLOSE}}{192}
+@entry {Preamble, in Info format}{283}
+@entry {Predefined names for indices}{105}
+@entry {Preface, etc., and Docbook}{48}
+@entry {@code {PREFIX}}{196}
+@entry {Preparing for @TeX {}}{173}
+@entry {Preserving HTML links to old nodes}{221}
+@entry {Prev node of Top node}{38}
+@entry {Preventing first paragraph indentation}{32}
+@entry {Preventing line and page breaks}{124}
+@entry {Print and format in Texinfo mode}{170}
+@entry {Print, format from Emacs shell}{170}
+@entry {Printed book and manual characteristics}{6}
+@entry {Printed output, indicating}{120}
+@entry {Printed output, through @command {texi2any}}{185}
+@entry {Printed permissions}{25}
+@entry {Printing a region or buffer}{266}
+@entry {Printing an index}{104}
+@entry {Printing cost, reducing}{75}
+@entry {Printing cropmarks}{176}
+@entry {Printing DVI files, on MS-DOS/MS-Windows}{170}
+@entry {Printing hardcopy}{166}
+@entry {Problems, catching}{275}
+@entry {@code {PROGRAM}}{196}
+@entry {Program names, indicating}{72}
+@entry {@code {PROGRAM_NAME_IN_FOOTER}}{192}
+@entry {Programming, glyhs for}{119}
+@entry {Pronunciation of Texinfo}{3}
+@entry {Prototype row, column widths defined by}{93}
+@entry {Ragged left, without filling}{83}
+@entry {Ragged right, with filling}{84}
+@entry {Ragged right, without filling}{83}
+@entry {Raising and lowering sections}{51}
+@entry {Raw formatter commands}{146}
+@entry {Raw HTML}{213}
+@entry {raw text output}{188}
+@initial {Q}
+@entry {Quotation characters (`'), in source}{114}
+@entry {Quotation marks, French}{115}
+@entry {Quotation marks, German}{115}
+@entry {Quotation marks, inserting}{114}
+@entry {Quotations}{78}
+@entry {Quotations in smaller fonts}{82}
+@entry {Quote characters, inserting}{110}
+@entry {Quoting, automatic for some macros}{156}
+@initial {R}
+@entry {RCS $Id}{253}
+@entry {Recommended names for keys}{69}
+@entry {Rectangle, black in hardcopy}{174}
+@entry {Recursive macro invocations}{155}
+@entry {Reducing font size}{75}
+@entry {Reference implementation}{178}
+@entry {Reference to @@-commands}{223}
+@entry {References}{53}
+@entry {References using @code {@@inforef}}{62}
+@finishindex
@section Index page break not before initial
@@ -610,191 +605,191 @@ The next index is to show the bottoms of columns when the next page
doesn't start with an initial.
@commenceindex
-\initial {P}
-\entry {\code {PACKAGE}}{196}
-\entry {\code {PACKAGE_AND_VERSION}}{196}
-\entry {\code {PACKAGE_NAME}}{196}
-\entry {\code {PACKAGE_URL}}{196}
-\entry {\code {PACKAGE_VERSION}}{196}
-\entry {Page breaks, awkward}{124}
-\entry {Page breaks, forcing}{126}
-\entry {Page delimiter in Texinfo mode}{261}
-\entry {Page headings}{270}
-\entry {Page numbering}{270}
-\entry {Page sizes for books}{175}
-\entry {Page sizes, customized}{175}
-\entry {\code {page-delimiter}}{261}
-\entry {Pages, starting odd}{29}
-\entry {Paper size, A4}{175}
-\entry {Paragraph indentation control}{31}
-\entry {Paragraph, marking text within}{66}
-\entry {\code {paragraphindent}}{187}
-\entry {Parameters to macros}{154}
-\entry {Parentheses in node name}{37}
-\entry {Parsing errors}{202}
-\entry {Part of file formatting and printing}{266}
-\entry {Part pages}{50}
-\entry {Partial documents, formatting}{168}
-\entry {Parts of a cross reference}{54}
-\entry {Parts of a master menu}{28}
-\entry {Parts of a menu}{43}
-\entry {Patches, contributing}{4}
-\entry {PCL file, for printing}{170}
-\entry {\code {pdf image inclusions}}{97}
-\entry {PDF output}{176}
-\entry {PDF output of urls}{64}
-\entry {PDF output, overview}{5}
-\entry {\code {pdfetex}}{167}
-\entry {\code {pdftex}}{176}
-\entry {\code {pdftex\r {, and images}}}{97}
-\entry {\code {pdftxei2dvi}}{166}
-\entry {Period in node name}{37}
-\entry {Periods, inserting}{111}
-\entry {Perl format strings for translation}{199}
-\entry {Perl POD, converting to Texinfo}{200}
-\entry {Permissions text, including}{22}
-\entry {Permissions, printed}{25}
-\entry {\code {pg} (program) index}{102}
-\entry {Picas}{98}
-\entry {Pictures, inserting}{97}
-\entry {Pinard, Fran\,{c}ois}{7}
-\entry {Plain \TeX {}}{146}
-\entry {Plain text output with \option {--plaintext}}{183}
-\entry {Plain text output, overview}{4}
-\entry {\code {png image format}}{97}
-\entry {POD, converting to Texinfo}{200}
-\entry {\code {pod2texi}}{200}
-\entry {Point, indicating in a buffer}{121}
-\entry {Pointer creation with \code {makeinfo}}{40}
-\entry {Pointer validation with \code {makeinfo}}{185}
-\entry {Pointer validation, suppressing}{168}
-\entry {Pointer validation, suppressing from command line}{182}
-\entry {Points (dimension)}{98}
-\entry {PostScript output, overview}{4}
-\entry {Pounds symbol}{118}
-\entry {\code {PRE_ABOUT}}{192}
-\entry {\code {PRE_BODY_CLOSE}}{192}
-\entry {Preamble, in Info format}{283}
-\entry {Predefined names for indices}{105}
-\entry {Preface, etc., and Docbook}{48}
-\entry {\code {PREFIX}}{196}
-\entry {Preparing for \TeX {}}{173}
-\entry {Preserving HTML links to old nodes}{221}
-\entry {Prev node of Top node}{38}
-\entry {Preventing first paragraph indentation}{32}
-\entry {Preventing line and page breaks}{124}
-\entry {Print and format in Texinfo mode}{170}
-\entry {Print, format from Emacs shell}{170}
-\entry {Printed book and manual characteristics}{6}
-\entry {Printed output, indicating}{120}
-\entry {Printed output, through \command {texi2any}}{185}
-\entry {Printed permissions}{25}
-\entry {Printing a region or buffer}{266}
-\entry {Printing an index}{104}
-\entry {Printing cost, reducing}{75}
-\entry {Printing cropmarks}{176}
-\entry {Printing DVI files, on MS-DOS/MS-Windows}{170}
-\entry {Printing hardcopy}{166}
-\entry {Problems, catching}{275}
-\entry {\code {PROGRAM}}{196}
-\entry {Program names, indicating}{72}
-\entry {\code {PROGRAM_NAME_IN_FOOTER}}{192}
-\entry {Programming, glyhs for}{119}
-\entry {Pronunciation of Texinfo}{3}
-\entry {Prototype row, column widths defined by}{93}
-\initial {Q}
-\entry {Quotation characters (`'), in source}{114}
-\entry {Quotation marks, French}{115}
-\entry {Quotation marks, German}{115}
-\entry {Quotation marks, inserting}{114}
-\entry {Quotations}{78}
-\entry {Quotations in smaller fonts}{82}
-\entry {Quote characters, inserting}{110}
-\entry {Quoting, automatic for some macros}{156}
-\entry {Ragged left, without filling}{83}
-\entry {Ragged right, with filling}{84}
-\entry {Ragged right, without filling}{83}
-\entry {Raising and lowering sections}{51}
-\entry {Raw formatter commands}{146}
-\entry {Raw HTML}{213}
-\entry {raw text output}{188}
-\entry {RCS $Id}{253}
-\entry {Recommended names for keys}{69}
-\entry {Rectangle, black in hardcopy}{174}
-\entry {Recursive macro invocations}{155}
-\entry {Reducing font size}{75}
-\entry {Reference implementation}{178}
-\entry {Reference to @-commands}{223}
-\entry {References}{53}
-\entry {References using \code {@inforef}}{62}
-\entry {Raw formatter commands}{146}
-\entry {Raw HTML}{213}
-\entry {raw text output}{188}
-\entry {RCS $Id}{253}
-\entry {Recommended names for keys}{69}
-\entry {Rectangle, black in hardcopy}{174}
-\entry {Recursive macro invocations}{155}
-\entry {Reducing font size}{75}
-\entry {Reference implementation}{178}
-\entry {Reference to @-commands}{223}
-\entry {References}{53}
-\entry {References using \code {@inforef}}{62}
-\finishindex
+@initial {P}
+@entry {@code {PACKAGE}}{196}
+@entry {@code {PACKAGE_AND_VERSION}}{196}
+@entry {@code {PACKAGE_NAME}}{196}
+@entry {@code {PACKAGE_URL}}{196}
+@entry {@code {PACKAGE_VERSION}}{196}
+@entry {Page breaks, awkward}{124}
+@entry {Page breaks, forcing}{126}
+@entry {Page delimiter in Texinfo mode}{261}
+@entry {Page headings}{270}
+@entry {Page numbering}{270}
+@entry {Page sizes for books}{175}
+@entry {Page sizes, customized}{175}
+@entry {@code {page-delimiter}}{261}
+@entry {Pages, starting odd}{29}
+@entry {Paper size, A4}{175}
+@entry {Paragraph indentation control}{31}
+@entry {Paragraph, marking text within}{66}
+@entry {@code {paragraphindent}}{187}
+@entry {Parameters to macros}{154}
+@entry {Parentheses in node name}{37}
+@entry {Parsing errors}{202}
+@entry {Part of file formatting and printing}{266}
+@entry {Part pages}{50}
+@entry {Partial documents, formatting}{168}
+@entry {Parts of a cross reference}{54}
+@entry {Parts of a master menu}{28}
+@entry {Parts of a menu}{43}
+@entry {Patches, contributing}{4}
+@entry {PCL file, for printing}{170}
+@entry {@code {pdf image inclusions}}{97}
+@entry {PDF output}{176}
+@entry {PDF output of urls}{64}
+@entry {PDF output, overview}{5}
+@entry {@code {pdfetex}}{167}
+@entry {@code {pdftex}}{176}
+@entry {@code {pdftex@r {, and images}}}{97}
+@entry {@code {pdftxei2dvi}}{166}
+@entry {Period in node name}{37}
+@entry {Periods, inserting}{111}
+@entry {Perl format strings for translation}{199}
+@entry {Perl POD, converting to Texinfo}{200}
+@entry {Permissions text, including}{22}
+@entry {Permissions, printed}{25}
+@entry {@code {pg} (program) index}{102}
+@entry {Picas}{98}
+@entry {Pictures, inserting}{97}
+@entry {Pinard, Fran@,{c}ois}{7}
+@entry {Plain @TeX {}}{146}
+@entry {Plain text output with @option {--plaintext}}{183}
+@entry {Plain text output, overview}{4}
+@entry {@code {png image format}}{97}
+@entry {POD, converting to Texinfo}{200}
+@entry {@code {pod2texi}}{200}
+@entry {Point, indicating in a buffer}{121}
+@entry {Pointer creation with @code {makeinfo}}{40}
+@entry {Pointer validation with @code {makeinfo}}{185}
+@entry {Pointer validation, suppressing}{168}
+@entry {Pointer validation, suppressing from command line}{182}
+@entry {Points (dimension)}{98}
+@entry {PostScript output, overview}{4}
+@entry {Pounds symbol}{118}
+@entry {@code {PRE_ABOUT}}{192}
+@entry {@code {PRE_BODY_CLOSE}}{192}
+@entry {Preamble, in Info format}{283}
+@entry {Predefined names for indices}{105}
+@entry {Preface, etc., and Docbook}{48}
+@entry {@code {PREFIX}}{196}
+@entry {Preparing for @TeX {}}{173}
+@entry {Preserving HTML links to old nodes}{221}
+@entry {Prev node of Top node}{38}
+@entry {Preventing first paragraph indentation}{32}
+@entry {Preventing line and page breaks}{124}
+@entry {Print and format in Texinfo mode}{170}
+@entry {Print, format from Emacs shell}{170}
+@entry {Printed book and manual characteristics}{6}
+@entry {Printed output, indicating}{120}
+@entry {Printed output, through @command {texi2any}}{185}
+@entry {Printed permissions}{25}
+@entry {Printing a region or buffer}{266}
+@entry {Printing an index}{104}
+@entry {Printing cost, reducing}{75}
+@entry {Printing cropmarks}{176}
+@entry {Printing DVI files, on MS-DOS/MS-Windows}{170}
+@entry {Printing hardcopy}{166}
+@entry {Problems, catching}{275}
+@entry {@code {PROGRAM}}{196}
+@entry {Program names, indicating}{72}
+@entry {@code {PROGRAM_NAME_IN_FOOTER}}{192}
+@entry {Programming, glyhs for}{119}
+@entry {Pronunciation of Texinfo}{3}
+@entry {Prototype row, column widths defined by}{93}
+@initial {Q}
+@entry {Quotation characters (`'), in source}{114}
+@entry {Quotation marks, French}{115}
+@entry {Quotation marks, German}{115}
+@entry {Quotation marks, inserting}{114}
+@entry {Quotations}{78}
+@entry {Quotations in smaller fonts}{82}
+@entry {Quote characters, inserting}{110}
+@entry {Quoting, automatic for some macros}{156}
+@entry {Ragged left, without filling}{83}
+@entry {Ragged right, with filling}{84}
+@entry {Ragged right, without filling}{83}
+@entry {Raising and lowering sections}{51}
+@entry {Raw formatter commands}{146}
+@entry {Raw HTML}{213}
+@entry {raw text output}{188}
+@entry {RCS $Id}{253}
+@entry {Recommended names for keys}{69}
+@entry {Rectangle, black in hardcopy}{174}
+@entry {Recursive macro invocations}{155}
+@entry {Reducing font size}{75}
+@entry {Reference implementation}{178}
+@entry {Reference to @@-commands}{223}
+@entry {References}{53}
+@entry {References using @code {@@inforef}}{62}
+@entry {Raw formatter commands}{146}
+@entry {Raw HTML}{213}
+@entry {raw text output}{188}
+@entry {RCS $Id}{253}
+@entry {Recommended names for keys}{69}
+@entry {Rectangle, black in hardcopy}{174}
+@entry {Recursive macro invocations}{155}
+@entry {Reducing font size}{75}
+@entry {Reference implementation}{178}
+@entry {Reference to @@-commands}{223}
+@entry {References}{53}
+@entry {References using @code {@@inforef}}{62}
+@finishindex
@section Short indices
See following pages
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\initial{B}
-\entry{bbbb}{2}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@initial{B}
+@entry{bbbb}{2}
+@finishindex
If the above is in two columns, check that the space below the initials
`A' and `B' is even.
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\initial{B}
-\entry{bbbb}{2}
-\initial{C}
-\entry{cccc}{2}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@initial{B}
+@entry{bbbb}{2}
+@initial{C}
+@entry{cccc}{2}
+@finishindex
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\initial{B}
-\entry{bbbb}{2}
-\initial{C}
-\entry{cccc}{2}
-\entry{cccc}{2}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@initial{B}
+@entry{bbbb}{2}
+@initial{C}
+@entry{cccc}{2}
+@entry{cccc}{2}
+@finishindex
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@finishindex
@commenceindex
-\initial{A}
-\entry{aaaa}{1}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{bbbb}{2}
-\entry{cccc}{17}
-\finishindex
+@initial{A}
+@entry{aaaa}{1}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{bbbb}{2}
+@entry{cccc}{17}
+@finishindex
@section Final page of index hard to balance
@@ -802,297 +797,297 @@ No empty page should appear in the middle of the index. All index
material should fit on the page within the margins.
@commenceindex
-\entry {outline, importing into}{39}
-\entry {outline, inserting into}{39}
-\entry {outline, label separator}{35}
-\entry {outline, label type}{35}
-\entry {outline, mailing}{37}
-\entry {outline, motion}{38}
-\entry {outline, overview}{40}
-\entry {outline, show levels}{40}
-\entry {outline, showing}{40}
-\entry {outline, top-level}{40}
-\entry {outline, view specs}{41}
-\entry {outline, viewing}{40}
-\entry {outliner}{32}
-\entry {outliner commands}{33}
-\entry {outliner keys}{90}
-\entry {overview}{40}
-\initial {P}
-\entry {paragraph, filling}{38}
-\entry {Paste Key}{8}
-\entry {paste region}{11}
-\entry {pasting a region}{70, 71, 76}
-\entry {patch output}{15}
-\entry {pathname}{15}
-\entry {permanent identifier}{32, 36}
-\entry {pipe character}{41}
-\entry {posting buttons}{23}
-\entry {posting news}{24}
-\entry {programming interface}{57}
-\entry {promotion}{36}
-\entry {proportional scrolling}{62, 74}
-\initial {R}
-\entry {rdb-mode}{77}
-\entry {README file}{65}
-\entry {reference}{16}
-\entry {refilling}{38}
-\entry {region selection}{11}
-\entry {region, active}{72}
-\entry {relative autonumber}{32}
-\entry {relative identifier}{35}
-\entry {remote file}{15}
-\entry {remote path}{15}
-\entry {remote pathnames}{68}
-\entry {remove lines}{27}
-\entry {removing Hyperbole menu}{25}
-\entry {Request For Comment}{15, 16}
-\entry {restoring windows}{50}
-\entry {RFC}{15, 16}
-\entry {Rmail}{23}
-\entry {rolo}{44}
-\entry {rolo address}{14}
-\entry {rolo commands}{45}
-\entry {rolo entry}{44}
-\entry {rolo file}{44}
-\entry {rolo keys}{47}
-\entry {rolo menu}{45}
-\entry {rolo searching}{46}
-\entry {rolo, buttons in}{44}
-\entry {rolo, datestamps}{48}
-\entry {rolo, editing}{48}
-\entry {rolo, extending a match}{47}
-\entry {rolo, finding matches}{47}
-\entry {rolo, highlighting matches}{47, 49}
-\entry {rolo, interactive searching}{47}
-\entry {rolo, locating a name}{47}
-\entry {rolo, moving through matches}{47}
-\entry {rolo, moving to entries}{48}
-\entry {rolo, outlining}{47}
-\entry {rolo, personal}{48}
-\entry {rolo, quitting}{48}
-\entry {root cell}{34, 36}
-\initial {S}
-\entry {save lines}{27}
-\entry {saving window configurations}{50}
-\entry {screen}{29}
-\entry {Screen}{62}
-\entry {scrolling}{62, 74}
-\entry {search}{26, 69}
-\entry {searching, rolo}{46}
-\entry {selection}{11}
-\entry {set}{70, 76}
-\entry {setting the view spec}{41}
-\entry {sexp selection}{11}
-\entry {SGML tag pair}{11}
-\entry {show subtree}{40}
-\entry {show tree}{40}
-\entry {showing}{40}
-\entry {side drag}{71}
-\entry {signatures, hiding}{14}
-\entry {site initialization}{66}
-\entry {Smart Key}{8, 62, 99}
-\entry {smart key assignments}{8}
-\entry {smart key commands}{8}
-\entry {Smart Key help}{11}
-\entry {Smart Key operation}{9}
-\entry {Smart Key, default context}{11, 89}
-\entry {Smart Keyboard Keys}{73}
-\entry {smart marking}{11}
-\entry {Smart Menu}{74}
-\entry {Smart Mouse Key}{70, 76}
-\entry {Smart Mouse Key drag}{22}
-\entry {Smart Mouse Key toggle}{8}
-\entry {Smart Mouse Keys}{70}
-\entry {smart selection}{11}
-\entry {source line}{15}
-\entry {splitting a cell}{39}
-\entry {stack frame}{15}
-\entry {star outline}{39}
-\entry {starting Hyperbole}{65}
-\entry {storage manager}{56}
-\entry {string}{70, 76}
-\entry {submenus}{27}
-\entry {submodes}{29}
-\entry {subtree, hide}{40}
-\entry {subtree, show}{40}
-\entry {swapping}{31}
-\entry {system encapsulation}{57}
-\initial {T}
-\entry {table of contents}{16, 19}
-\entry {tabs, inserting}{37}
-\entry {tag}{16}
-\entry {tags file}{16}
-\entry {TAGS file}{16}
-\entry {tar archive}{66}
-\entry {tar archive browsing}{87}
-\entry {terminal use}{4}
-\entry {Texinfo cross-reference}{14}
-\entry {Texinfo manual}{65}
-\entry {text file}{39}
-\entry {thing}{70, 76}
-\entry {things}{11}
-\entry {toc action type}{19}
-\entry {toc implicit button type}{16}
-\entry {toggling blank lines}{41}
-\entry {top-level cell}{34, 36}
-\entry {top-level view}{40}
-\entry {Tramp}{15, 68}
-\entry {transposing cells}{38}
-\entry {tree, copying}{37}
-\entry {tree, demoting}{36}
-\entry {tree, exporting}{37}
-\entry {tree, filling}{38}
-\entry {tree, hide subtree}{40}
-\entry {tree, killing}{36}
-\entry {tree, mailing}{37}
-\entry {tree, moving}{37}
-\entry {tree, promoting}{36}
-\entry {tree, show}{40}
-\entry {tree, show subtree}{40}
-\entry {type definition}{53}
-\entry {type redefinition}{19, 53}
-\initial {U}
-\entry {unburying}{30}
-\entry {uncompressing archives}{66}
-\entry {UNIX manual}{15}
-\entry {unpacking archives}{66}
-\entry {URL}{14, 19, 87}
-\entry {URLs, abbreviated}{68}
-\entry {URLs, using with find-file}{68}
-\entry {USENET}{23, 24}
-\initial {V}
-\entry {variables}{52}
-\entry {vector}{70, 76}
-\entry {version description}{98}
-\entry {vertical drag}{72}
-\entry {view}{40}
-\entry {view mode}{75}
-\entry {view spec}{41}
-\entry {view spec klink}{42}
-\entry {view spec, all lines and levels}{41}
-\entry {view spec, blank lines}{41}
-\entry {view spec, changing}{41}
-\entry {view spec, characters}{41}
-\entry {view spec, ellipses}{41}
-\entry {view spec, example}{41}
-\entry {view spec, label type}{41}
-\entry {view spec, lines per cell}{41}
-\entry {view spec, setting}{41}
-\entry {view spec, show levels}{41}
-\entry {VM}{23}
-\initial {W}
-\entry {W3}{87}
-\entry {wconfig commands}{50}
-\entry {web pages, displaying}{68}
-\entry {window configuration commands}{50}
-\entry {window configuration ring}{50}
-\entry {window configurations}{50}
-\entry {window control}{29}
-\entry {window system}{68}
-\entry {windows}{58}
-\entry {word wrap}{38}
-\entry {world-wide web}{87}
-\entry {World-wide Web}{14, 19}
-\entry {wrolo}{44}
-\entry {wrolo commands}{45}
-\entry {wrolo matches}{88}
-\entry {wrolo menu}{47}
-\entry {WWW}{14, 19}
-\initial {X}
-\entry {xdb}{15}
-\entry {XEmacs}{2, 25}
-\entry {XEmacs support}{69}
-\initial {Y}
-\entry {yank region}{11}
-\entry {yank, reformatting}{53}
-\entry {yanking}{70, 71, 76}
-\initial {Z}
-\entry {zcat}{66}
-\entry {zip file}{66}
-\entry {zooming}{31}
-\finishindex
+@entry {outline, importing into}{39}
+@entry {outline, inserting into}{39}
+@entry {outline, label separator}{35}
+@entry {outline, label type}{35}
+@entry {outline, mailing}{37}
+@entry {outline, motion}{38}
+@entry {outline, overview}{40}
+@entry {outline, show levels}{40}
+@entry {outline, showing}{40}
+@entry {outline, top-level}{40}
+@entry {outline, view specs}{41}
+@entry {outline, viewing}{40}
+@entry {outliner}{32}
+@entry {outliner commands}{33}
+@entry {outliner keys}{90}
+@entry {overview}{40}
+@initial {P}
+@entry {paragraph, filling}{38}
+@entry {Paste Key}{8}
+@entry {paste region}{11}
+@entry {pasting a region}{70, 71, 76}
+@entry {patch output}{15}
+@entry {pathname}{15}
+@entry {permanent identifier}{32, 36}
+@entry {pipe character}{41}
+@entry {posting buttons}{23}
+@entry {posting news}{24}
+@entry {programming interface}{57}
+@entry {promotion}{36}
+@entry {proportional scrolling}{62, 74}
+@initial {R}
+@entry {rdb-mode}{77}
+@entry {README file}{65}
+@entry {reference}{16}
+@entry {refilling}{38}
+@entry {region selection}{11}
+@entry {region, active}{72}
+@entry {relative autonumber}{32}
+@entry {relative identifier}{35}
+@entry {remote file}{15}
+@entry {remote path}{15}
+@entry {remote pathnames}{68}
+@entry {remove lines}{27}
+@entry {removing Hyperbole menu}{25}
+@entry {Request For Comment}{15, 16}
+@entry {restoring windows}{50}
+@entry {RFC}{15, 16}
+@entry {Rmail}{23}
+@entry {rolo}{44}
+@entry {rolo address}{14}
+@entry {rolo commands}{45}
+@entry {rolo entry}{44}
+@entry {rolo file}{44}
+@entry {rolo keys}{47}
+@entry {rolo menu}{45}
+@entry {rolo searching}{46}
+@entry {rolo, buttons in}{44}
+@entry {rolo, datestamps}{48}
+@entry {rolo, editing}{48}
+@entry {rolo, extending a match}{47}
+@entry {rolo, finding matches}{47}
+@entry {rolo, highlighting matches}{47, 49}
+@entry {rolo, interactive searching}{47}
+@entry {rolo, locating a name}{47}
+@entry {rolo, moving through matches}{47}
+@entry {rolo, moving to entries}{48}
+@entry {rolo, outlining}{47}
+@entry {rolo, personal}{48}
+@entry {rolo, quitting}{48}
+@entry {root cell}{34, 36}
+@initial {S}
+@entry {save lines}{27}
+@entry {saving window configurations}{50}
+@entry {screen}{29}
+@entry {Screen}{62}
+@entry {scrolling}{62, 74}
+@entry {search}{26, 69}
+@entry {searching, rolo}{46}
+@entry {selection}{11}
+@entry {set}{70, 76}
+@entry {setting the view spec}{41}
+@entry {sexp selection}{11}
+@entry {SGML tag pair}{11}
+@entry {show subtree}{40}
+@entry {show tree}{40}
+@entry {showing}{40}
+@entry {side drag}{71}
+@entry {signatures, hiding}{14}
+@entry {site initialization}{66}
+@entry {Smart Key}{8, 62, 99}
+@entry {smart key assignments}{8}
+@entry {smart key commands}{8}
+@entry {Smart Key help}{11}
+@entry {Smart Key operation}{9}
+@entry {Smart Key, default context}{11, 89}
+@entry {Smart Keyboard Keys}{73}
+@entry {smart marking}{11}
+@entry {Smart Menu}{74}
+@entry {Smart Mouse Key}{70, 76}
+@entry {Smart Mouse Key drag}{22}
+@entry {Smart Mouse Key toggle}{8}
+@entry {Smart Mouse Keys}{70}
+@entry {smart selection}{11}
+@entry {source line}{15}
+@entry {splitting a cell}{39}
+@entry {stack frame}{15}
+@entry {star outline}{39}
+@entry {starting Hyperbole}{65}
+@entry {storage manager}{56}
+@entry {string}{70, 76}
+@entry {submenus}{27}
+@entry {submodes}{29}
+@entry {subtree, hide}{40}
+@entry {subtree, show}{40}
+@entry {swapping}{31}
+@entry {system encapsulation}{57}
+@initial {T}
+@entry {table of contents}{16, 19}
+@entry {tabs, inserting}{37}
+@entry {tag}{16}
+@entry {tags file}{16}
+@entry {TAGS file}{16}
+@entry {tar archive}{66}
+@entry {tar archive browsing}{87}
+@entry {terminal use}{4}
+@entry {Texinfo cross-reference}{14}
+@entry {Texinfo manual}{65}
+@entry {text file}{39}
+@entry {thing}{70, 76}
+@entry {things}{11}
+@entry {toc action type}{19}
+@entry {toc implicit button type}{16}
+@entry {toggling blank lines}{41}
+@entry {top-level cell}{34, 36}
+@entry {top-level view}{40}
+@entry {Tramp}{15, 68}
+@entry {transposing cells}{38}
+@entry {tree, copying}{37}
+@entry {tree, demoting}{36}
+@entry {tree, exporting}{37}
+@entry {tree, filling}{38}
+@entry {tree, hide subtree}{40}
+@entry {tree, killing}{36}
+@entry {tree, mailing}{37}
+@entry {tree, moving}{37}
+@entry {tree, promoting}{36}
+@entry {tree, show}{40}
+@entry {tree, show subtree}{40}
+@entry {type definition}{53}
+@entry {type redefinition}{19, 53}
+@initial {U}
+@entry {unburying}{30}
+@entry {uncompressing archives}{66}
+@entry {UNIX manual}{15}
+@entry {unpacking archives}{66}
+@entry {URL}{14, 19, 87}
+@entry {URLs, abbreviated}{68}
+@entry {URLs, using with find-file}{68}
+@entry {USENET}{23, 24}
+@initial {V}
+@entry {variables}{52}
+@entry {vector}{70, 76}
+@entry {version description}{98}
+@entry {vertical drag}{72}
+@entry {view}{40}
+@entry {view mode}{75}
+@entry {view spec}{41}
+@entry {view spec klink}{42}
+@entry {view spec, all lines and levels}{41}
+@entry {view spec, blank lines}{41}
+@entry {view spec, changing}{41}
+@entry {view spec, characters}{41}
+@entry {view spec, ellipses}{41}
+@entry {view spec, example}{41}
+@entry {view spec, label type}{41}
+@entry {view spec, lines per cell}{41}
+@entry {view spec, setting}{41}
+@entry {view spec, show levels}{41}
+@entry {VM}{23}
+@initial {W}
+@entry {W3}{87}
+@entry {wconfig commands}{50}
+@entry {web pages, displaying}{68}
+@entry {window configuration commands}{50}
+@entry {window configuration ring}{50}
+@entry {window configurations}{50}
+@entry {window control}{29}
+@entry {window system}{68}
+@entry {windows}{58}
+@entry {word wrap}{38}
+@entry {world-wide web}{87}
+@entry {World-wide Web}{14, 19}
+@entry {wrolo}{44}
+@entry {wrolo commands}{45}
+@entry {wrolo matches}{88}
+@entry {wrolo menu}{47}
+@entry {WWW}{14, 19}
+@initial {X}
+@entry {xdb}{15}
+@entry {XEmacs}{2, 25}
+@entry {XEmacs support}{69}
+@initial {Y}
+@entry {yank region}{11}
+@entry {yank, reformatting}{53}
+@entry {yanking}{70, 71, 76}
+@initial {Z}
+@entry {zcat}{66}
+@entry {zip file}{66}
+@entry {zooming}{31}
+@finishindex
@section Final page initial at top of both columns
@commenceindex
-\initial {P}
-\entry {\code {phi}}{397}
-\entry {\code {pi}}{397}
-\entry {\code {pi-over-180}}{397}
-\entry {\code {pi-over-2}}{397}
-\entry {\code {pi-over-4}}{397}
-\entry {\code {polar-complexp}}{392}
-\entry {\code {poly-mix}}{408}
-\entry {\code {poly-mul}}{408}
-\entry {\code {poly-simplify}}{408}
-\entry {\code {polynomial-base}}{408}
-\entry {\code {polynomial-p}}{408}
-\entry {\code {posp}}{391}
-\entry {\code {pow}}{397}
-\entry {\code {pow-mod}}{398}
-\entry {\code {power-of-2}}{398}
-\entry {\code {prime-test}}{399}
-\entry {\code {primp}}{393}
-\initial {Q}
-\entry {\code {quarter-circle}}{397}
-\entry {\code {quarter-integer}}{399}
-\entry {\code {quotient}}{397}
-\initial {R}
-\entry {\code {random-digit}}{398}
-\entry {\code {random-digits}}{399}
-\entry {\code {random-float}}{399}
-\entry {\code {ratp}}{392}
-\entry {\code {read-expr}}{409}
-\entry {\code {read-exprs}}{410}
-\entry {\code {read-number}}{409}
-\entry {\code {realp}}{392}
-\entry {\code {rect-complexp}}{392}
-\entry {\code {reduce-cols}}{400}
-\entry {\code {reduce-vec}}{400}
-\entry {\code {reject-arg}}{394}
-\entry {\code {remove-units}}{409}
-\entry {\code {rewrite}}{405}
-\entry {\code {rewrite-heads}}{405}
-\entry {\code {row-matrix}}{400}
-\initial {S}
-\entry {\code {scalarp}}{392}
-\entry {\code {scale-int}}{396}
-\entry {\code {scale-rounding}}{396}
-\entry {\code {simplify}}{403}
-\entry {\code {simplify-extended}}{403}
-\entry {\code {simplify-units}}{403}
-\entry {\code {single-units-in-expr-p}}{409}
-\entry {\code {solve-eqn}}{407}
-\entry {\code {solve-for}}{406}
-\entry {\code {solve-system}}{407}
-\entry {\code {sort-intv}}{396}
-\entry {\code {sqr}}{397}
-\entry {\code {sqrt-e}}{397}
-\entry {\code {sqrt-two-pi}}{397}
-\entry {\code {square-matrixp}}{393}
-\entry {\code {swap-rows}}{401}
-\initial {T}
-\entry {\code {tderiv}}{406}
-\entry {\code {to-fraction}}{399}
-\entry {\code {to-hms}}{398}
-\entry {\code {to-radians}}{398}
-\entry {\code {to-radians-2}}{398}
-\entry {\code {to-simple-fraction}}{399}
-\entry {\code {to-standard-units}}{409}
-\entry {\code {transpose}}{401}
-\entry {\code {two-pi}}{397}
-\initial {U}
-\entry {\code {underflow}}{394}
-\entry {\code {units-in-expr-p}}{409}
-\initial {V}
-\entry {\code {vec-length}}{399}
-\entry {\code {vectorp}}{393}
-\initial {W}
-\entry {\code {with-extra-prec}}{395}
-\initial {Z}
-\entry {\code {zerop}}{391}
-\finishindex
+@initial {P}
+@entry {@code {phi}}{397}
+@entry {@code {pi}}{397}
+@entry {@code {pi-over-180}}{397}
+@entry {@code {pi-over-2}}{397}
+@entry {@code {pi-over-4}}{397}
+@entry {@code {polar-complexp}}{392}
+@entry {@code {poly-mix}}{408}
+@entry {@code {poly-mul}}{408}
+@entry {@code {poly-simplify}}{408}
+@entry {@code {polynomial-base}}{408}
+@entry {@code {polynomial-p}}{408}
+@entry {@code {posp}}{391}
+@entry {@code {pow}}{397}
+@entry {@code {pow-mod}}{398}
+@entry {@code {power-of-2}}{398}
+@entry {@code {prime-test}}{399}
+@entry {@code {primp}}{393}
+@initial {Q}
+@entry {@code {quarter-circle}}{397}
+@entry {@code {quarter-integer}}{399}
+@entry {@code {quotient}}{397}
+@initial {R}
+@entry {@code {random-digit}}{398}
+@entry {@code {random-digits}}{399}
+@entry {@code {random-float}}{399}
+@entry {@code {ratp}}{392}
+@entry {@code {read-expr}}{409}
+@entry {@code {read-exprs}}{410}
+@entry {@code {read-number}}{409}
+@entry {@code {realp}}{392}
+@entry {@code {rect-complexp}}{392}
+@entry {@code {reduce-cols}}{400}
+@entry {@code {reduce-vec}}{400}
+@entry {@code {reject-arg}}{394}
+@entry {@code {remove-units}}{409}
+@entry {@code {rewrite}}{405}
+@entry {@code {rewrite-heads}}{405}
+@entry {@code {row-matrix}}{400}
+@initial {S}
+@entry {@code {scalarp}}{392}
+@entry {@code {scale-int}}{396}
+@entry {@code {scale-rounding}}{396}
+@entry {@code {simplify}}{403}
+@entry {@code {simplify-extended}}{403}
+@entry {@code {simplify-units}}{403}
+@entry {@code {single-units-in-expr-p}}{409}
+@entry {@code {solve-eqn}}{407}
+@entry {@code {solve-for}}{406}
+@entry {@code {solve-system}}{407}
+@entry {@code {sort-intv}}{396}
+@entry {@code {sqr}}{397}
+@entry {@code {sqrt-e}}{397}
+@entry {@code {sqrt-two-pi}}{397}
+@entry {@code {square-matrixp}}{393}
+@entry {@code {swap-rows}}{401}
+@initial {T}
+@entry {@code {tderiv}}{406}
+@entry {@code {to-fraction}}{399}
+@entry {@code {to-hms}}{398}
+@entry {@code {to-radians}}{398}
+@entry {@code {to-radians-2}}{398}
+@entry {@code {to-simple-fraction}}{399}
+@entry {@code {to-standard-units}}{409}
+@entry {@code {transpose}}{401}
+@entry {@code {two-pi}}{397}
+@initial {U}
+@entry {@code {underflow}}{394}
+@entry {@code {units-in-expr-p}}{409}
+@initial {V}
+@entry {@code {vec-length}}{399}
+@entry {@code {vectorp}}{393}
+@initial {W}
+@entry {@code {with-extra-prec}}{395}
+@initial {Z}
+@entry {@code {zerop}}{391}
+@finishindex
@section Medium length index
@@ -1123,120 +1118,124 @@ More text before index.
@commenceindexnopage
-\entry {\code {ac_cv_alignof_\var {type-or-expr}}}{152}
-\entry {\code {ac_cv_c_const}}{157}
-\entry {\code {ac_cv_c_int16_t}}{178}
-\entry {\code {ac_cv_c_int32_t}}{179}
-\entry {\code {ac_cv_c_int64_t}}{179}
-\entry {\code {ac_cv_c_int8_t}}{178}
-\entry {\code {ac_cv_c_restrict}}{157}
-\entry {\code {ac_cv_c_uint16_t}}{180}
-\entry {\code {ac_cv_c_uint32_t}}{180}
-\entry {\code {ac_cv_c_uint64_t}}{180}
-\entry {\code {ac_cv_c_uint8_t}}{180}
-\entry {\code {ac_cv_f77_compiler_gnu}}{191}
-\entry {\code {ac_cv_f77_dummy_main}}{193}
-\entry {\code {ac_cv_f77_implicit_none}}{198}
-\entry {\code {ac_cv_f77_libs}}{193}
-\entry {\code {ac_cv_f77_main}}{194}
-\entry {\code {ac_cv_f77_mangling}}{194}
-\entry {\code {ac_cv_fc_check_bounds}}{198}
-\entry {\code {ac_cv_fc_compiler_gnu}}{192}
-\entry {\code {ac_cv_fc_dummy_main}}{193}
-\entry {\code {ac_cv_fc_fixedform}}{197}
-\entry {\code {ac_cv_fc_freeform}}{197}
-\entry {\code {ac_cv_fc_implicit_none}}{198}
-\entry {\code {ac_cv_fc_libs}}{193}
-\entry {\code {ac_cv_fc_line_length}}{197}
-\entry {\code {ac_cv_fc_main}}{194}
-\entry {\code {ac_cv_fc_mangling}}{194}
-\entry {\code {ac_cv_fc_module_ext}}{198}
-\entry {\code {ac_cv_fc_module_flag}}{198}
-\entry {\code {ac_cv_fc_module_output_flag}}{199}
-\entry {\code {ac_cv_fc_pp_define}}{196}
-\entry {\code {ac_cv_fc_pp_srcext_\var {ext}}}{196}
-\entry {\code {ac_cv_fc_srcext_\var {ext}}}{196}
-\entry {\code {ac_cv_file_\var {file}}}{91}
-\entry {\code {ac_cv_func_chown_works}}{160}
-\entry {\code {ac_cv_func_closedir_void}}{160}
-\entry {\code {ac_cv_func_fnmatch_gnu}}{161}
-\entry {\code {ac_cv_func_fnmatch_works}}{161, 166}
-\entry {\code {ac_cv_func_\var {function}}}{166}
-\entry {\code {ac_cv_func_getgroups_works}}{161}
-\entry {\code {ac_cv_func_getpgrp_void}}{162}
-\entry {\code {ac_cv_func_lstat_dereferences_slashed_symlink}}{163}
-\entry {\code {ac_cv_func_lstat_empty_string_bug}}{165}
-\entry {\code {ac_cv_func_malloc_0_nonnull}}{163}
-\entry {\code {ac_cv_func_mbrtowc}}{163}
-\entry {\code {ac_cv_func_memcmp_working}}{163}
-\entry {\code {ac_cv_func_mmap_fixed_mapped}}{164}
-\entry {\code {ac_cv_func_obstack}}{164}
-\entry {\code {ac_cv_func_pow}}{165}
-\entry {\code {ac_cv_func_realloc_0_nonnull}}{164}
-\entry {\code {ac_cv_func_setpgrp_void}}{164}
-\entry {\code {ac_cv_func_stat_empty_string_bug}}{165}
-\entry {\code {ac_cv_func_strcoll_works}}{165}
-\entry {\code {ac_cv_func_strerror_r_char_p}}{165}
-\entry {\code {ac_cv_func_strnlen_working}}{166}
-\entry {\code {ac_cv_func_strtod}}{165}
-\entry {\code {ac_cv_func_strtold}}{165}
-\entry {\code {ac_cv_func_utime_null}}{166}
-\entry {\code {ac_cv_func_working_mktime}}{164}
-\entry {\code {ac_cv_have_decl_\var {symbol}}}{175}
-\entry {\code {ac_cv_header_\var {header-file}}}{174}
-\entry {\code {ac_cv_header_stdbool_h}}{170, 172}
-\entry {\code {ac_cv_header_stdc}}{172}
-\entry {\code {ac_cv_header_sys_wait_h}}{172}
-\entry {\code {ac_cv_header_time}}{424}
-\entry {\code {ac_cv_lib_error_at_line}}{160}
-\entry {\code {ac_cv_lib_\var {library}_\var {function}}}{91}
-\entry {\code {ac_cv_member_\var {aggregate}_\var {member}}}{177}
-\entry {\code {ac_cv_member_struct_stat_st_blocks}}{177}
-\entry {\code {ac_cv_path_install}}{85}
-\entry {\code {ac_cv_path_mkdir}}{86}
-\entry {\code {ac_cv_path_SED}}{88}
-\entry {\code {ac_cv_path_\var {variable}}}{90}
-\entry {\code {ac_cv_prog_AWK}}{85}
-\entry {\code {ac_cv_prog_c_openmp}}{153}
-\entry {\code {ac_cv_prog_cc_\var {compiler}_c_o}}{156}
-\entry {\code {ac_cv_prog_cc_stdc}}{155}
-\entry {\code {ac_cv_prog_cxx_openmp}}{153}
-\entry {\code {ac_cv_prog_EGREP}}{85}
-\entry {\code {ac_cv_prog_f77_c_o}}{192}
-\entry {\code {ac_cv_prog_f77_g}}{191}
-\entry {\code {ac_cv_prog_f77_openmp}}{153}
-\entry {\code {ac_cv_prog_f77_v}}{193}
-\entry {\code {ac_cv_prog_fc_c_o}}{192}
-\entry {\code {ac_cv_prog_fc_g}}{192}
-\entry {\code {ac_cv_prog_fc_openmp}}{153}
-\entry {\code {ac_cv_prog_fc_v}}{193}
-\entry {\code {ac_cv_prog_FGREP}}{85}
-\entry {\code {ac_cv_prog_GREP}}{85}
-\entry {\code {ac_cv_prog_LEX}}{87}
-\entry {\code {ac_cv_prog_\var {variable}}}{88, 89}
-\entry {\code {ac_cv_prog_YACC}}{88}
-\entry {\code {ac_cv_search_\var {function}}}{92}
-\entry {\code {ac_cv_search_getmntent}}{162}
-\entry {\code {ac_cv_sizeof_\var {type-or-expr}}}{152}
-\entry {\code {ac_cv_sys_posix_termios}}{96}
-\entry {\code {ac_cv_type_getgroups}}{178}
-\entry {\code {ac_cv_type_long_double}}{179}
-\entry {\code {ac_cv_type_long_double_wider}}{179}
-\entry {\code {ac_cv_type_long_long_int}}{179}
-\entry {\code {ac_cv_type_mbstate_t}}{179}
-\entry {\code {ac_cv_type_mode_t}}{179}
-\entry {\code {ac_cv_type_off_t}}{179}
-\entry {\code {ac_cv_type_pid_t}}{179}
-\entry {\code {ac_cv_type_size_t}}{180}
-\entry {\code {ac_cv_type_ssize_t}}{180}
-\entry {\code {ac_cv_type_\var {type}}}{180}
-\entry {\code {ac_cv_type_uid_t}}{180}
-\entry {\code {ac_cv_type_unsigned_long_long_int}}{180}
-\finishindex
-
-
-
-
+@entry {@code {ac_cv_alignof_@var {type-or-expr}}}{152}
+@entry {@code {ac_cv_c_const}}{157}
+@entry {@code {ac_cv_c_int16_t}}{178}
+@entry {@code {ac_cv_c_int32_t}}{179}
+@entry {@code {ac_cv_c_int64_t}}{179}
+@entry {@code {ac_cv_c_int8_t}}{178}
+@entry {@code {ac_cv_c_restrict}}{157}
+@entry {@code {ac_cv_c_uint16_t}}{180}
+@entry {@code {ac_cv_c_uint32_t}}{180}
+@entry {@code {ac_cv_c_uint64_t}}{180}
+@entry {@code {ac_cv_c_uint8_t}}{180}
+@entry {@code {ac_cv_f77_compiler_gnu}}{191}
+@entry {@code {ac_cv_f77_dummy_main}}{193}
+@entry {@code {ac_cv_f77_implicit_none}}{198}
+@entry {@code {ac_cv_f77_libs}}{193}
+@entry {@code {ac_cv_f77_main}}{194}
+@entry {@code {ac_cv_f77_mangling}}{194}
+@entry {@code {ac_cv_fc_check_bounds}}{198}
+@entry {@code {ac_cv_fc_compiler_gnu}}{192}
+@entry {@code {ac_cv_fc_dummy_main}}{193}
+@entry {@code {ac_cv_fc_fixedform}}{197}
+@entry {@code {ac_cv_fc_freeform}}{197}
+@entry {@code {ac_cv_fc_implicit_none}}{198}
+@entry {@code {ac_cv_fc_libs}}{193}
+@entry {@code {ac_cv_fc_line_length}}{197}
+@entry {@code {ac_cv_fc_main}}{194}
+@entry {@code {ac_cv_fc_mangling}}{194}
+@entry {@code {ac_cv_fc_module_ext}}{198}
+@entry {@code {ac_cv_fc_module_flag}}{198}
+@entry {@code {ac_cv_fc_module_output_flag}}{199}
+@entry {@code {ac_cv_fc_pp_define}}{196}
+@entry {@code {ac_cv_fc_pp_srcext_@var {ext}}}{196}
+@entry {@code {ac_cv_fc_srcext_@var {ext}}}{196}
+@entry {@code {ac_cv_file_@var {file}}}{91}
+@entry {@code {ac_cv_func_chown_works}}{160}
+@entry {@code {ac_cv_func_closedir_void}}{160}
+@entry {@code {ac_cv_func_fnmatch_gnu}}{161}
+@entry {@code {ac_cv_func_fnmatch_works}}{161, 166}
+@entry {@code {ac_cv_func_@var {function}}}{166}
+@entry {@code {ac_cv_func_getgroups_works}}{161}
+@entry {@code {ac_cv_func_getpgrp_void}}{162}
+@entry {@code {ac_cv_func_lstat_dereferences_slashed_symlink}}{163}
+@entry {@code {ac_cv_func_lstat_empty_string_bug}}{165}
+@entry {@code {ac_cv_func_malloc_0_nonnull}}{163}
+@entry {@code {ac_cv_func_mbrtowc}}{163}
+@entry {@code {ac_cv_func_memcmp_working}}{163}
+@entry {@code {ac_cv_func_mmap_fixed_mapped}}{164}
+@entry {@code {ac_cv_func_obstack}}{164}
+@entry {@code {ac_cv_func_pow}}{165}
+@entry {@code {ac_cv_func_realloc_0_nonnull}}{164}
+@entry {@code {ac_cv_func_setpgrp_void}}{164}
+@entry {@code {ac_cv_func_stat_empty_string_bug}}{165}
+@entry {@code {ac_cv_func_strcoll_works}}{165}
+@entry {@code {ac_cv_func_strerror_r_char_p}}{165}
+@entry {@code {ac_cv_func_strnlen_working}}{166}
+@entry {@code {ac_cv_func_strtod}}{165}
+@entry {@code {ac_cv_func_strtold}}{165}
+@entry {@code {ac_cv_func_utime_null}}{166}
+@entry {@code {ac_cv_func_working_mktime}}{164}
+@entry {@code {ac_cv_have_decl_@var {symbol}}}{175}
+@entry {@code {ac_cv_header_@var {header-file}}}{174}
+@entry {@code {ac_cv_header_stdbool_h}}{170, 172}
+@entry {@code {ac_cv_header_stdc}}{172}
+@entry {@code {ac_cv_header_sys_wait_h}}{172}
+@entry {@code {ac_cv_header_time}}{424}
+@entry {@code {ac_cv_lib_error_at_line}}{160}
+@entry {@code {ac_cv_lib_@var {library}_@var {function}}}{91}
+@entry {@code {ac_cv_member_@var {aggregate}_@var {member}}}{177}
+@entry {@code {ac_cv_member_struct_stat_st_blocks}}{177}
+@entry {@code {ac_cv_path_install}}{85}
+@entry {@code {ac_cv_path_mkdir}}{86}
+@entry {@code {ac_cv_path_SED}}{88}
+@entry {@code {ac_cv_path_@var {variable}}}{90}
+@entry {@code {ac_cv_prog_AWK}}{85}
+@entry {@code {ac_cv_prog_c_openmp}}{153}
+@entry {@code {ac_cv_prog_cc_@var {compiler}_c_o}}{156}
+@entry {@code {ac_cv_prog_cc_stdc}}{155}
+@entry {@code {ac_cv_prog_cxx_openmp}}{153}
+@entry {@code {ac_cv_prog_EGREP}}{85}
+@entry {@code {ac_cv_prog_f77_c_o}}{192}
+@entry {@code {ac_cv_prog_f77_g}}{191}
+@entry {@code {ac_cv_prog_f77_openmp}}{153}
+@entry {@code {ac_cv_prog_f77_v}}{193}
+@entry {@code {ac_cv_prog_fc_c_o}}{192}
+@entry {@code {ac_cv_prog_fc_g}}{192}
+@entry {@code {ac_cv_prog_fc_openmp}}{153}
+@entry {@code {ac_cv_prog_fc_v}}{193}
+@entry {@code {ac_cv_prog_FGREP}}{85}
+@entry {@code {ac_cv_prog_GREP}}{85}
+@entry {@code {ac_cv_prog_LEX}}{87}
+@entry {@code {ac_cv_prog_@var {variable}}}{88, 89}
+@entry {@code {ac_cv_prog_YACC}}{88}
+@entry {@code {ac_cv_search_@var {function}}}{92}
+@entry {@code {ac_cv_search_getmntent}}{162}
+@entry {@code {ac_cv_sizeof_@var {type-or-expr}}}{152}
+@entry {@code {ac_cv_sys_posix_termios}}{96}
+@entry {@code {ac_cv_type_getgroups}}{178}
+@entry {@code {ac_cv_type_long_double}}{179}
+@entry {@code {ac_cv_type_long_double_wider}}{179}
+@entry {@code {ac_cv_type_long_long_int}}{179}
+@entry {@code {ac_cv_type_mbstate_t}}{179}
+@entry {@code {ac_cv_type_mode_t}}{179}
+@entry {@code {ac_cv_type_off_t}}{179}
+@entry {@code {ac_cv_type_pid_t}}{179}
+@entry {@code {ac_cv_type_size_t}}{180}
+@entry {@code {ac_cv_type_ssize_t}}{180}
+@entry {@code {ac_cv_type_@var {type}}}{180}
+@entry {@code {ac_cv_type_uid_t}}{180}
+@entry {@code {ac_cv_type_unsigned_long_long_int}}{180}
+@finishindex
+
+
+
+
+
+@ignore
+@c this is not currently implemented, as it added a lot of complexity
+@c for not much benefit.
@section Test of index widow elimination
@@ -1246,13 +1245,45 @@ First time shows without widow elimination. Second time shows it with
case.
@commenceindex
-\input texinfo-tex-test.WIDOWs
-\finishindex
+@input texinfo-tex-test.WIDOWs
+@finishindex
@page
@printindex WIDOW
+@end ignore
+
+@section Index subentries
+
+Check that entries are indented properly.
+
+Possible issues with subentries being separated from superentries by a
+page or column break. (There may not be much that can be done in some
+cases.)
+
+@commenceindex
+@entry{tea makers}{19}
+@entry{coffee makers}{}
+@secondary{gerbil-driven long line line line line line line line line
+line line line line line line}{9, 42}
+@secondary{gerbil-driven}{9, 42}
+@secondary{electric}{}
+@tertiary{orange}{5, 62}
+@tertiary{green}{727}
+@tertiary{pink}{5, 62, 45, 81, 45, 81, 123, 2314, 123, 2314, 123, 2314,
+123, 2314, 123, 2314}
+@entry{tea makers}{19}
+@entry{coffee makers}{}
+@secondary{gerbil-driven long line line line line line line line line
+line line line line line line}{9, 42}
+@secondary{gerbil-driven}{9, 42}
+@secondary{electric}{}
+@tertiary{orange}{5, 62}
+@tertiary{green}{727}
+@tertiary{pink}{5, 62, 45, 81, 45, 81, 123, 2314, 123, 2314, 123, 2314,
+123, 2314, 123, 2314}
+@finishindex
@section Non-alphanumeric Index Initials
@@ -1260,13 +1291,13 @@ case.
/ and \ should be mirror images.
@commenceindex
-\initial{\\}
-\initial{/}
-\initial{|}
-\initial{\{}
-\initial{\}}
-\initial{F}
-\finishindex
+@initial{\}
+@initial{/}
+@initial{|}
+@initial{@{}
+@initial{@}}
+@initial{F}
+@finishindex
@@ -1286,6 +1317,9 @@ In code @t{@{@}@@#\}
@chapter Test of auxiliary files
+
+@section Values
+
Need to test with @command{texi2dvi}.
Undefined value in anchor: @anchor{@value{ho} ho}
@@ -1311,6 +1345,19 @@ value in index entry, but only defined afterwards
@axindex @b{another}
+@set complex @code{foo@b{b@'ar}}
+test of texinfo commands in value in index entry
+@axindex @value{complex} index entry
+
+test of value change after index command
+@set changed original
+@axindex `@value{changed}' should be `original'
+@set changed new
+
+test of underscore in value
+@set underscore _
+@axindex `@value{underscore}' should be `_'
+
some more text.
test of macro in index entry:
@@ -1327,6 +1374,11 @@ ffff\arg\ggggg
@printindex ax
+
+@ignore
+@c This section doesn't work while we use \ as the escape character
+@c in the index files.
+
@section Test of macros with @samp{@@} in index
@defindex BB
@@ -1343,6 +1395,22 @@ ffff\arg\ggggg
@BBindex @MacTwo{DDDD @@}
@printindex BB
+@end ignore
+
+
+@section Test of certain characters in index
+
+@defindex CC
+@CCindex \, backslash
+@CCindex @{, open brace
+@CCindex @}, close brace
+@CCindex @@, at sign
+@CCindex @backslashchar{}, backslash 2
+@CCindex @lbracechar{}, open brace 2
+@CCindex @rbracechar{}, close brace 2
+@CCindex @atchar{}, at sign 2
+
+@printindex CC
@section Test of @code{@@synindex}
@@ -1370,6 +1438,34 @@ Should be two entries, not one below.
@printindex SK
+@page
+@section Test of characters in node names for PDF
+
+@ifx@pdfescapestring@thisisundefined
+
+This test requires newer @command{pdfetex}.
+
+@else
+
+@anchor{anchor}.
+
+@anchor{backslash \}.
+
+@anchor{closing bracket )}.
+
+@anchor{opening bracket (}.
+
+@xref{anchor}.
+
+@xref{backslash \}.
+
+@xref{closing bracket )}.
+
+@xref{opening bracket (}.
+
+@fi
+
+
@chapter @code{@@set} and @code{@@value}
@section Another test of @t{@@value}
@@ -1605,6 +1701,66 @@ aaaaa/bbbbb/aaaaa/bbbbb/}
par
+@chapter URL line breaking
+
+Some use of @code{@@url}.
+
+see the
+@url{https://www.gnu.org/software/libc/manual/html_node/Message-catalogs-with-gettext.html}
+
+foo foo foo foo foo foo foof see the @url{https://www.gnu.org/software/libc/manual/html_node/}
+
+
+
+@chapter Headings and footings
+
+test of @samp{@@everyheadingmarks top}
+@c due to the way that @chapter outputs a pair of marks, possibly one on
+@c the page before, following @page directly by @chapter can cause the
+@c wrong chapter in the heading line, because then both marks are output
+@c on the new page.
+
+@everyheading @thischapter
+@everyheadingmarks top
+@setchapternewpage off
+
+@chapter One
+
+one
+
+@page
+
+two
+
+@chapter Two
+
+@chapter Three
+
+@page
+
+ffffff
+
+@chapter Four
+
+@page
+
+test of @samp{@@everyheadingmarks bottom}
+
+@everyheading @thischapter
+@everyheadingmarks bottom
+
+@page
+
+@chapter One
+
+@chapter Two
+
+@chapter Three
+
+@page
+
+ffffff
+@chapter Four
@bye
diff --git a/macros/texinfo/texinfo/doc/texinfo.tex b/macros/texinfo/texinfo/doc/texinfo.tex
index 5fe81b4c28..af857cbbb0 100644
--- a/macros/texinfo/texinfo/doc/texinfo.tex
+++ b/macros/texinfo/texinfo/doc/texinfo.tex
@@ -3,8 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2019-02-16.14}
-
+\def\texinfoversion{2019-09-20.22}
%
% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
%
@@ -258,8 +257,8 @@
% \domark is called twice inside \chapmacro, to add one
% mark before the section break, and one after.
-% In the second call \prevchapterdefs is the same as \lastchapterdefs,
-% and \prevsectiondefs is the same as \lastsectiondefs.
+% In the second call \prevchapterdefs is the same as \currentchapterdefs,
+% and \prevsectiondefs is the same as \currentsectiondefs.
% Then if the page is not broken at the mark, some of the previous
% section appears on the page, and we can get the name of this section
% from \firstmark for @everyheadingmarks top.
@@ -267,11 +266,11 @@
%
% See page 260 of The TeXbook.
\def\domark{%
- \toks0=\expandafter{\lastchapterdefs}%
- \toks2=\expandafter{\lastsectiondefs}%
+ \toks0=\expandafter{\currentchapterdefs}%
+ \toks2=\expandafter{\currentsectiondefs}%
\toks4=\expandafter{\prevchapterdefs}%
\toks6=\expandafter{\prevsectiondefs}%
- \toks8=\expandafter{\lastcolordefs}%
+ \toks8=\expandafter{\currentcolordefs}%
\mark{%
\the\toks0 \the\toks2 % 0: marks for @everyheadingmarks top
\noexpand\or \the\toks4 \the\toks6 % 1: for @everyheadingmarks bottom
@@ -288,19 +287,19 @@
% @setcolor (or @url, or @link, etc.) between @contents and the very
% first @chapter.
\def\gettopheadingmarks{%
- \ifcase0\topmark\fi
+ \ifcase0\the\savedtopmark\fi
\ifx\thischapter\empty \ifcase0\firstmark\fi \fi
}
\def\getbottomheadingmarks{\ifcase1\botmark\fi}
-\def\getcolormarks{\ifcase2\topmark\fi}
+\def\getcolormarks{\ifcase2\the\savedtopmark\fi}
% Avoid "undefined control sequence" errors.
-\def\lastchapterdefs{}
-\def\lastsectiondefs{}
-\def\lastsection{}
+\def\currentchapterdefs{}
+\def\currentsectiondefs{}
+\def\currentsection{}
\def\prevchapterdefs{}
\def\prevsectiondefs{}
-\def\lastcolordefs{}
+\def\currentcolordefs{}
% Margin to add to right of even pages, to left of odd pages.
\newdimen\bindingoffset
@@ -310,11 +309,35 @@
% Main output routine.
%
\chardef\PAGE = 255
-\output = {\onepageout{\pagecontents\PAGE}}
+\newtoks\defaultoutput
+\defaultoutput = {\savetopmark\onepageout{\pagecontents\PAGE}}
+\output=\expandafter{\the\defaultoutput}
\newbox\headlinebox
\newbox\footlinebox
+% When outputting the double column layout for indices, an output routine
+% is run several times, which hides the original value of \topmark. This
+% can lead to a page heading being output and duplicating the chapter heading
+% of the index. Hence, save the contents of \topmark at the beginning of
+% the output routine. The saved contents are valid until we actually
+% \shipout a page.
+%
+% (We used to run a short output routine to actually set \topmark and
+% \firstmark to the right values, but if this was called with an empty page
+% containing whatsits for writing index entries, the whatsits would be thrown
+% away and the index auxiliary file would remain empty.)
+%
+\newtoks\savedtopmark
+\newif\iftopmarksaved
+\topmarksavedtrue
+\def\savetopmark{%
+ \iftopmarksaved\else
+ \global\savedtopmark=\expandafter{\topmark}%
+ \global\topmarksavedtrue
+ \fi
+}
+
% \onepageout takes a vbox as an argument.
% \shipout a vbox for a single page, adding an optional header, footer
% and footnote. This also causes index entries for this page to be written
@@ -326,23 +349,17 @@
\ifodd\pageno \advance\hoffset by \bindingoffset
\else \advance\hoffset by -\bindingoffset\fi
%
- % Common context changes for both heading and footing.
- % Do this outside of the \shipout so @code etc. will be expanded in
- % the headline as they should be, not taken literally (outputting ''code).
- \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
- %
% Retrieve the information for the headings from the marks in the page,
% and call Plain TeX's \makeheadline and \makefootline, which use the
% values in \headline and \footline.
%
% This is used to check if we are on the first page of a chapter.
- \ifcase1\topmark\fi
+ \ifcase1\the\savedtopmark\fi
\let\prevchaptername\thischaptername
\ifcase0\firstmark\fi
\let\curchaptername\thischaptername
%
\ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
- \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
%
\ifx\curchaptername\prevchaptername
\let\thischapterheading\thischapter
@@ -353,7 +370,14 @@
\def\thischapterheading{}%
\fi
%
+ % Common context changes for both heading and footing.
+ % Do this outside of the \shipout so @code etc. will be expanded in
+ % the headline as they should be, not taken literally (outputting ''code).
+ \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
+ %
\global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}%
+ %
+ \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
\global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}%
%
{%
@@ -362,14 +386,8 @@
% take effect in \write's, yet the group defined by the \vbox ends
% before the \shipout runs.
%
- \indexdummies % don't expand commands in the output.
- \normalturnoffactive % \ in index entries must not stay \, e.g., if
- % the page break happens to be in the middle of an example.
- % We don't want .vr (or whatever) entries like this:
- % \entry{{\indexbackslash }acronym}{32}{\code {\acronym}}
- % "\acronym" won't work when it's read back in;
- % it needs to be
- % {\code {{\backslashcurfont }acronym}
+ \atdummies % don't expand commands in the output.
+ \turnoffactive
\shipout\vbox{%
% Do this early so pdf references go to the beginning of the page.
\ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
@@ -384,8 +402,9 @@
\unvbox\footlinebox
\fi
%
- }% end of \shipout\vbox
- }% end of group with \indexdummies
+ }%
+ }%
+ \global\topmarksavedfalse
\advancepageno
\ifnum\outputpenalty>-20000 \else\dosupereject\fi
}
@@ -429,11 +448,10 @@
}%
}
-% First remove any @comment, then any @c comment. Also remove a @texinfoc
-% comment (see \scanmacro for details). Pass the result on to \argcheckspaces.
+% First remove any @comment, then any @c comment. Pass the result on to
+% \argcheckspaces.
\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
-\def\argremovec#1\c#2\ArgTerm{\argremovetexinfoc #1\texinfoc\ArgTerm}
-\def\argremovetexinfoc#1\texinfoc#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
+\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
%
@@ -1034,7 +1052,7 @@ where each line of input produces a line of output.}
tex.sprint(
string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o',
- (c / 256), (c % 256)))
+ math.floor(c / 256), math.floor(c % 256)))
else
c = c - 0x10000
local c_hi = c / 1024 + 0xd800
@@ -1044,8 +1062,8 @@ where each line of input produces a line of output.}
string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o' ..
string.char(0x5c) .. string.char(0x25) .. '03o',
- (c_hi / 256), (c_hi % 256),
- (c_lo / 256), (c_lo % 256)))
+ math.floor(c_hi / 256), math.floor(c_hi % 256),
+ math.floor(c_lo / 256), math.floor(c_lo % 256)))
end
end
end
@@ -1058,15 +1076,19 @@ where each line of input produces a line of output.}
function PDFescstr(str)
for c in string.bytes(str) do
if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then
- tex.sprint(
+ tex.sprint(-2,
string.format(string.char(0x5c) .. string.char(0x25) .. '03o',
c))
else
- tex.sprint(string.char(c))
+ tex.sprint(-2, string.char(c))
end
end
end
}
+ % The -2 in the arguments here gives all the input to TeX catcode 12
+ % (other) or 10 (space), preventing undefined control sequence errors. See
+ % https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html
+ %
\endgroup
\def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}}
\ifnum\luatexversion>84
@@ -1105,6 +1127,16 @@ where each line of input produces a line of output.}
\fi
\fi
+\newif\ifpdforxetex
+\pdforxetexfalse
+\ifpdf
+ \pdforxetextrue
+\fi
+\ifx\XeTeXrevision\thisisundefined\else
+ \pdforxetextrue
+\fi
+
+
% PDF uses PostScript string constants for the names of xref targets,
% for display in the outlines, and in other places. Thus, we have to
% double any backslashes. Otherwise, a name like "\node" will be
@@ -1161,7 +1193,7 @@ output) for that.)}
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
\def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
\domark
\pdfsetcolor{#1}%
}
@@ -1169,7 +1201,7 @@ output) for that.)}
\def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
+ \def\currentcolordefs{}
%
\def\makefootline{%
\baselineskip24pt
@@ -1547,7 +1579,7 @@ output) for that.)}
% Set color, and create a mark which defines \thiscolor accordingly,
% so that \makeheadline knows which color to restore.
\def\setcolor#1{%
- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
\domark
\pdfsetcolor{#1}%
}
@@ -1555,7 +1587,7 @@ output) for that.)}
\def\maincolor{\rgbBlack}
\pdfsetcolor{\maincolor}
\edef\thiscolor{\maincolor}
- \def\lastcolordefs{}
+ \def\currentcolordefs{}
%
\def\makefootline{%
\baselineskip24pt
@@ -2147,7 +2179,7 @@ end
% A few fonts for @defun names and args.
\setfont\defbf\bfshape{10}{\magstep1}{OT1}
\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
-\setfont\defsl\slshape{10}{\magstep1}{OT1TT}
+\setfont\defsl\slshape{10}{\magstep1}{OT1}
\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
\def\df{\let\ttfont=\deftt \let\bffont = \defbf
\let\ttslfont=\defttsl \let\slfont=\defsl \bf}
@@ -2295,7 +2327,7 @@ end
% A few fonts for @defun names and args.
\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
-\setfont\defsl\slshape{10}{\magstephalf}{OT1TT}
+\setfont\defsl\slshape{10}{\magstephalf}{OT1}
\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
\def\df{\let\ttfont=\deftt \let\bffont = \defbf
\let\slfont=\defsl \let\ttslfont=\defttsl \bf}
@@ -2818,7 +2850,7 @@ end
% @t, explicit typewriter.
\def\t#1{%
- {\tt \rawbackslash \plainfrenchspacing #1}%
+ {\tt \plainfrenchspacing #1}%
\null
}
@@ -2845,7 +2877,6 @@ end
% Turn off hyphenation.
\nohyphenation
%
- \rawbackslash
\plainfrenchspacing
#1%
}%
@@ -3032,41 +3063,33 @@ end
\global\def/{\normalslash}
}
-% we put a little stretch before and after the breakable chars, to help
-% line breaking of long url's. The unequal skips make look better in
-% cmtt at least, especially for dots.
-\def\urefprestretchamount{.13em}
-\def\urefpoststretchamount{.1em}
-\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax}
-\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax}
-%
-\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
-\def\urefcodedot{\urefprestretch .\urefpoststretch}
-\def\urefcodehash{\urefprestretch \#\urefpoststretch}
-\def\urefcodequest{\urefprestretch ?\urefpoststretch}
+\def\urefcodeamp{\urefprebreak \&\urefpostbreak}
+\def\urefcodedot{\urefprebreak .\urefpostbreak}
+\def\urefcodehash{\urefprebreak \#\urefpostbreak}
+\def\urefcodequest{\urefprebreak ?\urefpostbreak}
\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
{
\catcode`\/=\active
\global\def\urefcodeslashfinish{%
- \urefprestretch \slashChar
+ \urefprebreak \slashChar
% Allow line break only after the final / in a sequence of
% slashes, to avoid line break between the slashes in http://.
- \ifx\next/\else \urefpoststretch \fi
+ \ifx\next/\else \urefpostbreak \fi
}
}
-% One more complication: by default we'll break after the special
-% characters, but some people like to break before the special chars, so
-% allow that. Also allow no breaking at all, for manual control.
+% By default we'll break after the special characters, but some people like to
+% break before the special chars, so allow that. Also allow no breaking at
+% all, for manual control.
%
\parseargdef\urefbreakstyle{%
\def\txiarg{#1}%
\ifx\txiarg\wordnone
\def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
\else\ifx\txiarg\wordbefore
- \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
+ \def\urefprebreak{\urefallowbreak}\def\urefpostbreak{\nobreak}
\else\ifx\txiarg\wordafter
- \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
+ \def\urefprebreak{\nobreak}\def\urefpostbreak{\urefallowbreak}
\else
\errhelp = \EMsimple
\errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
@@ -3076,6 +3099,14 @@ end
\def\wordbefore{before}
\def\wordnone{none}
+% Allow a ragged right output to aid breaking long URL's. Putting stretch in
+% between characters of the URL doesn't look good.
+\def\urefallowbreak{%
+ \hskip 0pt plus 4 em\relax
+ \allowbreak
+ \hskip 0pt plus -4 em\relax
+}
+
\urefbreakstyle after
% @url synonym for @uref, since that's how everyone uses it.
@@ -3086,7 +3117,7 @@ end
% So now @email is just like @uref, unless we are pdf.
%
%\def\email#1{\angleleft{\tt #1}\angleright}
-\ifpdf
+\ifpdforxetex
\def\email#1{\doemail#1,,\finish}
\def\doemail#1,#2,#3\finish{\begingroup
\unsepspaces
@@ -3096,18 +3127,7 @@ end
\endlink
\endgroup}
\else
- \ifx\XeTeXrevision\thisisundefined
- \let\email=\uref
- \else
- \def\email#1{\doemail#1,,\finish}
- \def\doemail#1,#2,#3\finish{\begingroup
- \unsepspaces
- \pdfurl{mailto:#1}%
- \setbox0 = \hbox{\ignorespaces #2}%
- \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
- \endlink
- \endgroup}
- \fi
+ \let\email=\uref
\fi
% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
@@ -4641,19 +4661,6 @@ end
}
}
-% We have this subroutine so that we can handle at least some @value's
-% properly in indexes (we call \makevalueexpandable in \indexdummies).
-% The command has to be fully expandable (if the variable is set), since
-% the result winds up in the index file. This means that if the
-% variable's value contains other Texinfo commands, it's almost certain
-% it will fail (although perhaps we could fix that with sufficient work
-% to do a one-level expansion on the result, instead of complete).
-%
-% Unfortunately, this has the consequence that when _ is in the *value*
-% of an @set, it does not print properly in the roman fonts (get the cmr
-% dot accent at position 126 instead). No fix comes to mind, and it's
-% been this way since 2003 or earlier, so just ignore it.
-%
\def\expandablevalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
{[No value for ``#1'']}%
@@ -4672,7 +4679,7 @@ end
% NB flag names containing - or _ may not work here.
\def\dummyvalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
- \noexpand\value{#1}%
+ \string\value{#1}%
\else
\csname SET#1\endcsname
\fi
@@ -4682,7 +4689,7 @@ end
% if possible, otherwise sort late.
\def\indexnofontsvalue#1{%
\expandafter\ifx\csname SET#1\endcsname\relax
- ZZZZZZZ
+ ZZZZZZZ%
\else
\csname SET#1\endcsname
\fi
@@ -4832,29 +4839,15 @@ end
\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
-% Used when writing an index entry out to an index file to prevent
-% expansion of Texinfo commands that can appear in an index entry.
-%
-\def\indexdummies{%
- \escapechar = `\\ % use backslash in output files.
- \definedummyletter\@%
- \definedummyletter\ %
- %
- % For texindex which always views { and } as separators.
- \def\{{\lbracechar{}}%
- \def\}{\rbracechar{}}%
- %
- % Do the redefinitions.
- \definedummies
-}
-
-% Used for the aux and toc files, where @ is the escape character.
+% Used for the aux, toc and index files to prevent expansion of Texinfo
+% commands.
%
\def\atdummies{%
\definedummyletter\@%
\definedummyletter\ %
\definedummyletter\{%
\definedummyletter\}%
+ \definedummyletter\&%
%
% Do the redefinitions.
\definedummies
@@ -4878,8 +4871,7 @@ end
\def\definedummyletter#1{\def#1{\string#1}}%
\let\definedummyaccent\definedummyletter
-% Called from \indexdummies and \atdummies, to effectively prevent
-% the expansion of commands.
+% Called from \atdummies to prevent the expansion of commands.
%
\def\definedummies{%
%
@@ -4926,8 +4918,10 @@ end
\definedummyword\TeX
%
% Assorted special characters.
+ \definedummyword\ampchar
\definedummyword\atchar
\definedummyword\arrow
+ \definedummyword\backslashchar
\definedummyword\bullet
\definedummyword\comma
\definedummyword\copyright
@@ -4964,6 +4958,8 @@ end
\definedummyword\sup
\definedummyword\textdegree
%
+ \definedummyword\subentry
+ %
% We want to disable all macros so that they are not expanded by \write.
\macrolist
\let\value\dummyvalue
@@ -5044,11 +5040,10 @@ end
\commondummyword\xref
}
-% This does nothing, but for a time it was recommended to use
-% \usebracesinindexestrue to be able to use braces in index entries.
-
\let\indexlbrace\relax
\let\indexrbrace\relax
+\let\indexatchar\relax
+\let\indexbackslash\relax
{\catcode`\@=0
\catcode`\\=13
@@ -5082,10 +5077,8 @@ end
}
\gdef\indexnonalnumreappear{%
- \useindexbackslash
\let-\normaldash
\let<\normalless
- \def\@{@}%
}
}
@@ -5196,36 +5189,16 @@ end
-\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
-
-% Most index entries go through here, but \dosubind is the general case.
% #1 is the index name, #2 is the entry text.
-\def\doind#1#2{\dosubind{#1}{#2}{}}
-
-% There is also \dosubind {index}{topic}{subtopic}
-% which makes an entry in a two-level index such as the operation index.
-% TODO: Two-level index? Operation index?
-
-% Workhorse for all indexes.
-% #1 is name of index, #2 is stuff to put there, #3 is subentry --
-% empty if called from \doind, as we usually are (the main exception
-% is with most defuns, which call us directly).
-%
-\def\dosubind#1#2#3{%
+\def\doind#1#2{%
\iflinks
{%
- \requireopenindexfile{#1}%
- % Store the main index entry text (including the third arg).
- \toks0 = {#2}%
- % If third arg is present, precede it with a space.
- \def\thirdarg{#3}%
- \ifx\thirdarg\empty \else
- \toks0 = \expandafter{\the\toks0 \space #3}%
- \fi
%
+ \requireopenindexfile{#1}%
\edef\writeto{\csname#1indfile\endcsname}%
%
- \safewhatsit\dosubindwrite
+ \def\indextext{#2}%
+ \safewhatsit\doindwrite
}%
\fi
}
@@ -5247,21 +5220,7 @@ end
\fi}
\def\indexisfl{fl}
-% Output \ as {\indexbackslash}, because \ is an escape character in
-% the index files.
-\let\indexbackslash=\relax
-{\catcode`\@=0 \catcode`\\=\active
- @gdef@useindexbackslash{@def\{{@indexbackslash}}}
-}
-
-% Definition for writing index entry text.
-\def\sortas#1{\ignorespaces}%
-
-% Definition for writing index entry sort key. Should occur at the at
-% the beginning of the index entry, like
-% @cindex @sortas{september} \september
-% The \ignorespaces takes care of following space, but there's no way
-% to remove space before it.
+% Definition for writing index entry sort key.
{
\catcode`\-=13
\gdef\indexwritesortas{%
@@ -5272,51 +5231,150 @@ end
\xdef\indexsortkey{#1}\endgroup}
}
+\def\indexwriteseealso#1{
+ \gdef\pagenumbertext{\string\seealso{#1}}%
+}
+\def\indexwriteseeentry#1{
+ \gdef\pagenumbertext{\string\seeentry{#1}}%
+}
+
+% The default definitions
+\def\sortas#1{}%
+\def\seealso#1{\i{\putwordSeeAlso}\ #1}% for sorted index file only
+\def\putwordSeeAlso{See also}
+\def\seeentry#1{\i{\putwordSee}\ #1}% for sorted index file only
-% Write the entry in \toks0 to the index file.
+
+% Given index entry text like "aaa @subentry bbb @sortas{ZZZ}":
+% * Set \bracedtext to "{aaa}{bbb}"
+% * Set \fullindexsortkey to "aaa @subentry ZZZ"
+% * If @seealso occurs, set \pagenumbertext
%
-\def\dosubindwrite{%
- % Put the index entry in the margin if desired.
- \ifx\SETmarginindex\relax\else
- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
+\def\splitindexentry#1{%
+ \gdef\fullindexsortkey{}%
+ \xdef\bracedtext{}%
+ \def\sep{}%
+ \def\seealso##1{}%
+ \def\seeentry##1{}%
+ \expandafter\doindexsegment#1\subentry\finish\subentry
+}
+
+% append the results from the next segment
+\def\doindexsegment#1\subentry{%
+ \def\segment{#1}%
+ \ifx\segment\isfinish
+ \else
+ %
+ % Fully expand the segment, throwing away any @sortas directives, and
+ % trim spaces.
+ \edef\trimmed{\segment}%
+ \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+ %
+ \xdef\bracedtext{\bracedtext{\trimmed}}%
+ %
+ % Get the string to sort by. Process the segment with all
+ % font commands turned off.
+ \bgroup
+ \let\sortas\indexwritesortas
+ \let\seealso\indexwriteseealso
+ \let\seeentry\indexwriteseeentry
+ \indexnofonts
+ % The braces around the commands are recognized by texindex.
+ \def\lbracechar{{\string\indexlbrace}}%
+ \def\rbracechar{{\string\indexrbrace}}%
+ \let\{=\lbracechar
+ \let\}=\rbracechar
+ \def\@{{\string\indexatchar}}%
+ \def\atchar##1{\@}%
+ \def\backslashchar{{\string\indexbackslash}}%
+ \uccode`\~=`\\ \uppercase{\let~\backslashchar}%
+ %
+ \let\indexsortkey\empty
+ \global\let\pagenumbertext\empty
+ % Execute the segment and throw away the typeset output. This executes
+ % any @sortas or @seealso commands in this segment.
+ \setbox\dummybox = \hbox{\segment}%
+ \ifx\indexsortkey\empty{%
+ \indexnonalnumdisappear
+ \xdef\trimmed{\segment}%
+ \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
+ \xdef\indexsortkey{\trimmed}%
+ \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
+ }\fi
+ %
+ % Append to \fullindexsortkey.
+ \edef\tmp{\gdef\noexpand\fullindexsortkey{%
+ \fullindexsortkey\sep\indexsortkey}}%
+ \tmp
+ \egroup
+ \def\sep{\subentry}%
+ %
+ \expandafter\doindexsegment
\fi
+}
+\def\isfinish{\finish}%
+\newbox\dummybox % used above
+
+\let\subentry\relax
+
+% Use \ instead of @ in index files. To support old texi2dvi and texindex.
+% This works without changing the escape character used in the toc or aux
+% files because the index entries are fully expanded here, and \string uses
+% the current value of \escapechar.
+\def\escapeisbackslash{\escapechar=`\\}
+
+% Use \ in index files by default. texi2dvi didn't support @ as the escape
+% character (as it checked for "\entry" in the files, and not "@entry"). When
+% the new version of texi2dvi has had a chance to become more prevalent, then
+% the escape character can change back to @ again. This should be an easy
+% change to make now because both @ and \ are only used as escape characters in
+% index files, never standing for themselves.
+%
+\set txiindexescapeisbackslash
+
+% Write the entry in \indextext to the index file.
+%
+\def\doindwrite{%
+ \maybemarginindex
%
- % Remember, we are within a group.
- \indexdummies % Must do this here, since \bf, etc expand at this stage
- \useindexbackslash % \indexbackslash isn't defined now so it will be output
- % as is; and it will print as backslash.
- % The braces around \indexbrace are recognized by texindex.
- %
- % Get the string to sort by, by processing the index entry with all
- % font commands turned off.
- {\indexnofonts
- \def\lbracechar{{\indexlbrace}}%
- \def\rbracechar{{\indexrbrace}}%
- \let\{=\lbracechar
- \let\}=\rbracechar
- \indexnonalnumdisappear
- \xdef\indexsortkey{}%
- \let\sortas=\indexwritesortas
- \edef\temp{\the\toks0}%
- \setbox\dummybox = \hbox{\temp}% Make sure to execute any \sortas
- \ifx\indexsortkey\empty
- \xdef\indexsortkey{\temp}%
- \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
- \fi
- }%
+ \atdummies
+ %
+ \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else
+ \escapeisbackslash
+ \fi
+ %
+ % For texindex which always views { and } as separators.
+ \def\{{\lbracechar{}}%
+ \def\}{\rbracechar{}}%
+ \uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}%
+ %
+ % Split the entry into primary entry and any subentries, and get the index
+ % sort key.
+ \splitindexentry\indextext
%
% Set up the complete index entry, with both the sort key and
% the original text, including any font commands. We write
% three arguments to \entry to the .?? file (four in the
% subentry case), texindex reduces to two when writing the .??s
% sorted result.
+ %
\edef\temp{%
\write\writeto{%
- \string\entry{\indexsortkey}{\noexpand\folio}{\the\toks0}}%
+ \string\entry{\fullindexsortkey}%
+ {\ifx\pagenumbertext\empty\noexpand\folio\else\pagenumbertext\fi}%
+ \bracedtext}%
}%
\temp
}
-\newbox\dummybox % used above
+
+% Put the index entry in the margin if desired (undocumented).
+\def\maybemarginindex{%
+ \ifx\SETmarginindex\relax\else
+ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}%
+ \fi
+}
+\let\SETmarginindex=\relax
+
% Take care of unwanted page breaks/skips around a whatsit:
%
@@ -5404,9 +5462,14 @@ end
% \entry {topic}{pagelist}
% for a topic that is used without subtopics
% \primary {topic}
+% \entry {topic}{}
% for the beginning of a topic that is used with subtopics
% \secondary {subtopic}{pagelist}
% for each subtopic.
+% \secondary {subtopic}{}
+% for a subtopic with sub-subtopics
+% \tertiary {subtopic}{subsubtopic}{pagelist}
+% for each sub-subtopic.
% Define the user-accessible indexing commands
% @findex, @vindex, @kindex, @cindex.
@@ -5418,11 +5481,6 @@ end
\def\tindex {\tpindex}
\def\pindex {\pgindex}
-\def\cindexsub {\begingroup\obeylines\cindexsub}
-{\obeylines %
-\gdef\cindexsub "#1" #2^^M{\endgroup %
-\dosubind{cp}{#2}{#1}}}
-
% Define the macros used in formatting output of the sorted index material.
% @printindex causes a particular index (the ??s file) to get printed.
@@ -5436,14 +5494,10 @@ end
\plainfrenchspacing
\everypar = {}% don't want the \kern\-parindent from indentation suppression.
%
- % See if the index file exists and is nonempty.
- % Change catcode of @ here so that if the index file contains
- % \initial {@}
- % as its first line, TeX doesn't complain about mismatched braces
- % (because it thinks @} is a control sequence).
- \catcode`\@ = 12
% See comment in \requireopenindexfile.
\def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi
+ %
+ % See if the index file exists and is nonempty.
\openin 1 \jobname.\indexname s
\ifeof 1
% \enddoublecolumns gets confused if there is no text in the index,
@@ -5453,8 +5507,6 @@ end
\putwordIndexNonexistent
\typeout{No file \jobname.\indexname s.}%
\else
- \catcode`\\ = 0
- %
% If the index file exists but is empty, then \openin leaves \ifeof
% false. We have to make TeX try to read something from the file, so
% it can discover if there is anything in it.
@@ -5462,47 +5514,51 @@ end
\ifeof 1
\putwordIndexIsEmpty
\else
- % Index files are almost Texinfo source, but we use \ as the escape
- % character. It would be better to use @, but that's too big a change
- % to make right now.
- \def\indexbackslash{\ttbackslash}%
- \let\indexlbrace\{ % Likewise, set these sequences for braces
- \let\indexrbrace\} % used in the sort key.
- \begindoublecolumns
- \let\dotheinsertentrybox\dotheinsertentryboxwithpenalty
- %
- % Read input from the index file line by line.
- \loopdo
- \ifeof1 \else
- \read 1 to \nextline
- \fi
- %
- \indexinputprocessing
- \thisline
- %
- \ifeof1\else
- \let\thisline\nextline
- \repeat
- %%
- \enddoublecolumns
+ \expandafter\printindexzz\thisline\relax\relax\finish%
\fi
\fi
\closein 1
\endgroup}
-\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx}
-\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next}
-\def\indexinputprocessing{%
- \ifeof1
- \let\firsttoken\relax
+% If the index file starts with a backslash, forgo reading the index
+% file altogether. If somebody upgrades texinfo.tex they may still have
+% old index files using \ as the escape character. Reading this would
+% at best lead to typesetting garbage, at worst a TeX syntax error.
+\def\printindexzz#1#2\finish{%
+ \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax
+ \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1
+ \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax
+\errmessage{%
+ERROR: A sorted index file in an obsolete format was skipped.
+To fix this problem, please upgrade your version of 'texi2dvi'
+or 'texi2pdf' to that at <https://ftp.gnu.org/gnu/texinfo>.
+If you are using an old version of 'texindex' (part of the Texinfo
+distribution), you may also need to upgrade to a newer version (at least 6.0).
+You may be able to typeset the index if you run
+'texindex \jobname.\indexname' yourself.
+You could also try setting the 'txiindexescapeisbackslash' flag by
+running a command like
+'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do
+this, Texinfo will try to use index files in the old format.
+If you continue to have problems, deleting the index files and starting again
+might help (with 'rm \jobname.?? \jobname.??s')%
+}%
+ \else
+ (Skipped sorted index file in obsolete format)
+ \fi
+ \else
+ \begindoublecolumns
+ \input \jobname.\indexname s
+ \enddoublecolumns
+ \fi
\else
- \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}%
- \act
+ \begindoublecolumns
+ \catcode`\\=0\relax
+ \catcode`\@=12\relax
+ \input \jobname.\indexname s
+ \enddoublecolumns
\fi
}
-\def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken}
-\long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1}
-
% These macros are used by the sorted index file itself.
% Change them to control the appearance of the index.
@@ -5511,12 +5567,19 @@ end
\catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13
\catcode`\$=3
\gdef\initialglyphs{%
+ % special control sequences used in the index sort key
+ \let\indexlbrace\{%
+ \let\indexrbrace\}%
+ \let\indexatchar\@%
+ \def\indexbackslash{\math{\backslash}}%
+ %
% Some changes for non-alphabetic characters. Using the glyphs from the
% math fonts looks more consistent than the typewriter font used elsewhere
% for these characters.
- \def\indexbackslash{\math{\backslash}}%
- \let\\=\indexbackslash
+ \uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}}
%
+ % In case @\ is used for backslash
+ \uppercase{\let\\=~}
% Can't get bold backslash so don't use bold forward slash
\catcode`\/=13
\def/{{\secrmnotbold \normalslash}}%
@@ -5576,12 +5639,6 @@ end
\def\entry{%
\begingroup
%
- % For pdfTeX and XeTeX.
- % The redefinition of \domark stops marks being added in \pdflink to
- % preserve coloured links across page boundaries. Otherwise the marks
- % would get in the way of \lastbox in \insertentrybox.
- \let\domark\relax
- %
% Start a new paragraph if necessary, so our assignments below can't
% affect previous text.
\par
@@ -5614,35 +5671,31 @@ end
\gdef\finishentry#1{%
\egroup % end box A
\dimen@ = \wd\boxA % Length of text of entry
- \global\setbox\boxA=\hbox\bgroup\unhbox\boxA
- % #1 is the page number.
- %
- % Get the width of the page numbers, and only use
- % leaders if they are present.
- \global\setbox\boxB = \hbox{#1}%
- \ifdim\wd\boxB = 0pt
- \null\nobreak\hfill\ %
- \else
- %
- \null\nobreak\indexdotfill % Have leaders before the page number.
+ \global\setbox\boxA=\hbox\bgroup
+ \unhbox\boxA
+ % #1 is the page number.
%
- \ifpdf
- \pdfgettoks#1.%
- \hskip\skip\thinshrinkable\the\toksA
+ % Get the width of the page numbers, and only use
+ % leaders if they are present.
+ \global\setbox\boxB = \hbox{#1}%
+ \ifdim\wd\boxB = 0pt
+ \null\nobreak\hfill\ %
\else
- \ifx\XeTeXrevision\thisisundefined
- \hskip\skip\thinshrinkable #1%
- \else
+ %
+ \null\nobreak\indexdotfill % Have leaders before the page number.
+ %
+ \ifpdforxetex
\pdfgettoks#1.%
\hskip\skip\thinshrinkable\the\toksA
+ \else
+ \hskip\skip\thinshrinkable #1%
\fi
\fi
- \fi
\egroup % end \boxA
\ifdim\wd\boxB = 0pt
- \global\setbox\entrybox=\vbox{\unhbox\boxA}%
- \else
- \global\setbox\entrybox=\vbox\bgroup
+ \noindent\unhbox\boxA\par
+ \nobreak
+ \else\bgroup
% We want the text of the entries to be aligned to the left, and the
% page numbers to be aligned to the right.
%
@@ -5708,55 +5761,11 @@ end
\egroup % The \vbox
\fi
\endgroup
- \dotheinsertentrybox
}}
\newskip\thinshrinkable
\skip\thinshrinkable=.15em minus .15em
-\newbox\entrybox
-\def\insertentrybox{%
- \ourunvbox\entrybox
-}
-
-% default definition
-\let\dotheinsertentrybox\insertentrybox
-
-% Use \lastbox to take apart vbox box by box, and add each sub-box
-% to the current vertical list.
-\def\ourunvbox#1{%
-\bgroup % for local binding of \delayedbox
- % Remove the last box from box #1
- \global\setbox#1=\vbox{%
- \unvbox#1%
- \unskip % remove any glue
- \unpenalty
- \global\setbox\interbox=\lastbox
- }%
- \setbox\delayedbox=\box\interbox
- \ifdim\ht#1=0pt\else
- \ourunvbox#1 % Repeat on what's left of the box
- \nobreak
- \fi
- \box\delayedbox
-\egroup
-}
-\newbox\delayedbox
-\newbox\interbox
-
-% Used from \printindex. \firsttoken should be the first token
-% after the \entry. If it's not another \entry, we are at the last
-% line of a group of index entries, so insert a penalty to discourage
-% widowed index entries.
-\def\dotheinsertentryboxwithpenalty{%
- \ifx\firsttoken\isentry
- \else
- \penalty 9000
- \fi
- \insertentrybox
-}
-\def\isentry{\entry}%
-
% Like plain.tex's \dotfill, except uses up at least 1 em.
% The filll stretch here overpowers both the fil and fill stretch to push
% the page number to the right.
@@ -5766,24 +5775,15 @@ end
\def\primary #1{\line{#1\hfil}}
-\newskip\secondaryindent \secondaryindent=0.5cm
-\def\secondary#1#2{{%
- \parfillskip=0in
- \parskip=0in
- \hangindent=1in
- \hangafter=1
- \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
- \ifpdf
- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
- \else
- \ifx\XeTeXrevision\thisisundefined
- #2
- \else
- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
- \fi
- \fi
- \par
-}}
+\def\secondary{\indententry{0.5cm}}
+\def\tertiary{\indententry{1cm}}
+
+\def\indententry#1#2#3{%
+ \bgroup
+ \leftskip=#1
+ \entry{#2}{#3}%
+ \egroup
+}
% Define two-column mode, which we use to typeset indexes.
% Adapted from the TeXbook, page 416, which is to say,
@@ -5793,60 +5793,21 @@ end
\newbox\partialpage
\newdimen\doublecolumnhsize
-% Use inside an output routine to save \topmark and \firstmark
-\def\savemarks{%
- \global\savedtopmark=\expandafter{\topmark }%
- \global\savedfirstmark=\expandafter{\firstmark }%
-}
-\newtoks\savedtopmark
-\newtoks\savedfirstmark
-
-% Set \topmark and \firstmark for next time \output runs.
-% Can't be run from withinside \output (because any material
-% added while an output routine is active, including
-% penalties, is saved for after it finishes). The page so far
-% should be empty, otherwise what's on it will be thrown away.
-\def\restoremarks{%
- \mark{\the\savedtopmark}%
- \bgroup\output = {%
- \setbox\dummybox=\box\PAGE
- }abc\eject\egroup
- % "abc" because output routine doesn't fire for a completely empty page.
- \mark{\the\savedfirstmark}%
-}
-
\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
% If not much space left on page, start a new page.
\ifdim\pagetotal>0.8\vsize\vfill\eject\fi
%
% Grab any single-column material above us.
\output = {%
- %
- % Here is a possibility not foreseen in manmac: if we accumulate a
- % whole lot of material, we might end up calling this \output
- % routine twice in a row (see the doublecol-lose test, which is
- % essentially a couple of indexes with @setchapternewpage off). In
- % that case we just ship out what is in \partialpage with the normal
- % output routine. Generally, \partialpage will be empty when this
- % runs and this will be a no-op. See the indexspread.tex test case.
- \ifvoid\partialpage \else
- \onepageout{\pagecontents\partialpage}%
- \fi
+ \savetopmark
%
\global\setbox\partialpage = \vbox{%
% Unvbox the main output page.
\unvbox\PAGE
\kern-\topskip \kern\baselineskip
}%
- \savemarks
}%
\eject % run that output routine to set \partialpage
- \restoremarks
- %
- % We recover the two marks that the last output routine saved in order
- % to propagate the information in marks added around a chapter heading,
- % which could be otherwise be lost by the time the final page is output.
- %
%
% Use the double-column output routine for subsequent pages.
\output = {\doublecolumnout}%
@@ -5887,6 +5848,7 @@ end
%
\def\doublecolumnout{%
%
+ \savetopmark
\splittopskip=\topskip \splitmaxdepth=\maxdepth
\dimen@ = \vsize
\divide\dimen@ by 2
@@ -5910,7 +5872,7 @@ end
}
-% Finished with with double columns.
+% Finished with double columns.
\def\enddoublecolumns{%
% The following penalty ensures that the page builder is exercised
% _before_ we change the output routine. This is necessary in the
@@ -5942,7 +5904,7 @@ end
%
\output = {%
% Split the last of the double-column material.
- \savemarks
+ \savetopmark
\balancecolumns
}%
\eject % call the \output just set
@@ -5950,10 +5912,9 @@ end
% Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
% definition right away.
- \global\output = {\onepageout{\pagecontents\PAGE}}%
+ \global\output=\expandafter{\the\defaultoutput}
%
\endgroup % started in \begindoublecolumns
- \restoremarks
% Leave the double-column material on the current page, no automatic
% page break.
\box\balancedcolumns
@@ -6119,11 +6080,9 @@ end
% @raisesections: treat @section as chapter, @subsection as section, etc.
\def\raisesections{\global\advance\secbase by -1}
-\let\up=\raisesections % original BFox name
% @lowersections: treat @chapter as section, @section as subsection, etc.
\def\lowersections{\global\advance\secbase by 1}
-\let\down=\lowersections % original BFox name
% we only have subsub.
\chardef\maxseclevel = 3
@@ -6468,27 +6427,22 @@ end
\expandafter\ifx\thisenv\titlepage\else
\checkenv{}% chapters, etc., should not start inside an environment.
\fi
- % FIXME: \chapmacro is currently called from inside \titlepage when
- % \setcontentsaftertitlepage to print the "Table of Contents" heading, but
- % this should probably be done by \sectionheading with an option to print
- % in chapter size.
- %
% Insert the first mark before the heading break (see notes for \domark).
- \let\prevchapterdefs=\lastchapterdefs
- \let\prevsectiondefs=\lastsectiondefs
- \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+ \let\prevchapterdefs=\currentchapterdefs
+ \let\prevsectiondefs=\currentsectiondefs
+ \gdef\currentsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
\gdef\thissection{}}%
%
\def\temptype{#2}%
\ifx\temptype\Ynothingkeyword
- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
\gdef\thischapter{\thischaptername}}%
\else\ifx\temptype\Yomitfromtockeyword
- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
\gdef\thischapter{}}%
\else\ifx\temptype\Yappendixkeyword
\toks0={#1}%
- \xdef\lastchapterdefs{%
+ \xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\appendixletter}%
% \noexpand\putwordAppendix avoids expanding indigestible
@@ -6499,7 +6453,7 @@ end
}%
\else
\toks0={#1}%
- \xdef\lastchapterdefs{%
+ \xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\the\chapno}%
% \noexpand\putwordChapter avoids expanding indigestible
@@ -6519,18 +6473,18 @@ end
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \let\prevchapterdefs=\lastchapterdefs
- \let\prevsectiondefs=\lastsectiondefs
+ \let\prevchapterdefs=\currentchapterdefs
+ \let\prevsectiondefs=\currentsectiondefs
\domark
%
{%
\chapfonts \rm
\let\footnote=\errfootnoteheading % give better error message
%
- % Have to define \lastsection before calling \donoderef, because the
+ % Have to define \currentsection before calling \donoderef, because the
% xref code eventually uses it. On the other hand, it has to be called
% after \pchapsepmacro, or the headline will change too soon.
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
%
% Only insert the separating space if we have a chapter/appendix
% number, and don't print the unnumbered ``number''.
@@ -6619,10 +6573,10 @@ end
\csname #2fonts\endcsname \rm
%
% Insert first mark before the heading break (see notes for \domark).
- \let\prevsectiondefs=\lastsectiondefs
+ \let\prevsectiondefs=\currentsectiondefs
\ifx\temptype\Ynothingkeyword
\ifx\sectionlevel\seckeyword
- \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+ \gdef\currentsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
\gdef\thissection{\thissectionname}}%
\fi
\else\ifx\temptype\Yomitfromtockeyword
@@ -6630,7 +6584,7 @@ end
\else\ifx\temptype\Yappendixkeyword
\ifx\sectionlevel\seckeyword
\toks0={#1}%
- \xdef\lastsectiondefs{%
+ \xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
% \noexpand\putwordSection avoids expanding indigestible
@@ -6643,7 +6597,7 @@ end
\else
\ifx\sectionlevel\seckeyword
\toks0={#1}%
- \xdef\lastsectiondefs{%
+ \xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
% \noexpand\putwordSection avoids expanding indigestible
@@ -6669,28 +6623,28 @@ end
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \global\let\prevsectiondefs=\lastsectiondefs
+ \global\let\prevsectiondefs=\currentsectiondefs
\domark
%
% Only insert the space after the number if we have a section number.
\ifx\temptype\Ynothingkeyword
\setbox0 = \hbox{}%
\def\toctype{unn}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\else\ifx\temptype\Yomitfromtockeyword
% for @headings -- no section number, don't include in toc,
- % and don't redefine \lastsection.
+ % and don't redefine \currentsection.
\setbox0 = \hbox{}%
\def\toctype{omit}%
\let\sectionlevel=\empty
\else\ifx\temptype\Yappendixkeyword
\setbox0 = \hbox{#4\enspace}%
\def\toctype{app}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\else
\setbox0 = \hbox{#4\enspace}%
\def\toctype{num}%
- \gdef\lastsection{#1}%
+ \gdef\currentsection{#1}%
\fi\fi\fi
%
% Write the toc entry (before \donoderef). See comments in \chapmacro.
@@ -6780,13 +6734,8 @@ end
% 1 and 2 (the page numbers aren't printed), and so are the first
% two pages of the document. Thus, we'd have two destinations named
% `1', and two named `2'.
- \ifpdf
+ \ifpdforxetex
\global\pdfmakepagedesttrue
- \else
- \ifx\XeTeXrevision\thisisundefined
- \else
- \global\pdfmakepagedesttrue
- \fi
\fi
}
@@ -7149,11 +7098,7 @@ end
% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
% environment contents.
-\font\circle=lcircle10
-\newdimen\circthick
-\newdimen\cartouter\newdimen\cartinner
-\newskip\normbskip\newskip\normpskip\newskip\normlskip
-\circthick=\fontdimen8\circle
+
%
\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
\def\ctr{{\hskip 6pt\circle\char'010}}
@@ -7168,7 +7113,18 @@ end
%
\newskip\lskip\newskip\rskip
+% only require the font if @cartouche is actually used
+\def\cartouchefontdefs{%
+ \font\circle=lcircle10\relax
+ \circthick=\fontdimen8\circle
+}
+\newdimen\circthick
+\newdimen\cartouter\newdimen\cartinner
+\newskip\normbskip\newskip\normpskip\newskip\normlskip
+
+
\envdef\cartouche{%
+ \cartouchefontdefs
\ifhmode\par\fi % can't be in the midst of a paragraph.
\startsavinginserts
\lskip=\leftskip \rskip=\rightskip
@@ -7347,13 +7303,9 @@ end
% @raggedright does more-or-less normal line breaking but no right
-% justification. From plain.tex. Don't stretch around special
-% characters in urls in this environment, since the stretch at the right
-% should be enough.
+% justification. From plain.tex.
\envdef\raggedright{%
\rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax
- \def\urefprestretchamount{0pt}%
- \def\urefpoststretchamount{0pt}%
}
\let\Eraggedright\par
@@ -7728,6 +7680,21 @@ end
\fi\fi
}
+% \dosubind {index}{topic}{subtopic}
+%
+% If SUBTOPIC is present, precede it with a space, and call \doind.
+% (At some time during the 20th century, this made a two-level entry in an
+% index such as the operation index. Nobody seemed to notice the change in
+% behaviour though.)
+\def\dosubind#1#2#3{%
+ \def\thirdarg{#3}%
+ \ifx\thirdarg\empty
+ \doind{#1}{#2}%
+ \else
+ \doind{#1}{#2\space#3}%
+ \fi
+}
+
% Untyped functions:
% @deffn category name args
@@ -7742,7 +7709,6 @@ end
% \deffngeneral {subind}category name args
%
\def\deffngeneral#1#2 #3 #4\endheader{%
- % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
\dosubind{fn}{\code{#3}}{#1}%
\defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
}
@@ -8030,36 +7996,18 @@ end
}
\fi
-% alias because \c means cedilla in @tex or @math
-\let\texinfoc=\c
-
-\newcount\savedcatcodeone
-\newcount\savedcatcodetwo
-
% Used at the time of macro expansion.
% Argument is macro body with arguments substituted
\def\scanmacro#1{%
\newlinechar`\^^M
\def\xeatspaces{\eatspaces}%
%
- % Temporarily undo catcode changes of \printindex. Set catcode of @ to
- % 0 so that @-commands in macro expansions aren't printed literally when
- % formatting an index file, where \ is used as the escape character.
- \savedcatcodeone=\catcode`\@
- \savedcatcodetwo=\catcode`\\
- \catcode`\@=0
- \catcode`\\=\active
- %
% Process the macro body under the current catcode regime.
- \scantokens{#1@texinfoc}%
+ \scantokens{#1@comment}%
%
- \catcode`\@=\savedcatcodeone
- \catcode`\\=\savedcatcodetwo
- %
- % The \texinfoc is to remove the \newlinechar added by \scantokens, and
- % can be noticed by \parsearg.
- % We avoid surrounding the call to \scantokens with \bgroup and \egroup
- % to allow macros to open or close groups themselves.
+ % The \comment is to remove the \newlinechar added by \scantokens, and
+ % can be noticed by \parsearg. Note \c isn't used because this means cedilla
+ % in math mode.
}
% Used for copying and captions
@@ -8160,12 +8108,14 @@ end
\def\macroargctxt{%
\scanctxt
\catcode`\ =\active
+ \catcode`\@=\other
\catcode`\^^M=\other
\catcode`\\=\active
}
\def\macrolineargctxt{% used for whole-line arguments without braces
\scanctxt
+ \catcode`\@=\other
\catcode`\{=\other
\catcode`\}=\other
}
@@ -8729,9 +8679,29 @@ end
% also remove a trailing comma, in case of something like this:
% @node Help-Cross, , , Cross-refs
\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
-\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}\omittopnode}
+
+% Used so that the @top node doesn't have to be wrapped in an @ifnottex
+% conditional.
+% \doignore goes to more effort to skip nested conditionals but we don't need
+% that here.
+\def\omittopnode{%
+ \ifx\lastnode\wordTop
+ \expandafter\ignorenode\fi
+}
+\def\wordTop{Top}
+
+% Until the next @node or @bye command, divert output to a box that is not
+% output.
+\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}%
+\ignorenodebye
+}
+
+{\let\bye\relax
+\gdef\ignorenodebye{\let\bye\ignorenodebyedef}
+\gdef\ignorenodebyedef{\egroup(`Top' node ignored)\bye}}
+% The redefinition of \bye here is because it is declared \outer
-\let\nwnode=\node
\let\lastnode=\empty
% Write a cross-reference definition for the current node. #1 is the
@@ -8754,7 +8724,7 @@ end
% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
% anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \lastsection,
+% 1) NAME-title - the current sectioning name taken from \currentsection,
% or the anchor name.
% 2) NAME-snt - section number and type, passed as the SNT arg, or
% empty for anchors.
@@ -8776,7 +8746,7 @@ end
\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
##1}{##2}}% these are parameters of \writexrdef
}%
- \toks0 = \expandafter{\lastsection}%
+ \toks0 = \expandafter{\currentsection}%
\immediate \writexrdef{title}{\the\toks0 }%
\immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
\safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
@@ -9206,19 +9176,6 @@ end
\catcode`\^^]=\other
\catcode`\^^^=\other
\catcode`\^^_=\other
- % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
- % in xref tags, i.e., node names. But since ^^e4 notation isn't
- % supported in the main text, it doesn't seem desirable. Furthermore,
- % that is not enough: for node names that actually contain a ^
- % character, we would end up writing a line like this: 'xrdef {'hat
- % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
- % argument, and \hat is not an expandable control sequence. It could
- % all be worked out, but why? Either we support ^^ or we don't.
- %
- % The other change necessary for this was to define \auxhat:
- % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
- % and then to call \auxhat in \setq.
- %
\catcode`\^=\other
%
% Special characters. Should be turned off anyway, but...
@@ -9236,14 +9193,7 @@ end
\catcode`\%=\other
\catcode`+=\other % avoid \+ for paranoia even though we've turned it off
%
- % This is to support \ in node names and titles, since the \
- % characters end up in a \csname. It's easier than
- % leaving it active and making its active definition an actual \
- % character. What I don't understand is why it works in the *value*
- % of the xrdef. Seems like it should be a catcode12 \, and that
- % should not typeset properly. But it works, so I'm moving on for
- % now. --karl, 15jan04.
- \catcode`\\=\other
+ \catcode`\\=\active
%
% @ is our escape character in .aux files, and we need braces.
\catcode`\{=1
@@ -9574,13 +9524,13 @@ end
\global\advance\floatno by 1
%
{%
- % This magic value for \lastsection is output by \setref as the
+ % This magic value for \currentsection is output by \setref as the
% XREFLABEL-title value. \xrefX uses it to distinguish float
% labels (which have a completely different output format) from
% node and anchor labels. And \xrdef uses it to construct the
% lists of floats.
%
- \edef\lastsection{\floatmagic=\safefloattype}%
+ \edef\currentsection{\floatmagic=\safefloattype}%
\setref{\floatlabel}{Yfloat}%
}%
\fi
@@ -9703,7 +9653,7 @@ end
% #1 is the control sequence we are passed; we expand into a conditional
% which is true if #1 represents a float ref. That is, the magic
-% \lastsection value which we \setref above.
+% \currentsection value which we \setref above.
%
\def\iffloat#1{\expandafter\doiffloat#1==\finish}
%
@@ -11191,21 +11141,14 @@ directory should work if nowhere else does.}
\relax
}
-% define all Unicode characters we know about, for the sake of @U.
+% Define all Unicode characters we know about. This makes UTF-8 the default
+% input encoding and allows @U to work.
\iftxinativeunicodecapable
\nativeunicodechardefsatu
\else
\utfeightchardefs
\fi
-
-% Make non-ASCII characters printable again for compatibility with
-% existing Texinfo documents that may use them, even without declaring a
-% document encoding.
-%
-\setnonasciicharscatcode \other
-
-
\message{formatting,}
\newdimen\defaultparindent \defaultparindent = 15pt
@@ -11521,11 +11464,9 @@ directory should work if nowhere else does.}
% \backslashcurfont outputs one backslash character in current font,
% as in \char`\\.
\global\chardef\backslashcurfont=`\\
-\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
-% \realbackslash is an actual character `\' with catcode other, and
-% \doublebackslash is two of them (for the pdf outlines).
-{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
+% \realbackslash is an actual character `\' with catcode other.
+{\catcode`\\=\other @gdef@realbackslash{\}}
% In Texinfo, backslash is an active character; it prints the backslash
% in fixed width font.
@@ -11543,10 +11484,8 @@ directory should work if nowhere else does.}
@def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
@let@backslashchar = @ttbackslash % @backslashchar{} is for user documents.
-% \rawbackslash defines an active \ to do \backslashcurfont.
% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other. We switch back and forth between these.
-@gdef@rawbackslash{@let\=@backslashcurfont}
+% catcode other.
@gdef@otherbackslash{@let\=@realbackslash}
% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
@@ -11618,7 +11557,7 @@ directory should work if nowhere else does.}
@ifx\@eatinput @let\ = @ttbackslash @fi
@catcode13=5 % regular end of line
@enableemergencynewline
- @let@c=@texinfoc
+ @let@c=@comment
@let@parsearg@originalparsearg
% Also turn back on active characters that might appear in the input
% file name, in case not using a pre-dumped format.
diff --git a/macros/texinfo/texinfo/doc/texinfo.texi b/macros/texinfo/texinfo/doc/texinfo.texi
index 70567bb668..f0fb2412ab 100644
--- a/macros/texinfo/texinfo/doc/texinfo.texi
+++ b/macros/texinfo/texinfo/doc/texinfo.texi
@@ -40,14 +40,9 @@ Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
-and with the Back-Cover Texts as in (a) below. A copy of the license
-is included in the section entitled ``GNU Free Documentation
-License''.
-
-(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual. Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license is included in the section entitled
+``GNU Free Documentation License''.
@end quotation
@end copying
@@ -114,7 +109,6 @@ Cover art by Etienne Suvasa.
@contents
-@ifnottex
@node Top
@top Texinfo
@@ -122,8 +116,6 @@ This manual is for GNU Texinfo (version @value{VERSION}, @value{UPDATED}),
a documentation system that can produce both online information and a
printed manual from a single source using semantic markup.
-@end ifnottex
-
@ifinfo
The first part of this master menu lists the major nodes in this Info
document, including the @@-command and concept indices. The rest of
@@ -403,6 +395,7 @@ Indices
* Predefined Indices:: Use different indices for different kinds
of entries.
* Indexing Commands:: How to make an index entry.
+* Advanced Indexing:: Advanced indexing commands.
* Printing Indices & Menus:: How to print an index in hardcopy and
generate index menus in Info.
* Combining Indices:: How to combine indices.
@@ -639,7 +632,6 @@ HTML Cross-references
* 8-bit Expansion: HTML Xref 8-bit Character Expansion.
* Mismatch: HTML Xref Mismatch.
* Configuration: HTML Xref Configuration. htmlxref.cnf.
-* Preserving links: HTML Xref Link Preservation. MANUAL-noderename.cnf.
Sample Texinfo Files
@@ -1453,11 +1445,8 @@ regarding nesting of such commands, @pxref{Conditional Nesting}.)
@cindex Texinfo file minimum
By convention, the name of a Texinfo file ends with one of the
-extensions @file{.texinfo}, @file{.texi}, @file{.txi}, or
-@file{.tex}.@footnote{The longer extensions are preferred, since they
-describe more clearly to a human reader the nature of the file. The
-shorter extensions are for operating systems that cannot handle long
-file names.}
+extensions @file{.texi}, @file{.texinfo}, @file{.txi}, or
+@file{.tex}.
In order to be made into a printed manual and other output
formats, a Texinfo file must begin with lines like this:
@@ -1705,7 +1694,7 @@ This chapter expands on the minimal complete Texinfo source file
previously given (@pxref{Short Sample}).
Certain pieces of information must be provided at the beginning of a
-Texinfo file, such the title of the document and the Top node. A table
+Texinfo file, such as the title of the document and the Top node. A table
of contents is also generally produced here.
@cindex Frontmatter, text in
@@ -2204,8 +2193,6 @@ The @code{@@end titlepage} command starts a new page and turns on page
numbering (@pxref{Heading Generation}). All the
material that you want to appear on unnumbered pages should be put
between the @code{@@titlepage} and @code{@@end titlepage} commands.
-You can force the table of contents to appear there with the
-@code{@@setcontentsaftertitlepage} command (@pxref{Contents}).
@findex page@r{, within @code{@@titlepage}}
By using the @code{@@page} command you can force a page break within the
@@ -3455,7 +3442,7 @@ for the Info system as a whole. (Each directory with Info files is
intended to contain a file named @file{dir}.)
That's fine for Info, but for HTML output, one might well want the Up
-link from the Top node to go somewhere other than @samp{dir.html}.
+link from the Top node to go to some specific place.
For example, for GNU the natural place would be
@url{http://www.gnu.org/manual/} (a web page collecting links to most
GNU manuals), better specified as just @code{/manual/} if the manual
@@ -3467,7 +3454,8 @@ Customization Variables}), as in
$ @kbd{makeinfo --html -c TOP_NODE_UP_URL=/manual/} ...
@end example
-All links to @code{(dir)} will be replaced by the given url.
+@c the following line is not true anymore
+@c All links to @code{(dir)} will be replaced by the given url.
@item
@cindex Prev node of Top node
@@ -3554,7 +3542,7 @@ Section Section Section Section Section Section
@end group
@end example
-Using explicit pointers (not recommended, but for shown for purposes
+Using explicit pointers (not recommended, but shown for purposes
of the example), the fully-written command to start Chapter@tie{}2
would be this:
@@ -5508,23 +5496,25 @@ refer to printed works for which no Info form exists.
@section @code{@@url}, @code{@@uref@{@var{url}[, @var{text}][, @var{replacement}]@}}
@anchor{uref}@c old name
-@findex uref
+@anchor{url}
@cindex Uniform resource locator, referring to
@cindex URL, referring to
+@findex url
@cindex @code{href}, producing HTML
-@code{@@uref} produces a reference to a uniform resource locator
+@code{@@url} produces a reference to a uniform resource locator
(url). It takes one mandatory argument, the url, and two optional
arguments which control the text that is displayed. In HTML and PDF
-output, @code{@@uref} produces a link you can follow. (To merely
+output, @code{@@url} produces a link you can follow. (To merely
indicate a url without creating a link people can follow, use
@code{@@indicateurl}, @pxref{@code{@@indicateurl}}.)
-@findex url
-@anchor{url}@code{@@url} is a synonym for @code{@@uref}.
-(Originally, @code{@@url} had the meaning of @code{@@indicateurl}, but
-in practice it was almost always misused. So we've changed the
-meaning.)
+@findex uref
+@code{@@uref} is a synonym for @code{@@url}.
+(Originally, @code{@@url} had the meaning of @code{@@indicateurl}
+and @code{@@uref} was required to produce a working link, but
+in practice @code{@@url} was almost always misused. So we've changed
+the meaning.)
The second argument, if specified, is the text to display (the default
is the url itself); in Info, DVI, and PDF output, but not in HTML
@@ -5555,25 +5545,25 @@ just one argument. The given url is both the target and the visible
text of the link:
@example
-The official GNU ftp site is @@uref@{http://ftp.gnu.org/gnu@}.
+The official GNU ftp site is @@url@{http://ftp.gnu.org/gnu@}.
@end example
@noindent produces:
@display
-The official GNU ftp site is @uref{http://ftp.gnu.org/gnu}.
+The official GNU ftp site is @url{http://ftp.gnu.org/gnu}.
@end display
@subsubheading Two-argument form of @code{@@url}
Here is an example of the two-argument form:
@example
-The official @@uref@{http://ftp.gnu.org/gnu, GNU ftp site@}
+The official @@url@{http://ftp.gnu.org/gnu, GNU ftp site@}
holds programs and texts.
@end example
@noindent which produces:
@display
-The official @uref{http://ftp.gnu.org/gnu, GNU ftp site}
+The official @url{http://ftp.gnu.org/gnu, GNU ftp site}
holds programs and texts.
@end display
@@ -5593,12 +5583,12 @@ holds programs and texts.
Finally, an example of the three-argument form:
@example
-The @@uref@{/man.cgi/1/ls,,ls@} program @dots{}
+The @@url@{/man.cgi/1/ls,,ls@} program @dots{}
@end example
@noindent which, except for HTML, produces:
@display
-The @uref{/man.cgi/1/ls,,ls} program @dots{}
+The @url{/man.cgi/1/ls,,ls} program @dots{}
@end display
@noindent but with HTML:
@@ -8925,7 +8915,7 @@ discussion of each entry. In a printed manual, this information
consists of page numbers. In an Info file, this information is a menu
entry leading to the first node referenced.
-Texinfo provides several predefined kinds of index: an index for
+Texinfo provides several predefined kinds of indices: an index for
functions, an index for variables, an index for concepts, and so on.
You can combine indices or use them for other than their canonical
purpose. Lastly, you can define your own new indices.
@@ -8934,6 +8924,7 @@ purpose. Lastly, you can define your own new indices.
* Predefined Indices:: Use different indices for different kinds
of entries.
* Indexing Commands:: How to make an index entry.
+* Advanced Indexing:: Advanced indexing commands.
* Index Entries:: Choose different words for index entries.
* Printing Indices & Menus:: How to print an index in hardcopy and
generate index menus in Info.
@@ -8952,37 +8943,37 @@ meanings, abbreviations, and the corresponding index entry commands:
@item cp
@cindex @code{cp} (concept) index
@findex cindex
-(@code{@@cindex}) concept index, for general concepts.
+(@code{@@cindex}) Concept index, for general concepts.
@item fn
@cindex @code{fn} (function) index
@findex findex
-(@code{@@findex}) function index, for function and function-like
+(@code{@@findex}) Function index, for function and function-like
names (such as entry points of libraries).
@item ky
@cindex @code{ky} (keystroke) index
@findex kindex
-(@code{@@kindex}) keystroke index, for keyboard commands.
+(@code{@@kindex}) Keystroke index, for keyboard commands.
@item pg
@cindex @code{pg} (program) index
@findex pindex
-(@code{@@pindex}) program index, for names of programs.
+(@code{@@pindex}) Program index, for names of programs.
@item tp
@cindex @code{tp} (data type) index
@findex tindex
-(@code{@@tindex}) data type index, for type names (such as structures
+(@code{@@tindex}) Data type index, for type names (such as structures
defined in header files).
@item vr
@cindex @code{vr} (variable) index
@findex vindex
-(@code{@@vindex}) variable index, for variable names (such as global
-variables of libraries).
+(@code{@@vindex}) Variable index, for variable names (such as library global
+variables).
@end table
@noindent
Not every manual needs all of these, and most manuals use only two or
three at most. The present manual, for example, has two indices: a
-concept index and an @@-command index (that is actually the function
-index but is called a command index in the chapter heading).
+concept index and an @@-command index. (The latter is actually the function
+index but is called a command index in the chapter heading.)
You are not required to use the predefined indices strictly for their
canonical purposes. For example, suppose you wish to index some C
@@ -9001,7 +8992,7 @@ Indices}).
We recommend having a single index in the final document whenever
possible, however many source indices you use, since then readers have
only one place to look. Two or more source indices can be combined
-into one output index using the @code{@@synindex} or
+into one output index by using the @code{@@synindex} or
@code{@@syncodeindex} commands (@pxref{Combining Indices}).
@@ -9049,7 +9040,7 @@ Hello, there!
whatever context) ends up before the material, where readers want to
be, instead of after.
-Try to avoid using a colon in an index entry, as this may confuse some
+Try to avoid using a colon in index entries, as this may confuse some
Info readers. @xref{Menu Parts} for more information about the
structure of a menu entry.
@c At the time of writing, it always works in standalone info, and a
@@ -9067,10 +9058,10 @@ font (@pxref{Fonts}).
@cindex sort keys for index entries
@cindex index sorting
For the printed output, you may specify an explicit sort key for an
-index entry using @code{@@sortas} immediately following the index
-command. For example: @samp{@@findex @@sortas@{\@} \ @@r@{(literal
-\ in @@code@{@@@@math@})} sorts the index entry this produces under
-backslash.
+index entry using @code{@@sortas} following either the index command
+or the text of the entry. For example: @samp{@@findex @@sortas@{\@}
+\ @@r@{(literal \ in @@code@{@@@@math@})} sorts the index entry this
+produces under backslash.
@vindex txiindexbackslashignore
@vindex txiindexhyphenignore
@@ -9086,8 +9077,71 @@ and @samp{@@}, which are ignored by giving as an argument to the
@code{txiindexatsignignore}. For example, specifying @samp{@@set
txiindexbackslashignore} causes the @samp{\mathopsup} entry in the
index for this manual to be sorted as if it were @samp{mathopsup},
-so that it appears among the other entries beginning `M'.
+so that it appears among the other entries beginning with `M'.
+
+@node Advanced Indexing
+@section Advanced Indexing Commands
+@cindex Indexing, advanced
+@cindex Advanced indexing
+
+Texinfo provides several commands for doing advanced indexing,
+similar to the indices you may see in professionally published books.
+
+@findex @@subentry
+First, you can create @dfn{multilevel} index entries, allowing you
+to group many related subtopics under the same higher level topic.
+You do this by separating the parts of such an entry with the
+@code{@@subentry} command. Such commands might look like this:
+
+@example
+@@cindex Superhumans @@subentry villians
+@@cindex Superhumans @@subentry heros
+@end example
+
+You may have up to three levels in an entry:
+
+@example
+@@cindex coffee makers @@subentry electric @@subentry pink
+@@cindex coffee makers @@subentry electric @@subentry blue
+@end example
+
+You can use the @code{@@sortas} command mentioned earlier with any or
+all of the three parts of an entry to cause them to sort differently
+than they would by default.
+@findex @@seeentry
+Second, you may provide an index entry that points to another,
+using the @code{@@seeentry} (``see entry'') command. For example:
+
+@example
+@@cindex Indexes @@seeentry@{Indices@}
+@end example
+
+Such an entry should be unique in your document; the idea is to
+redirect the reader to the other entry where they will find all
+the information they are looking for.
+
+@findex @@seealso
+Finally, you may provide a ``see also'' entry using the @code{@@seealso}
+command. These entries go along with regular entries, and are grouped
+together with them in the final printed index. For example:
+
+@example
+@@cindex Coffee
+@@cindex Coffee @@subentry With milk and sugar
+@@cindex Coffee @@subentry With doughnuts
+@@cindex Coffee @@subentry Decaffeinated
+@@cindex Coffee @@seealso@{Tea@}
+@end example
+
+When using all three of these advanced commands, @emph{do not}
+place a comma betwen the different parts of the index text. The
+@command{texindex} program, which sorts the index entries and
+generates the indexing formatting commands, takes care of placing
+commas in the correct places for you.
+
+These features are most useful with printed documents created
+with @TeX{}, and when translating Texinfo to Docbook.
@node Index Entries
@section Making Index Entries
@@ -9108,7 +9162,7 @@ This is the case convention we use in most GNU manuals' indices.
If you don't see how to make an entry terse yet clear, make it longer
and clear---not terse and confusing. If many of the entries are
several words long, the index may look better if you use a different
-convention: to capitalize the first word of each entry. Whichever
+convention: capitalize the first word of each entry. Whichever
case convention you use, use it consistently.
In any event, do not ever capitalize a case-sensitive name such as a C
@@ -9125,6 +9179,8 @@ index entries don't see undifferentiated lists. Consider this an
opportunity to make otherwise-identical index entries be more
specific, so readers can more easily find the exact place they are
looking for.
+The advanced indexing features described in @ref{Advanced Indexing}
+can help with this, as well.
When you are making index entries, it is good practice to think of the
@@ -9133,7 +9189,7 @@ different ways people may look for something. Different people
helpful index will have items indexed under all the different words
that people may use. For example, one reader may think it obvious
that the two-letter names for indices should be listed under
-``Indices, two-letter names, since ``Indices'' are the general
+``Indices, two-letter names'', since ``Indices'' are the general
concept. But another reader may remember the specific concept of
two-letter names and search for the entry listed as ``Two letter names
for indices''. A good index will have both entries and will help both
@@ -9162,12 +9218,12 @@ process of creating a printed manual, you must run a program called
sorted index file. The sorted index file is what is actually used to
print the index.
-Texinfo offers six separate types of predefined index, which suffice
-in most cases. @xref{Indices}, for information on this, as well
-defining your own new indices, combining indices, and, most
-importantly advice on writing the actual index entries. This section
-focuses on printing indices, which is done with the
-@code{@@printindex} command.
+Texinfo offers six separate types of predefined index, which suffice in
+most cases. See the other parts of this chapter for information on this,
+as well as advanced indexing commands, defining your own new indices,
+combining indices, and, most importantly, advice on writing the actual
+index entries. This section focuses on printing indices, which is done
+with the @code{@@printindex} command.
@findex printindex
@code{@@printindex} takes one argument, a two-letter index
@@ -9268,7 +9324,7 @@ would need to enclose every one of them between the braces of
@node @code{@@syncodeindex}
-@subsection @code{@@syncodeindex}: Combining indices using @code{@@code}
+@subsection @code{@@syncodeindex}: Combining Indices Using @code{@@code}
@anchor{syncodeindex}@c old name
@findex syncodeindex
@@ -9294,17 +9350,17 @@ For this purpose, the indices are given two-letter names:
@table @samp
@item cp
-concept index
+Concept index
@item fn
-function index
-@item vr
-variable index
+Function index
@item ky
-key index
+Key index
@item pg
-program index
+Program index
@item tp
-data type index
+Data type index
+@item vr
+Variable index
@end table
Write a @code{@@syncodeindex} command before or shortly after the
@@ -9317,7 +9373,7 @@ following:
@end example
@noindent
-This will cause all entries designated for the function index to merge
+This causes all entries designated for the function index to merge
in with the concept index instead.
To merge both a variables index and a function index into a concept
@@ -9340,7 +9396,7 @@ index into a concept index, all the function names are printed in the
@node @code{@@synindex}
-@subsection @code{@@synindex}: Combining indices
+@subsection @code{@@synindex}: Combining Indices
@anchor{synindex}@c old name
@findex synindex
@@ -9415,17 +9471,17 @@ the predefined indices. For example:
@end group
@end example
-The @code{@@defcodeindex} is like the @code{@@defindex} command,
+The @code{@@defcodeindex} command is like the @code{@@defindex} command,
except that, in the printed output, it prints entries in an
-@code{@@code} font by default instead of a roman font.
+@code{@@code} font by default instead of in a roman font.
You should define new indices before the end-of-header line of a
Texinfo file, and (of course) before any @code{@@synindex} or
@code{@@syncodeindex} commands (@pxref{Texinfo File Header}).
As mentioned earlier (@pxref{Predefined Indices}), we recommend having
-a single index in the final document whenever possible, however many
-source indices you use, since then readers have only one place to
+a single index in the final document whenever possible (no matter however many
+source indices you use), since then readers have only one place to
look.
When creating an index, @TeX{} creates a file whose extension is the
@@ -11102,8 +11158,7 @@ now produces:
The command @code{@@U@{@var{hex}@}} inserts a representation of the
Unicode character U+@var{hex}. For example, @code{@@U@{0132@}}
-inserts the Dutch `IJ' ligature (poorly shown here as simply the two
-letters `I' and `J').
+inserts the Dutch `IJ' ligature (`@U{0132}').
The @var{hex} value should be at least four hex digits; leading zeros
are @emph{not} added. In general, @var{hex} must specify a valid
@@ -11133,14 +11188,9 @@ entity reference of the form @samp{&#x@var{hex};}, as in
HTML document uses some other encoding (say, Latin@tie{}1) and the
given character is not supported in that encoding.
-@cindex UTF-8, output from @code{@@U}
-In Info and plain text, if the document encoding is specified
-explicitly to be UTF-8, the output will be the UTF-8 representation of
-the character U+@var{hex} (presuming it's a valid character). In all
-other cases, the output is the ASCII sequence @samp{U+@var{hex}}, as
-in the six ASCII characters @samp{U+0132} for the example above.
-
-That's all. No magic!
+In Info and plain text, if the output encoding is not UTF-8, the output
+is the ASCII sequence @samp{U+@var{hex}}, as in the six ASCII characters
+@samp{U+0132} for the example above.
@node Breaks
@@ -15515,29 +15565,30 @@ For more information, see:
@cindex @sortas{cshrc init} @file{.cshrc} initialization file
@cindex Initialization file for @TeX{} input
-@TeX{} needs to know where to find the @file{texinfo.tex} file that the
+@TeX{} needs to find the @file{texinfo.tex} file that the
@samp{\input texinfo} command on the first line reads. The
@file{texinfo.tex} file tells @TeX{} how to handle @@-commands; it is
included in all standard GNU distributions. The latest version
released for general use is available
from the usual GNU servers and mirrors:
-@smalldisplay
+@display
@uref{http://ftp.gnu.org/gnu/texinfo/texinfo.tex}
@uref{http://ftpmirror.gnu.org/texinfo/texinfo.tex}
-@end smalldisplay
+@end display
The latest development version is available from the Texinfo source
repository:
-@smalldisplay
-@uref{http://svn.savannah.gnu.org/viewvc/trunk/doc/texinfo.tex?root=texinfo&view=log}
-@end smalldisplay
+
+@display
+@uref{http://git.savannah.gnu.org/cgit/texinfo.git/plain/doc/texinfo.tex}
+@end display
@pindex texinfo.tex@r{, installing}
-@file{texinfo.tex} is essentially a standalone file, and compatibility
-is of utmost concern; so, if you need or want to try a newer version
+@file{texinfo.tex} is essentially a standalone file,
+so, if you need or want to try a newer version
than came with your system, it nearly always suffices to download it
-and put it anywhere that @TeX{} will find it (first). You can replace
+and put it anywhere that @TeX{} will find it. You can replace
any existing @file{texinfo.tex} with a newer version (of course saving
the original in case of disaster).
@@ -15558,74 +15609,54 @@ to have the European Computer Modern fonts (e.g., @file{ecrm1000}) and
To use the @code{@@euro} command, you'll need the @samp{feym*} fonts
(e.g., @file{feymr10}). @xref{@code{@@euro}}.
-All of the above files (and a whole lot more) should be installed by
-default in a reasonable @TeX{} installation.
+All of the above files should be installed by default in a reasonable
+@TeX{} installation.
@pindex texinfo.cnf @r{installation}
@cindex Customizing of @TeX{} for Texinfo
@cindex Site-wide Texinfo configuration file
Optionally, you may create a file @file{texinfo.cnf} for site configuration.
-This file is read by @TeX{} at the beginning of a Texinfo file.
-You can put any commands you like there, according to local site-wide
-conventions. They will be read by @TeX{} when processing any Texinfo
-document. For example, if @file{texinfo.cnf} contains the line
+When processing a Texinfo file, @TeX{} looks for this file
+in its search path, which includes the current directory and standard
+installation directories.
+You can use this file for local conventions. For example, if
+@file{texinfo.cnf} contains the line
@samp{@@afourpaper} (@pxref{A4 Paper}), then all Texinfo documents
will be processed with that page size in effect. If you have nothing
to put in @file{texinfo.cnf}, you do not need to create it.
@cindex Environment variable @code{TEXINPUTS}
@vindex TEXINPUTS
-If neither of the above locations for these system files suffice, you
-can specify the directories explicitly. For @file{texinfo.tex}, you
-can do this by writing the complete path for the file after the
-@code{\input} command. Another way, that works for both
-@file{texinfo.tex} and @file{texinfo.cnf} (and any other file @TeX{}
-might read), is to set the @code{TEXINPUTS} environment variable in
-your @file{.profile} or @file{.cshrc} file.
-
-Whether you use @file{.profile} or @file{.cshrc} depends on
-whether you use a Bourne shell-compatible (@code{sh}, @code{bash},
-@code{ksh}, @dots{}) or C shell-compatible (@code{csh}, @code{tcsh})
-command interpreter, respeictvely.
-
-In a @file{.profile} file, you could use the following @code{sh} command
-sequence:
+You can set the @code{TEXINPUTS} environment variable
+to allow @TeX{} to find @file{texinfo.cnf}.
+(This also works for @file{texinfo.tex} and any other file @TeX{}
+might read). For example, if you are using a Bourne shell-compatible shell
+(@code{sh}, @code{bash}, @code{ksh}, @dots{}), your @file{.profile} file
+could contain the lines:
@example
-@group
TEXINPUTS=.:/home/me/mylib:
export TEXINPUTS
-@end group
@end example
-@need 1000
-While in a @file{.cshrc} file, you could use the following @code{csh}
-command sequence:
-
-@example
-setenv TEXINPUTS .:/home/me/mylib:
-@end example
+@noindent
+These settings would cause @TeX{} first to look for an @file{\input} file
+in the current directory, indicated by the @samp{.}, then in a
+hypothetical user @samp{me}'s @file{mylib} directory, and finally in
+the system directories. (A leading, trailing, or doubled @samp{:}
+indicates searching the system directories at that point.)
-On MS-DOS/MS-Windows, you'd do this (note the use of the @samp{;}
+On MS-DOS/MS-Windows, you'd do this like this (note the use of the @samp{;}
character as directory separator, instead of @samp{:}):
@example
-@group
set TEXINPUTS=.;d:/home/me/mylib;c:
-@end group
@end example
@noindent
It is customary for DOS/Windows users to put such commands in the
@file{autoexec.bat} file, or in the Windows registry.
-@noindent
-These settings would cause @TeX{} to look for @file{\input} file first
-in the current directory, indicated by the @samp{.}, then in a
-hypothetical user @samp{me}'s @file{mylib} directory, and finally in
-the system directories. (A leading, trailing, or doubled @samp{:}
-indicates searching the system directories at that point.)
-
@node Overfull hboxes
@section Overfull ``hboxes''
@@ -16734,6 +16765,7 @@ The sections below give the details for each of these.
* Commands: Customization Variables for @@-Commands.
* Options: Customization Variables and Options.
* HTML: HTML Customization Variables.
+* latex2html: @command{latex2html} Customization Variables.
* Other: Other Customization Variables.
@end menu
@@ -16837,11 +16869,9 @@ meaning of the options.
@vindex NODE_FILES
@option{--node-files} @tab @code{NODE_FILES}
@item
-@vindex OUT
@vindex OUTFILE
@vindex SUBDIR
-@option{--output} @tab @code{OUT}, @code{OUTFILE},
- @code{SUBDIR}
+@option{--output} @tab @code{OUTFILE}, @code{SUBDIR}
@item
@vindex paragraphindent
@option{--paragraph-indent} @tab @code{paragraphindent}
@@ -16938,15 +16968,15 @@ exec texi2any -c TEXINPUT_OUTPUT_FORMAT=textcontent "$@@"
This table gives the customization variables which apply to HTML
output only. A few other customization variable apply to both HTML
-and other output formats; those are given in the next section.
+and other output formats; see @ref{Other Customization Variables}.
@vtable @code
@item AVOID_MENU_REDUNDANCY
-For HTML@. If set, and the menu entry and menu description are the
+If set, and the menu entry and menu description are the
same, then do not print the menu description; default false.
@item AFTER_BODY_OPEN
-For HTML@. If set, the corresponding text will appear at the
+If set, the corresponding text will appear at the
beginning of each HTML file; default unset.
@item AFTER_ABOUT
@@ -16955,7 +16985,7 @@ text will appear at the end of the About element; default unset.
@item AFTER_OVERVIEW
@itemx AFTER_TOC_LINES
-For HTML@. If set, the corresponding text is output after the short
+If set, the corresponding text is output after the short
table of contents for @code{AFTER_OVERVIEW} and after the table of
contents for @code{AFTER_TOC_LINES}; otherwise, a default string is
used. At the time of writing, a @code{</div>} element is closed.
@@ -16966,13 +16996,13 @@ In general, you should set @code{BEFORE_OVERVIEW} if
@item BASEFILENAME_LENGTH
-For HTML@. The maximum length of the base filenames; default 245.
+The maximum length of the base filenames; default 245.
Changing this would make cross-manual references to such long node
names invalid (@pxref{HTML Xref Link Basics}).
@item BEFORE_OVERVIEW
@itemx BEFORE_TOC_LINES
-For HTML@. If set, the corresponding text is output before the short
+If set, the corresponding text is output before the short
table of contents for @code{BEFORE_OVERVIEW} and before the table of
contents for @code{BEFORE_TOC_LINES}, otherwise a default string is
used. At the time of writing, a @code{<div ...>} element is opened.
@@ -16983,196 +17013,153 @@ In general you should set @code{AFTER_OVERVIEW} if
@item BIG_RULE
-For HTML@. Rule used after and before the top element and before
+Rule used after and before the top element and before
special elements, but not for footers and headers; default
@code{<hr>}.
@item BODYTEXT
@cindex @code{<body>} text, customizing
@opindex lang@r{, HTML attribute}
-For HTML, the text appearing in @code{<body>}. By default, sets the
+The text appearing in @code{<body>}. By default, sets the
HTML @code{lang} attribute to the document language
(@pxref{@code{@@documentlanguage}}).
@item CASE_INSENSITIVE_FILENAMES
-For HTML@. Construct output file names as if the filesystem were case
+Construct output file names as if the filesystem were case
insensitive (@pxref{HTML Splitting}); default false.
@item CHAPTER_HEADER_LEVEL
-For HTML@. Header formatting level used for chapter level sectioning
+Header formatting level used for chapter level sectioning
commands; default @samp{2}.
@item CHECK_HTMLXREF
-For HTML@. Check that manuals which are the target of external
+Check that manuals which are the target of external
cross-references (@pxref{Four and Five Arguments}) are present in
@file{htmlxref.cnf} (@pxref{HTML Xref Configuration}); default false.
@item COMPLEX_FORMAT_IN_TABLE
-For HTML@. If set, use tables for indentation of complex formats; default
+If set, use tables for indentation of complex formats; default
false.
@item CSS_LINES
-For HTML@. CSS output, automatically determined by default (@pxref{HTML CSS}).
+CSS output, automatically determined by default (@pxref{HTML CSS}).
@item DATE_IN_HEADER
-For HTML@. Put the document generation date in the header; off by default.
+Put the document generation date in the header; off by default.
@item DEF_TABLE
-For HTML@. If set, a @code{<table>} construction for @code{@@deffn}
+If set, a @code{<table>} construction for @code{@@deffn}
and similar @@-commands is used (looking more like the @TeX{} output),
instead of definition lists; default false.
@item DEFAULT_RULE
-For HTML@. Rule used between element, except before and after the
+Rule used between element, except before and after the
top element, and before special elements, and for footers and headers;
default @code{<hr>}.
@item DO_ABOUT
-For HTML@. If set to 0 never do an About special element;
+If set to 0 never do an About special element;
if set to 1 always do an About special element;
default 0.
@c @xref{Output Elements Defined}.
@item EXTERNAL_DIR
-For HTML@. Base directory for external manuals; default none. It is
+Base directory for external manuals; default none. It is
better to use the general external cross-reference mechanism
(@pxref{HTML Xref Configuration}) than this variable.
@item EXTRA_HEAD
-For HTML@. Additional text appearing within @code{<head>}; default unset.
+Additional text appearing within @code{<head>}; default unset.
@item FOOTNOTE_END_HEADER_LEVEL
-For HTML@. Header formatting level used for the footnotes header with
+Header formatting level used for the footnotes header with
the `end' footnotestyle; default @samp{4}. @xref{Footnote Styles}.
@item FOOTNOTE_SEPARATE_HEADER_LEVEL
-For HTML@. Header formatting level used for the footnotes header with
+Header formatting level used for the footnotes header with
the `separate' footnotestyle; default @samp{4}. @xref{Footnote
Styles}.
@item FRAMES
-For HTML@. If set, a file describing the frame layout is generated,
+If set, a file describing the frame layout is generated,
together with a file with the short table of contents; default false.
@item FRAMESET_DOCTYPE
-For HTML@. Same as DOCTYPE, but for the file containing the frame
+Same as DOCTYPE, but for the file containing the frame
description.
@item HEADER_IN_TABLE
-For HTML@. Use tables for header formatting rather than a simple
+Use tables for header formatting rather than a simple
@code{<div>} element; default false.
@item ICONS
-For HTML@. Use icons for the navigation panel; default false.
+Use icons for the navigation panel; default false.
@item IMAGE_LINK_PREFIX
-For HTML@. If set, the associated value is prepended to the image file
+If set, the associated value is prepended to the image file
links; default unset.
@item INLINE_CONTENTS
-For HTML@. If set, output the contents where the @code{@@contents} and
+If set, output the contents where the @code{@@contents} and
similar @@-commands are located; default true. This is ignored if
@code{@@set*contentsaftertitlepage} is set (@pxref{Contents}).
@item INLINE_CSS_STYLE
-For HTML@. Put CSS directly in HTML elements rather than at the
+Put CSS directly in HTML elements rather than at the
beginning of the output; default false.
@item KEEP_TOP_EXTERNAL_REF
-For HTML@. If set, do not ignore @samp{Top} as the first
+If set, do not ignore @samp{Top} as the first
argument for an external ref to a manual, as is done by default.
@xref{Referring to a Manual as a Whole}.
-@item L2H
-For HTML@. If set, @command{latex2html} is used to convert @code{@@math}
-and @code{@@tex} sections; default false. Best used with @option{--iftex}.
-
-@item L2H_CLEAN
-(Relevant only if @code{L2H} is set.) If set, the intermediate files
-generated in relation with @command{latex2html} are removed; default
-true.
-
-@item L2H_FILE
-(Relevant only if @code{L2H} is set.) If set, the given file is used
-as @command{latex2html}'s init file; default unset.
-
-@item L2H_HTML_VERSION
-(Relevant only if @code{L2H} is set.) The HTML version used in the
-@command{latex2html} call; default unset.
-
-@item L2H_L2H
-(Relevant only if @code{L2H} is set.) The program invoked as
-@command{latex2html}; default is @code{latex2html}.
-
-@item L2H_SKIP
-(Relevant only if @code{L2H} is set.) If set to a true value, the
-actual call to @command{latex2html} is skipped; previously generated
-content is reused instead. If set to 0, the cache is not used at all.
-If set to @samp{undef}, the cache is used for as many @TeX{} fragments as
-possible and for any remaining the command is run. The default is
-@samp{undef}.
-
-@item L2H_TMP
-(Relevant only if @code{L2H} is set.) Set the directory used for
-temporary files. None of the file name components in this directory
-name may start with @samp{.}; otherwise, @command{latex2html} will
-fail (because of @command{dvips}). The default is the empty string,
-which means the current directory.
-
@item MAX_HEADER_LEVEL
-For HTML@. Maximum header formatting level used (higher header
+Maximum header formatting level used (higher header
formatting level numbers correspond to lower sectioning levels);
default @samp{4}.
@item MENU_SYMBOL
-For HTML@. Symbol used in front of menu entries when node names are used
+Symbol used in front of menu entries when node names are used
for menu entries formatting; default @samp{&bull;}.
@item MONOLITHIC
-For HTML@. Output only one file including the table of contents. Set
+Output only one file including the table of contents. Set
by default, but only relevant when the output is not split.
@item NO_CSS
-For HTML@. Do not use CSS; default false. @xref{HTML CSS}.
-
-@item NODE_FILE_EXTENSION
-For HTML@. Extension for node files if @code{NODE_FILENAMES} is set;
-default @samp{html}.
+Do not use CSS; default false. @xref{HTML CSS}.
@item PRE_ABOUT
-For HTML, when an About element is output. If set to a text string,
+Used when an About element is output. If set to a text string,
this text will appear at the beginning of the About element. If set
to a reference on a subroutine, the result of the subroutine call will
appear at the beginning of the About element. If not set (the
default), default text is used.
@item PRE_BODY_CLOSE
-For HTML@. If set, the given text will appear at the footer of each
+If set, the given text will appear at the footer of each
HTML file; default unset.
@item PROGRAM_NAME_IN_FOOTER
-For HTML@. If set, output the program name and miscellaneous related
+If set, output the program name and miscellaneous related
information in the page footers; default false.
@item SECTION_NAME_IN_TITLE
-For HTML@. If set, when output is split, use the argument of the
-chapter structuring command (e.g., @code{@@chapter} or @code{@@section})
+If set, when output is split, use the argument of the chapter
+structuring command (e.g., @code{@@chapter} or @code{@@section})
in the @code{<title>} instead of the argument to @code{@@node}.
-@item SHORTEXTN
-For HTML@. If set, use @samp{.htm} as extension; default false.
-
@item SHOW_TITLE
-For HTML@. If set, output the title at the beginning of the document;
+If set, output the title at the beginning of the document;
default true.
@item SIMPLE_MENU
-For HTML@. If set, use a simple preformatted style for the menu,
+If set, use a simple preformatted style for the menu,
instead of breaking down the different parts of the menu; default false.
@xref{Menu Parts}.
@item TOC_LINKS
-For HTML@. If set, links from headings to toc entries are created;
+If set, links from headings to toc entries are created;
default false.
@item TOP_FILE
@@ -17181,60 +17168,55 @@ set appropriately, if necessary. This is used to override the default,
and is, in general, only taken into account when output is split, and
for HTML@.
-@item TOP_NODE_FILE
-For HTML@. File name used for the Top node, if @code{NODE_FILENAMES}
-is set; default is @code{index}.
-
@item TOP_NODE_FILE_TARGET
-For HTML@. File name used for the Top node in cross-references;
-default is @code{index}.
+File name used for the Top node in cross-references;
+default is @code{index.html}.
@item TOP_NODE_UP_URL
-For HTML@. A url used for @code{(dir)} references; the default is
-@code{undef}, meaning that the normal rules apply, typically leading
-to a link to @samp{dir.html} from an implicit or explicit reference to
-@samp{(dir)} (@pxref{HTML Xref}). For more about the Top node
-pointers, @pxref{First Node}. For overriding the Up pointer in other
-formats, see @code{TOP_NODE_UP} in @ref{Other Customization
-Variables}.
+A url used for Top node up references; the default is
+@code{undef}, in that case no Top node Up reference is generated.
+For more about the Top node pointers, @pxref{First Node}. For
+overriding the Up pointer name in cas @code{TOP_NODE_UP_URL} is set
+and for other formats, see @code{TOP_NODE_UP} in
+@ref{Other Customization Variables}.
@item USE_ACCESSKEY
@cindex @code{accesskey}, customization variable for
-For HTML@. Use @code{accesskey} in cross-references; default true.
+Use @code{accesskey} in cross-references; default true.
@item USE_ISO
-For HTML@. Use entities for doubled single-quote characters
+Use entities for doubled single-quote characters
(@pxref{Inserting Quotation Marks}), and @samp{---} and @samp{--}
(@pxref{Conventions}); default true.
@item USE_LINKS
@cindex @code{<link>} HTML tag, in @code{<head>}
@cindex @code{<head>} HTML tag, and @code{<link>}
-For HTML@. Generate @code{<link>} elements in the HTML @code{<head>}
+Generate @code{<link>} elements in the HTML @code{<head>}
output; default true.
@item USE_REL_REV
-For HTML@. Use @code{rel} in cross-references; default true.
+Use @code{rel} in cross-references; default true.
@item VERTICAL_HEAD_NAVIGATION
-For HTML@. If set, a vertical navigation panel is used; default false.
+If set, a vertical navigation panel is used; default false.
@item WORDS_IN_PAGE
@cindex Navigation panel, bottom of page
@cindex Navigation footer
-For HTML, with output split at nodes. Specifies the approximate
+When output is split by nodes, specifies the approximate
minimum page length at which a navigation panel is placed at the
bottom of a page. To avoid ever having the navigation buttons at the
bottom of a page, set this to a sufficiently large number. The
default is 300.
@item XREF_USE_FLOAT_LABEL
-For HTML@. If set, for the float name in cross-references, use the
+If set, for the float name in cross-references, use the
float label instead of the type followed by the float number
(@pxref{@code{@@float}}). The default is off.
@item XREF_USE_NODE_NAME_ARG
-For HTML@. Only relevant for cross-reference commands with no cross
+Only relevant for cross-reference commands with no cross
reference name (second argument). If set to@tie{}1, use the node name
(first) argument in cross-reference @@-commands for the text displayed
as the hyperlink. If set to@tie{}0, use the node name if
@@ -17246,6 +17228,53 @@ otherwise use the node name or section name depending on
@end vtable
+@node @command{latex2html} Customization Variables
+@subsection @command{latex2html} Customization Variables
+
+This table lists the customization variables which can be used when
+@command{latex2html} is being used.
+
+@vtable @code
+@item L2H
+For HTML@. If set, @command{latex2html} is used to convert @code{@@math}
+and @code{@@tex} sections; default false. Best used with @option{--iftex}.
+
+@item L2H_CLEAN
+(Relevant only if @code{L2H} is set.) If set, the intermediate files
+generated in relation with @command{latex2html} are removed; default
+true.
+
+@item L2H_FILE
+(Relevant only if @code{L2H} is set.) If set, the given file is used
+as @command{latex2html}'s init file; default unset.
+
+@item L2H_HTML_VERSION
+(Relevant only if @code{L2H} is set.) The HTML version used in the
+@command{latex2html} call; default unset.
+
+@item L2H_L2H
+(Relevant only if @code{L2H} is set.) The program invoked as
+@command{latex2html}; default is @code{latex2html}.
+
+@item L2H_SKIP
+(Relevant only if @code{L2H} is set.) If set to a true value, the
+actual call to @command{latex2html} is skipped; previously generated
+content is reused instead. If set to 0, the cache is not used at all.
+If set to @samp{undef}, the cache is used for as many @TeX{} fragments as
+possible and for any remaining the command is run. The default is
+@samp{undef}.
+
+@item L2H_TMP
+(Relevant only if @code{L2H} is set.) Set the directory used for
+temporary files. None of the file name components in this directory
+name may start with @samp{.}; otherwise, @command{latex2html} will
+fail (because of @command{dvips}). The default is the empty string,
+which means the current directory.
+
+@end vtable
+
+
+
@node Other Customization Variables
@subsection Other Customization Variables
@@ -17346,17 +17375,6 @@ default true. Do not warn about index entries, since parsing problems
there don't prevent navigation; readers can still relatively easily
find their way to the node in question.
-@item INPUT_ENCODING_NAME
-Normalized encoding name suitable for output. Should be a usable
-charset name in HTML, typically one of the preferred IANA encoding
-names. You should not need to use this variable, since it is set by
-@code{@@documentencoding} (@pxref{@code{@@documentencoding}}).
-
-@item INPUT_PERL_ENCODING
-Perl encoding used to process the Texinfo source. You should not need
-to use that variable, since it is set by @code{@@documentencoding}
-(@pxref{@code{@@documentencoding}}).
-
@item MAX_MACRO_CALL_NESTING
The maximal number of recursive calls of @@-commands defined through
@code{@@rmacro}; default 100000. The purpose of this variable is to
@@ -17371,11 +17389,6 @@ If set, do not use @code{@@setfilename} to set the document name;
instead, base the output document name only on the input file name.
The default is false.
-@item NODE_FILENAMES
-If set, node names are used to construct file names. By default, it
-is set if the output is split by node, or if @code{NODE_FILES} is set
-and the output is split in any way.
-
@item NODE_NAME_IN_INDEX
If set, use node names in index entries, otherwise prefer section names;
default true.
@@ -17398,12 +17411,11 @@ output uses a Unicode left quote.
Normalized encoding name used for output files. Should be a usable
charset name in HTML, typically one of the preferred IANA encoding
names. By default, if an input encoding is set (typically through
-@code{@@documentencoding} or @code{INPUT_ENCODING_NAME}), this
-information is used to set the output encoding name. If no input
-encoding is specified, the default output encoding name may be set by
-the output format. In particular, the XML-based formats use
-@code{utf-8} for @code{OUTPUT_ENCODING_NAME} if the encoding is not
-otherwise specified. @xref{@code{@@documentencoding}}.
+@code{@@documentencoding}), this information is used to set the output
+encoding name. If no input encoding is specified, the default output
+encoding name may be set by the output format. In particular, the
+XML-based formats use @code{utf-8} for @code{OUTPUT_ENCODING_NAME} if
+the encoding is not otherwise specified. @xref{@code{@@documentencoding}}.
@item OVERVIEW_LINK_TO_TOC
If set, the cross-references in the Overview link to the corresponding
@@ -17424,22 +17436,12 @@ The output file prefix, which is prepended to some output file names.
By default it is set by @code{@@setfilename} or from the input file
(@pxref{@code{@@setfilename}}). How this value is used depends on the
value of other customization variables or command line options, such
-as whether the output is split and @code{NODE_FILENAMES}. The default
-is unset.
+as whether the output is split. The default is unset.
@item PROGRAM
Name of the program used. By default, it is set to the name of the
program launched, with a trailing @samp{.pl} removed.
-@item RENAMED_NODES_FILE
-If set, use the value for the renamed nodes description file. If not
-set, the file is @file{@var{doc_basename}-noderename.cnf}.
-@xref{HTML Xref Link Preservation}.
-
-@item RENAMED_NODES_REDIRECTIONS
-If set, create redirection files for renamed nodes. Set by default
-when generating HTML@.
-
@item SHOW_MENU
@vindex HEADERS
@opindex --no-headers
@@ -17492,9 +17494,11 @@ For stripped text content output (i.e., when
also output comments. Default false.
@item TOP_NODE_UP
-Up node for the Top node; default @samp{(dir)}. For overriding the
-url in HTML output, see @code{TOP_NODE_UP_URL} in @ref{HTML
-Customization Variables}.
+Up node for the Top node; default @samp{(dir)}. This node name is
+supposed to be already formatted for the output format. In HTML
+can be used in attribute, so should not contain any element. Used for
+HTML output only if @code{TOP_NODE_UP_URL} is set to override the url,
+see @code{TOP_NODE_UP_URL} in @ref{HTML Customization Variables}.
@item TREE_TRANSFORMATIONS
The associated value is a comma separated list of transformations that
@@ -19004,7 +19008,6 @@ The algorithm was primarily devised by Patrice Dumas in 2003--04.
* 8-bit Expansion: HTML Xref 8-bit Character Expansion.
* Mismatch: HTML Xref Mismatch.
* Configuration: HTML Xref Configuration. htmlxref.cnf.
-* Preserving links: HTML Xref Link Preservation. MANUAL-noderename.cnf.
@end menu
@@ -19488,67 +19491,6 @@ usual. You can get the latest version from
@url{http://ftpmirror.gnu.org/@/texinfo/@/htmlxref.cnf}.
-@node HTML Xref Link Preservation
-@subsection HTML Cross-reference Link Preservation: @var{manual}@file{-noderename.cnf}
-
-@pindex noderename.cnf
-@pindex @var{manual}-noderename.cnf
-@cindex HTML cross-reference link preservation
-@cindex Preserving HTML links to old nodes
-@cindex Old nodes, preserving links to
-@cindex Renaming nodes, and preserving links
-@cindex Links, preserving to renamed nodes
-@cindex Node renaming, and preserving links
-
-Occasionally changes in a program require removing (or renaming) nodes
-in the manual in order to have the best documentation. Given the
-nature of the web, however, links may exist anywhere to such a removed
-node (renaming appears the same as removal for this purpose), and it's
-not ideal for those links to simply break.
-
-The preferred approach to preserving links to deleted or renamed nodes
-is to use anchors (@pxref{@code{@@anchor}}), as this works with all
-output formats, including Info.
-However, Texinfo provides an alternative method to do this for HTML
-output via a separate file which specifes old
-node names and the new nodes to which the old names should be
-redirected.
-This method is deprecated, and support for these files will be removed
-in future Texinfo releases. It is specific to HTML and supporting
-@@-commands in node names in these files in practice complicates the
-implementation in @command{texi2any}.
-
-@vindex RENAMED_NODES_FILE
-The @dfn{renamed nodes file} is named
-@var{manual}@file{-noderename.cnf}, where
-@var{manual} is the base name of the manual.
-For example, the manual
-@file{texinfo.texi} would be supplemented by a file
-@file{texinfo-noderename}.cnf. (This name can be overridden by
-setting the @file{RENAMED_NODES_FILE} customization variable;
-@pxref{Customization Variables}).
-
-The file is read in pairs of lines, as follows:
-
-@example
-@var{old-node-name}
-@@@@@{@} @var{new-node-name}
-@end example
-
-The usual conversion from Texinfo node names to HTML names is applied;
-see this entire section for details (@pxref{HTML Xref}). The unusual
-@samp{@@@@@{@}} separator is used because it is not a valid Texinfo
-construct, so can't appear in the node names.
-
-The effect is that @command{makeinfo} generates a redirect from
-@var{old-node-name} to @var{new-node-name} when producing HTML output.
-Thus, external links to the old node are preserved.
-
-Lines consisting only of whitespace are ignored. Comments are
-indicated with a @samp{@@c} at the beginning of a line, optionally
-preceded by whitespace.
-
-
@node @@-Command Details
@appendix @@-Command Details
@@ -21572,14 +21514,15 @@ plain text output, where it's not clear what should be done.
@item
@pindex automake@r{, and version info}
@vindex UPDATED @r{Automake variable}
+@vindex UPDATED-MONTH @r{Automake variable}
@vindex VERSION @r{Automake variable}
@pindex time-stamp.el
The @file{version.texi} in the @code{@@include} command is maintained
-automatically by Automake (@pxref{Top,,, automake, GNU Automake}). It
-sets the @samp{VERSION} and @samp{UPDATED} values used elsewhere. If
-your distribution doesn't use Automake, but you do use Emacs, you may
-find the time-stamp.el package helpful (@pxref{Time Stamps,,, emacs,
-The GNU Emacs Manual}).
+automatically by Automake (@pxref{Texinfo,,, automake, GNU Automake}).
+It sets the @samp{VERSION}, @samp{UPDATED} and @samp{UPDATED-MONTH}
+values used elsewhere. If your distribution doesn't use Automake, but
+you do use Emacs, you may find the time-stamp.el package helpful
+(@pxref{Time Stamps,,, emacs, The GNU Emacs Manual}).
@item
The @code{@@syncodeindex} command reflects the recommendation to use
diff --git a/macros/texinfo/texinfo/doc/tp_api/Makefile.in b/macros/texinfo/texinfo/doc/tp_api/Makefile.in
index f6f0e281ad..8eddd0f905 100644
--- a/macros/texinfo/texinfo/doc/tp_api/Makefile.in
+++ b/macros/texinfo/texinfo/doc/tp_api/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -289,6 +289,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -444,6 +445,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -511,11 +513,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -581,6 +585,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -601,6 +606,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -635,6 +641,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -649,6 +656,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -727,8 +735,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -744,7 +750,6 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
# Use the programs built in our distribution, taking account of possible
@@ -753,8 +758,8 @@ MAKEINFO = $(PERL) -I $(top_srcdir)/tp/ $(top_srcdir)/tp/texi2any.pl
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -844,6 +849,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -877,6 +883,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -889,6 +896,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -907,6 +915,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1010,6 +1019,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi
index aa97e56374..772afd7522 100644
--- a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi
+++ b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Common.texi
@@ -355,6 +355,14 @@ Return true if the @emph{$name} is a known tree transformation name
that may be passed with @code{TREE_TRANSFORMATIONS} to modify a texinfo
tree.
+@item collect_commands_in_tree($tree, $commands_list)
+@anchor{Texinfo::Common collect_commands_in_tree($tree@comma{} $commands_list)}
+
+Returns a hash reference with keys @@-commands names specified
+in the @emph{$commands_list} array reference and values arrays of
+tree elements corresponding to those @@-command found in @emph{$tree}
+by traversing the tree.
+
@end table
@node Texinfo::Common SEE ALSO
diff --git a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
index ca99e329cf..6bc88b1215 100644
--- a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
+++ b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Convert-Converter.texi
@@ -245,8 +245,8 @@ Patrice Dumas, <pertusus@@free.fr>
Hey! @strong{The above document had some coding errors, which are explained below:}
@table @asis
-@item Around line 1760:
-@anchor{Texinfo::Convert::Converter Around line 1760:}
+@item Around line 1727:
+@anchor{Texinfo::Convert::Converter Around line 1727:}
'=item' outside of any '=over'
diff --git a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi
index 26fadf340c..332281ba6f 100644
--- a/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi
+++ b/macros/texinfo/texinfo/doc/tp_api/api_includes/Texinfo-Parser.texi
@@ -442,17 +442,6 @@ A string, the command name associated with @code{@@clickstyle}.
A string corresponding to a document language set by @code{@@documentlanguage}.
-@item INPUT_ENCODING_NAME
-@anchor{Texinfo::Parser INPUT_ENCODING_NAME}
-
-@item INPUT_PERL_ENCODING
-@anchor{Texinfo::Parser INPUT_PERL_ENCODING}
-
-@code{INPUT_ENCODING_NAME} string is the encoding name as set
-by @code{@@documentencoding}.
-@code{INPUT_PERL_ENCODING} string is a corresponding perl encoding name.
-In general those two strings should be set simultaneously.
-
@item indices
@anchor{Texinfo::Parser indices}
diff --git a/macros/texinfo/texinfo/doc/txi-ja.tex b/macros/texinfo/texinfo/doc/txi-ja.tex
index 0374efe1d3..c80a2f0dc6 100644
--- a/macros/texinfo/texinfo/doc/txi-ja.tex
+++ b/macros/texinfo/texinfo/doc/txi-ja.tex
@@ -191,21 +191,6 @@
#1%
\parseargline\empty% Insert the \empty token, see \finishparsearg below.
}
- % Re-define texinfo.tex's \comment
- \def\comment{\begingroup \catcode`\^^M=\active%
- \ifx\ltjlineendcomment\thisisundefined
- % Ignore U+FFFFF for LuaTeX-ja <= 20160208.0
- \catcode"FFFFF=9%
- \else
- % Ignore the character \ltjlineendcomment for LuaTeX-ja > 20160208.0
- \catcode\ltjlineendcomment=9%
- \fi
- \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other\commentxxx}%
- % Re-let \comment related macros
- \let\setfilename=\comment
- \let\dircategory=\comment
- \let\definfoenclose=\comment
- \let\footnotestyle=\comment
% Re-define texinfo.tex's \c
\def\c{\begingroup \catcode`\^^M=\active%
\ifx\ltjlineendcomment\thisisundefined
@@ -218,7 +203,12 @@
\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
\cxxx}
% Re-let \c related macro
- \let\texinfoc=\c
+ \let\comment=\c
+ % Re-let \comment related macros
+ \let\setfilename=\comment
+ \let\dircategory=\comment
+ \let\definfoenclose=\comment
+ \let\footnotestyle=\comment
\fi % LuaTeX
%
diff --git a/macros/texinfo/texinfo/doc/version-stnd.texi b/macros/texinfo/texinfo/doc/version-stnd.texi
index bd8d35fb8b..f73a179aa9 100644
--- a/macros/texinfo/texinfo/doc/version-stnd.texi
+++ b/macros/texinfo/texinfo/doc/version-stnd.texi
@@ -1,4 +1,4 @@
-@set UPDATED 16 February 2019
-@set UPDATED-MONTH February 2019
-@set EDITION 6.6
-@set VERSION 6.6
+@set UPDATED 23 September 2019
+@set UPDATED-MONTH September 2019
+@set EDITION 6.7
+@set VERSION 6.7
diff --git a/macros/texinfo/texinfo/doc/version.texi b/macros/texinfo/texinfo/doc/version.texi
index bd8d35fb8b..f73a179aa9 100644
--- a/macros/texinfo/texinfo/doc/version.texi
+++ b/macros/texinfo/texinfo/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 16 February 2019
-@set UPDATED-MONTH February 2019
-@set EDITION 6.6
-@set VERSION 6.6
+@set UPDATED 23 September 2019
+@set UPDATED-MONTH September 2019
+@set EDITION 6.7
+@set VERSION 6.7
diff --git a/macros/texinfo/texinfo/gnulib/lib/Makefile.am b/macros/texinfo/texinfo/gnulib/lib/Makefile.am
index bec19a3261..9c7e3aad37 100644
--- a/macros/texinfo/texinfo/gnulib/lib/Makefile.am
+++ b/macros/texinfo/texinfo/gnulib/lib/Makefile.am
@@ -99,7 +99,7 @@ if GL_GENERATE_ALLOCA_H
alloca.h: alloca.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/alloca.in.h; \
+ sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \
} > $@-t && \
mv -f $@-t $@
else
@@ -1008,6 +1008,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
+ -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \
-e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
@@ -1021,7 +1022,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
-e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
-e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+ -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \
-e 's|@''HAVE_DECL_INITSTATE''@|$(HAVE_DECL_INITSTATE)|g' \
+ -e 's|@''HAVE_MBTOWC''@|$(HAVE_MBTOWC)|g' \
-e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
-e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
-e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
@@ -1039,8 +1042,10 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+ -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \
-e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \
-e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+ -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \
-e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
-e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
-e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
@@ -1049,6 +1054,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
-e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
+ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \
-e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
-e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
@@ -1056,11 +1062,14 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
-e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+ -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \
-e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
-e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
-e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
+ -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \
-e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+ -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \
-e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
@@ -1366,6 +1375,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
+ -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \
-e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
-e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
-e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
@@ -1416,6 +1426,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
< $(srcdir)/unistd.in.h | \
sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \
-e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
-e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
-e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
@@ -1764,6 +1775,50 @@ EXTRA_libgnu_a_SOURCES += wcwidth.c
## end gnulib module wcwidth
+## begin gnulib module windows-mutex
+
+if gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440
+
+endif
+EXTRA_DIST += windows-initguard.h windows-mutex.c windows-mutex.h
+
+EXTRA_libgnu_a_SOURCES += windows-mutex.c
+
+## end gnulib module windows-mutex
+
+## begin gnulib module windows-once
+
+if gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab
+
+endif
+EXTRA_DIST += windows-once.c windows-once.h
+
+EXTRA_libgnu_a_SOURCES += windows-once.c
+
+## end gnulib module windows-once
+
+## begin gnulib module windows-recmutex
+
+if gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354
+
+endif
+EXTRA_DIST += windows-initguard.h windows-recmutex.c windows-recmutex.h
+
+EXTRA_libgnu_a_SOURCES += windows-recmutex.c
+
+## end gnulib module windows-recmutex
+
+## begin gnulib module windows-rwlock
+
+if gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef
+
+endif
+EXTRA_DIST += windows-initguard.h windows-rwlock.c windows-rwlock.h
+
+EXTRA_libgnu_a_SOURCES += windows-rwlock.c
+
+## end gnulib module windows-rwlock
+
## begin gnulib module xalloc
libgnu_a_SOURCES += xmalloc.c
diff --git a/macros/texinfo/texinfo/gnulib/lib/Makefile.in b/macros/texinfo/texinfo/gnulib/lib/Makefile.in
index 30f0171b94..cf41b9e8cf 100644
--- a/macros/texinfo/texinfo/gnulib/lib/Makefile.in
+++ b/macros/texinfo/texinfo/gnulib/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -349,7 +349,9 @@ am__depfiles_remade = ./$(DEPDIR)/argz.Po ./$(DEPDIR)/asnprintf.Po \
./$(DEPDIR)/strstr.Po ./$(DEPDIR)/unistd.Po \
./$(DEPDIR)/vasnprintf.Po ./$(DEPDIR)/vasprintf.Po \
./$(DEPDIR)/wcrtomb.Po ./$(DEPDIR)/wctype-h.Po \
- ./$(DEPDIR)/wcwidth.Po ./$(DEPDIR)/xalloc-die.Po \
+ ./$(DEPDIR)/wcwidth.Po ./$(DEPDIR)/windows-mutex.Po \
+ ./$(DEPDIR)/windows-once.Po ./$(DEPDIR)/windows-recmutex.Po \
+ ./$(DEPDIR)/windows-rwlock.Po ./$(DEPDIR)/xalloc-die.Po \
./$(DEPDIR)/xmalloc.Po ./$(DEPDIR)/xsize.Po \
glthread/$(DEPDIR)/lock.Po glthread/$(DEPDIR)/threadlib.Po \
uniwidth/$(DEPDIR)/width.Po
@@ -493,6 +495,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -648,6 +651,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -715,11 +719,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -785,6 +791,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -805,6 +812,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -839,6 +847,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -853,6 +862,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -931,8 +941,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -948,14 +956,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1045,6 +1052,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1078,6 +1086,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1090,6 +1099,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1108,6 +1118,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1211,6 +1222,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1247,7 +1259,10 @@ EXTRA_DIST = alloca.in.h argz.c argz.in.h btowc.c dirname.h dosname.h \
float+.h printf-args.c printf-args.h printf-parse.c \
printf-parse.h vasnprintf.c vasnprintf.h asprintf.c \
vasprintf.c verify.h wchar.in.h wcrtomb.c wctype.in.h \
- wcwidth.c xalloc.h xalloc-oversized.h
+ wcwidth.c windows-initguard.h windows-mutex.c windows-mutex.h \
+ windows-once.c windows-once.h windows-initguard.h \
+ windows-recmutex.c windows-recmutex.h windows-initguard.h \
+ windows-rwlock.c windows-rwlock.h xalloc.h xalloc-oversized.h
BUILT_SOURCES = $(ALLOCA_H) $(ARGZ_H) $(ERRNO_H) $(FLOAT_H) \
$(GETOPT_H) $(GETOPT_CDEFS_H) $(am__append_2) $(LIMITS_H) \
$(am__append_5) $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) \
@@ -1288,7 +1303,9 @@ EXTRA_libgnu_a_SOURCES = argz.c btowc.c error.c float.c itold.c \
regex_internal.c regexec.c stpcpy.c strcasecmp.c strncasecmp.c \
strcasestr.c strdup.c strerror.c strerror-override.c strndup.c \
strnlen.c strstr.c asnprintf.c printf-args.c printf-parse.c \
- vasnprintf.c asprintf.c vasprintf.c wcrtomb.c wcwidth.c
+ vasnprintf.c asprintf.c vasprintf.c wcrtomb.c wcwidth.c \
+ windows-mutex.c windows-once.c windows-recmutex.c \
+ windows-rwlock.c
# Use this preprocessor expression to decide whether #include_next works.
# Do not rely on a 'configure'-time test for this, since the expression
@@ -1455,6 +1472,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-mutex.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-once.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-recmutex.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-rwlock.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsize.Po@am__quote@ # am--include-marker
@@ -1754,6 +1775,10 @@ distclean: distclean-recursive
-rm -f ./$(DEPDIR)/wcrtomb.Po
-rm -f ./$(DEPDIR)/wctype-h.Po
-rm -f ./$(DEPDIR)/wcwidth.Po
+ -rm -f ./$(DEPDIR)/windows-mutex.Po
+ -rm -f ./$(DEPDIR)/windows-once.Po
+ -rm -f ./$(DEPDIR)/windows-recmutex.Po
+ -rm -f ./$(DEPDIR)/windows-rwlock.Po
-rm -f ./$(DEPDIR)/xalloc-die.Po
-rm -f ./$(DEPDIR)/xmalloc.Po
-rm -f ./$(DEPDIR)/xsize.Po
@@ -1866,6 +1891,10 @@ maintainer-clean: maintainer-clean-recursive
-rm -f ./$(DEPDIR)/wcrtomb.Po
-rm -f ./$(DEPDIR)/wctype-h.Po
-rm -f ./$(DEPDIR)/wcwidth.Po
+ -rm -f ./$(DEPDIR)/windows-mutex.Po
+ -rm -f ./$(DEPDIR)/windows-once.Po
+ -rm -f ./$(DEPDIR)/windows-recmutex.Po
+ -rm -f ./$(DEPDIR)/windows-rwlock.Po
-rm -f ./$(DEPDIR)/xalloc-die.Po
-rm -f ./$(DEPDIR)/xmalloc.Po
-rm -f ./$(DEPDIR)/xsize.Po
@@ -1916,7 +1945,7 @@ uninstall-am:
@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status
@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \
+@GL_GENERATE_ALLOCA_H_TRUE@ sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \
@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \
@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@
@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
@@ -2312,6 +2341,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \
-e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \
-e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \
+ -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \
-e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \
-e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \
-e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \
@@ -2325,7 +2355,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
-e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
-e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
+ -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \
-e 's|@''HAVE_DECL_INITSTATE''@|$(HAVE_DECL_INITSTATE)|g' \
+ -e 's|@''HAVE_MBTOWC''@|$(HAVE_MBTOWC)|g' \
-e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
-e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
-e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
@@ -2343,8 +2375,10 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
-e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \
-e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \
+ -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \
-e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \
-e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+ -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \
-e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
-e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
-e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
@@ -2353,6 +2387,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
-e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \
-e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
+ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \
-e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \
-e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
-e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
@@ -2360,11 +2395,14 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
-e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
-e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
-e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+ -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \
-e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \
-e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
-e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
+ -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \
-e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+ -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \
-e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
-e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
@@ -2521,6 +2559,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
-e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
-e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
+ -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \
-e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
-e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
-e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
@@ -2571,6 +2610,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
-e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \
< $(srcdir)/unistd.in.h | \
sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \
-e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
-e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
-e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
diff --git a/macros/texinfo/texinfo/gnulib/lib/_Noreturn.h b/macros/texinfo/texinfo/gnulib/lib/_Noreturn.h
index 94fdfaf022..db9b45554c 100644
--- a/macros/texinfo/texinfo/gnulib/lib/_Noreturn.h
+++ b/macros/texinfo/texinfo/gnulib/lib/_Noreturn.h
@@ -1,8 +1,27 @@
+/* A C macro for declaring that a function does not return.
+ Copyright (C) 2011-2019 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
#ifndef _Noreturn
-# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# if (defined __cplusplus \
+ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
+ || (defined _MSC_VER && 1900 <= _MSC_VER)))
# define _Noreturn [[noreturn]]
-# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
- || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+# elif ((!defined __cplusplus || defined __clang__) \
+ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
+ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)))
/* _Noreturn works as-is. */
# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
# define _Noreturn __attribute__ ((__noreturn__))
diff --git a/macros/texinfo/texinfo/gnulib/lib/alloca.in.h b/macros/texinfo/texinfo/gnulib/lib/alloca.in.h
index ec81e119a0..a581d58f83 100644
--- a/macros/texinfo/texinfo/gnulib/lib/alloca.in.h
+++ b/macros/texinfo/texinfo/gnulib/lib/alloca.in.h
@@ -36,6 +36,12 @@
#ifndef alloca
# ifdef __GNUC__
+ /* Some version of mingw have an <alloca.h> that causes trouble when
+ included after 'alloca' gets defined as a macro. As a workaround, include
+ this <alloca.h> first and define 'alloca' as a macro afterwards. */
+# if (defined _WIN32 && ! defined __CYGWIN__) && @HAVE_ALLOCA_H@
+# include_next <alloca.h>
+# endif
# define alloca __builtin_alloca
# elif defined _AIX
# define alloca __alloca
diff --git a/macros/texinfo/texinfo/gnulib/lib/cdefs.h b/macros/texinfo/texinfo/gnulib/lib/cdefs.h
index f7a1064406..96d2616419 100644
--- a/macros/texinfo/texinfo/gnulib/lib/cdefs.h
+++ b/macros/texinfo/texinfo/gnulib/lib/cdefs.h
@@ -340,7 +340,7 @@
semantics.
clang++ identifies itself as gcc-4.2, but has support for GNU inlining
- semantics, that can be checked fot by using the __GNUC_STDC_INLINE_ and
+ semantics, that can be checked for by using the __GNUC_STDC_INLINE_ and
__GNUC_GNU_INLINE__ macro definitions. */
#if (!defined __cplusplus || __GNUC_PREREQ (4,3) \
|| (defined __clang__ && (defined __GNUC_STDC_INLINE__ \
diff --git a/macros/texinfo/texinfo/gnulib/lib/error.c b/macros/texinfo/texinfo/gnulib/lib/error.c
index 7e532f0e48..f8ab668963 100644
--- a/macros/texinfo/texinfo/gnulib/lib/error.c
+++ b/macros/texinfo/texinfo/gnulib/lib/error.c
@@ -119,7 +119,7 @@ int strerror_r (int errnum, char *buf, size_t buflen);
# endif
# endif
-#define program_name getprogname ()
+# define program_name getprogname ()
# if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r
# define __strerror_r strerror_r
diff --git a/macros/texinfo/texinfo/gnulib/lib/getprogname.c b/macros/texinfo/texinfo/gnulib/lib/getprogname.c
index 96fa759613..de8f49a1b7 100644
--- a/macros/texinfo/texinfo/gnulib/lib/getprogname.c
+++ b/macros/texinfo/texinfo/gnulib/lib/getprogname.c
@@ -70,10 +70,10 @@ getprogname (void)
p = "?";
return last_component (p);
# elif HAVE_DECL___ARGV /* mingw, MSVC */
- /* https://msdn.microsoft.com/en-us/library/dn727674.aspx */
+ /* https://docs.microsoft.com/en-us/cpp/c-runtime-library/argc-argv-wargv */
const char *p = __argv && __argv[0] ? __argv[0] : "?";
return last_component (p);
-# elif HAVE_VAR___PROGNAME /* OpenBSD, QNX */
+# elif HAVE_VAR___PROGNAME /* OpenBSD, Android, QNX */
/* https://man.openbsd.org/style.9 */
/* http://www.qnx.de/developers/docs/6.5.0/index.jsp?topic=%2Fcom.qnx.doc.neutrino_lib_ref%2Fp%2F__progname.html */
/* Be careful to declare this only when we absolutely need it
@@ -82,7 +82,11 @@ getprogname (void)
malfunction (have zero length) with Fedora 25's glibc. */
extern char *__progname;
const char *p = __progname;
+# if defined __ANDROID__
+ return last_component (p);
+# else
return p && p[0] ? p : "?";
+# endif
# elif _AIX /* AIX */
/* Idea by Bastien ROUCARIÈS,
https://lists.gnu.org/r/bug-gnulib/2010-12/msg00095.html
@@ -229,12 +233,13 @@ getprogname (void)
{
char *name = buf.pr_fname;
size_t namesize = sizeof buf.pr_fname;
+ /* It may not be NUL-terminated. */
char *namenul = memchr (name, '\0', namesize);
size_t namelen = namenul ? namenul - name : namesize;
char *namecopy = malloc (namelen + 1);
if (namecopy)
{
- namecopy[namelen] = 0;
+ namecopy[namelen] = '\0';
return memcpy (namecopy, name, namelen);
}
}
diff --git a/macros/texinfo/texinfo/gnulib/lib/gettext.h b/macros/texinfo/texinfo/gnulib/lib/gettext.h
index 89f53d917b..c7c0fdb531 100644
--- a/macros/texinfo/texinfo/gnulib/lib/gettext.h
+++ b/macros/texinfo/texinfo/gnulib/lib/gettext.h
@@ -184,9 +184,16 @@ npgettext_aux (const char *domain,
#include <string.h>
-#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
- /* || (__STDC_VERSION__ == 199901L && !defined __HP_cc)
- || (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ )
+/* GNULIB_NO_VLA can be defined to disable use of VLAs even if supported.
+ This relates to the -Wvla and -Wvla-larger-than warnings, enabled in
+ the default GCC many warnings set. This allows programs to disable use
+ of VLAs, which may be unintended, or may be awkward to support portably,
+ or may have security implications due to non-deterministic stack usage. */
+
+#if (!defined GNULIB_NO_VLA \
+ && (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
+ /* || (__STDC_VERSION__ == 199901L && !defined __HP_cc)
+ || (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ ))
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
#else
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
diff --git a/macros/texinfo/texinfo/gnulib/lib/glthread/lock.c b/macros/texinfo/texinfo/gnulib/lib/glthread/lock.c
index a4498cbd94..fefcd596f6 100644
--- a/macros/texinfo/texinfo/gnulib/lib/glthread/lock.c
+++ b/macros/texinfo/texinfo/gnulib/lib/glthread/lock.c
@@ -15,8 +15,7 @@
along with this program; if not, see <https://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2005.
- Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
- gthr-win32.h. */
+ Based on GCC's gthr-posix.h, gthr-posix95.h. */
#include <config.h>
@@ -500,722 +499,8 @@ glthread_once_singlethreaded (pthread_once_t *once_control)
/* ========================================================================= */
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library. */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-# if !HAVE_PTH_RWLOCK_ACQUIRE_PREFER_WRITER
-
-int
-glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
-{
- if (!pth_mutex_init (&lock->lock))
- return errno;
- if (!pth_cond_init (&lock->waiting_readers))
- return errno;
- if (!pth_cond_init (&lock->waiting_writers))
- return errno;
- lock->waiting_writers_count = 0;
- lock->runcount = 0;
- lock->initialized = 1;
- return 0;
-}
-
-int
-glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
-{
- if (!lock->initialized)
- glthread_rwlock_init_multithreaded (lock);
- if (!pth_mutex_acquire (&lock->lock, 0, NULL))
- return errno;
- /* Test whether only readers are currently running, and whether the runcount
- field will not overflow, and whether no writer is waiting. The latter
- condition is because POSIX recommends that "write locks shall take
- precedence over read locks", to avoid "writer starvation". */
- while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
- {
- /* This thread has to wait for a while. Enqueue it among the
- waiting_readers. */
- if (!pth_cond_await (&lock->waiting_readers, &lock->lock, NULL))
- {
- int err = errno;
- pth_mutex_release (&lock->lock);
- return err;
- }
- }
- lock->runcount++;
- return (!pth_mutex_release (&lock->lock) ? errno : 0);
-}
-
-int
-glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
-{
- if (!lock->initialized)
- glthread_rwlock_init_multithreaded (lock);
- if (!pth_mutex_acquire (&lock->lock, 0, NULL))
- return errno;
- /* Test whether no readers or writers are currently running. */
- while (!(lock->runcount == 0))
- {
- /* This thread has to wait for a while. Enqueue it among the
- waiting_writers. */
- lock->waiting_writers_count++;
- if (!pth_cond_await (&lock->waiting_writers, &lock->lock, NULL))
- {
- int err = errno;
- lock->waiting_writers_count--;
- pth_mutex_release (&lock->lock);
- return err;
- }
- lock->waiting_writers_count--;
- }
- lock->runcount--; /* runcount becomes -1 */
- return (!pth_mutex_release (&lock->lock) ? errno : 0);
-}
-
-int
-glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
-{
- int err;
-
- if (!lock->initialized)
- return EINVAL;
- if (!pth_mutex_acquire (&lock->lock, 0, NULL))
- return errno;
- if (lock->runcount < 0)
- {
- /* Drop a writer lock. */
- if (!(lock->runcount == -1))
- {
- pth_mutex_release (&lock->lock);
- return EINVAL;
- }
- lock->runcount = 0;
- }
- else
- {
- /* Drop a reader lock. */
- if (!(lock->runcount > 0))
- {
- pth_mutex_release (&lock->lock);
- return EINVAL;
- }
- lock->runcount--;
- }
- if (lock->runcount == 0)
- {
- /* POSIX recommends that "write locks shall take precedence over read
- locks", to avoid "writer starvation". */
- if (lock->waiting_writers_count > 0)
- {
- /* Wake up one of the waiting writers. */
- if (!pth_cond_notify (&lock->waiting_writers, FALSE))
- {
- int err = errno;
- pth_mutex_release (&lock->lock);
- return err;
- }
- }
- else
- {
- /* Wake up all waiting readers. */
- if (!pth_cond_notify (&lock->waiting_readers, TRUE))
- {
- int err = errno;
- pth_mutex_release (&lock->lock);
- return err;
- }
- }
- }
- return (!pth_mutex_release (&lock->lock) ? errno : 0);
-}
-
-int
-glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
-{
- lock->initialized = 0;
- return 0;
-}
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static void
-glthread_once_call (void *arg)
-{
- void (**gl_once_temp_addr) (void) = (void (**) (void)) arg;
- void (*initfunction) (void) = *gl_once_temp_addr;
- initfunction ();
-}
-
-int
-glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void))
-{
- void (*temp) (void) = initfunction;
- return (!pth_once (once_control, glthread_once_call, &temp) ? errno : 0);
-}
-
-int
-glthread_once_singlethreaded (pth_once_t *once_control)
-{
- /* We know that pth_once_t is an integer type. */
- if (*once_control == PTH_ONCE_INIT)
- {
- /* First time use of once_control. Invert the marker. */
- *once_control = ~ PTH_ONCE_INIT;
- return 1;
- }
- else
- return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library. */
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-int
-glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
-{
- int err;
-
- err = mutex_init (&lock->mutex, USYNC_THREAD, NULL);
- if (err != 0)
- return err;
- lock->owner = (thread_t) 0;
- lock->depth = 0;
- return 0;
-}
-
-int
-glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
-{
- thread_t self = thr_self ();
- if (lock->owner != self)
- {
- int err;
-
- err = mutex_lock (&lock->mutex);
- if (err != 0)
- return err;
- lock->owner = self;
- }
- if (++(lock->depth) == 0) /* wraparound? */
- {
- lock->depth--;
- return EAGAIN;
- }
- return 0;
-}
-
-int
-glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
-{
- if (lock->owner != thr_self ())
- return EPERM;
- if (lock->depth == 0)
- return EINVAL;
- if (--(lock->depth) == 0)
- {
- lock->owner = (thread_t) 0;
- return mutex_unlock (&lock->mutex);
- }
- else
- return 0;
-}
-
-int
-glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
-{
- if (lock->owner != (thread_t) 0)
- return EBUSY;
- return mutex_destroy (&lock->mutex);
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-int
-glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void))
-{
- if (!once_control->inited)
- {
- int err;
-
- /* Use the mutex to guarantee that if another thread is already calling
- the initfunction, this thread waits until it's finished. */
- err = mutex_lock (&once_control->mutex);
- if (err != 0)
- return err;
- if (!once_control->inited)
- {
- once_control->inited = 1;
- initfunction ();
- }
- return mutex_unlock (&once_control->mutex);
- }
- else
- return 0;
-}
-
-int
-glthread_once_singlethreaded (gl_once_t *once_control)
-{
- /* We know that gl_once_t contains an integer type. */
- if (!once_control->inited)
- {
- /* First time use of once_control. Invert the marker. */
- once_control->inited = ~ 0;
- return 1;
- }
- else
- return 0;
-}
-
-#endif
-
-/* ========================================================================= */
-
#if USE_WINDOWS_THREADS
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-void
-glthread_lock_init_func (gl_lock_t *lock)
-{
- InitializeCriticalSection (&lock->lock);
- lock->guard.done = 1;
-}
-
-int
-glthread_lock_lock_func (gl_lock_t *lock)
-{
- if (!lock->guard.done)
- {
- if (InterlockedIncrement (&lock->guard.started) == 0)
- /* This thread is the first one to need this lock. Initialize it. */
- glthread_lock_init (lock);
- else
- /* Yield the CPU while waiting for another thread to finish
- initializing this lock. */
- while (!lock->guard.done)
- Sleep (0);
- }
- EnterCriticalSection (&lock->lock);
- return 0;
-}
-
-int
-glthread_lock_unlock_func (gl_lock_t *lock)
-{
- if (!lock->guard.done)
- return EINVAL;
- LeaveCriticalSection (&lock->lock);
- return 0;
-}
-
-int
-glthread_lock_destroy_func (gl_lock_t *lock)
-{
- if (!lock->guard.done)
- return EINVAL;
- DeleteCriticalSection (&lock->lock);
- lock->guard.done = 0;
- return 0;
-}
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* In this file, the waitqueues are implemented as circular arrays. */
-#define gl_waitqueue_t gl_carray_waitqueue_t
-
-static void
-gl_waitqueue_init (gl_waitqueue_t *wq)
-{
- wq->array = NULL;
- wq->count = 0;
- wq->alloc = 0;
- wq->offset = 0;
-}
-
-/* Enqueues the current thread, represented by an event, in a wait queue.
- Returns INVALID_HANDLE_VALUE if an allocation failure occurs. */
-static HANDLE
-gl_waitqueue_add (gl_waitqueue_t *wq)
-{
- HANDLE event;
- unsigned int index;
-
- if (wq->count == wq->alloc)
- {
- unsigned int new_alloc = 2 * wq->alloc + 1;
- HANDLE *new_array =
- (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
- if (new_array == NULL)
- /* No more memory. */
- return INVALID_HANDLE_VALUE;
- /* Now is a good opportunity to rotate the array so that its contents
- starts at offset 0. */
- if (wq->offset > 0)
- {
- unsigned int old_count = wq->count;
- unsigned int old_alloc = wq->alloc;
- unsigned int old_offset = wq->offset;
- unsigned int i;
- if (old_offset + old_count > old_alloc)
- {
- unsigned int limit = old_offset + old_count - old_alloc;
- for (i = 0; i < limit; i++)
- new_array[old_alloc + i] = new_array[i];
- }
- for (i = 0; i < old_count; i++)
- new_array[i] = new_array[old_offset + i];
- wq->offset = 0;
- }
- wq->array = new_array;
- wq->alloc = new_alloc;
- }
- /* Whether the created event is a manual-reset one or an auto-reset one,
- does not matter, since we will wait on it only once. */
- event = CreateEvent (NULL, TRUE, FALSE, NULL);
- if (event == INVALID_HANDLE_VALUE)
- /* No way to allocate an event. */
- return INVALID_HANDLE_VALUE;
- index = wq->offset + wq->count;
- if (index >= wq->alloc)
- index -= wq->alloc;
- wq->array[index] = event;
- wq->count++;
- return event;
-}
-
-/* Notifies the first thread from a wait queue and dequeues it. */
-static void
-gl_waitqueue_notify_first (gl_waitqueue_t *wq)
-{
- SetEvent (wq->array[wq->offset + 0]);
- wq->offset++;
- wq->count--;
- if (wq->count == 0 || wq->offset == wq->alloc)
- wq->offset = 0;
-}
-
-/* Notifies all threads from a wait queue and dequeues them all. */
-static void
-gl_waitqueue_notify_all (gl_waitqueue_t *wq)
-{
- unsigned int i;
-
- for (i = 0; i < wq->count; i++)
- {
- unsigned int index = wq->offset + i;
- if (index >= wq->alloc)
- index -= wq->alloc;
- SetEvent (wq->array[index]);
- }
- wq->count = 0;
- wq->offset = 0;
-}
-
-void
-glthread_rwlock_init_func (gl_rwlock_t *lock)
-{
- InitializeCriticalSection (&lock->lock);
- gl_waitqueue_init (&lock->waiting_readers);
- gl_waitqueue_init (&lock->waiting_writers);
- lock->runcount = 0;
- lock->guard.done = 1;
-}
-
-int
-glthread_rwlock_rdlock_func (gl_rwlock_t *lock)
-{
- if (!lock->guard.done)
- {
- if (InterlockedIncrement (&lock->guard.started) == 0)
- /* This thread is the first one to need this lock. Initialize it. */
- glthread_rwlock_init (lock);
- else
- /* Yield the CPU while waiting for another thread to finish
- initializing this lock. */
- while (!lock->guard.done)
- Sleep (0);
- }
- EnterCriticalSection (&lock->lock);
- /* Test whether only readers are currently running, and whether the runcount
- field will not overflow, and whether no writer is waiting. The latter
- condition is because POSIX recommends that "write locks shall take
- precedence over read locks", to avoid "writer starvation". */
- if (!(lock->runcount + 1 > 0 && lock->waiting_writers.count == 0))
- {
- /* This thread has to wait for a while. Enqueue it among the
- waiting_readers. */
- HANDLE event = gl_waitqueue_add (&lock->waiting_readers);
- if (event != INVALID_HANDLE_VALUE)
- {
- DWORD result;
- LeaveCriticalSection (&lock->lock);
- /* Wait until another thread signals this event. */
- result = WaitForSingleObject (event, INFINITE);
- if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
- abort ();
- CloseHandle (event);
- /* The thread which signalled the event already did the bookkeeping:
- removed us from the waiting_readers, incremented lock->runcount. */
- if (!(lock->runcount > 0))
- abort ();
- return 0;
- }
- else
- {
- /* Allocation failure. Weird. */
- do
- {
- LeaveCriticalSection (&lock->lock);
- Sleep (1);
- EnterCriticalSection (&lock->lock);
- }
- while (!(lock->runcount + 1 > 0));
- }
- }
- lock->runcount++;
- LeaveCriticalSection (&lock->lock);
- return 0;
-}
-
-int
-glthread_rwlock_wrlock_func (gl_rwlock_t *lock)
-{
- if (!lock->guard.done)
- {
- if (InterlockedIncrement (&lock->guard.started) == 0)
- /* This thread is the first one to need this lock. Initialize it. */
- glthread_rwlock_init (lock);
- else
- /* Yield the CPU while waiting for another thread to finish
- initializing this lock. */
- while (!lock->guard.done)
- Sleep (0);
- }
- EnterCriticalSection (&lock->lock);
- /* Test whether no readers or writers are currently running. */
- if (!(lock->runcount == 0))
- {
- /* This thread has to wait for a while. Enqueue it among the
- waiting_writers. */
- HANDLE event = gl_waitqueue_add (&lock->waiting_writers);
- if (event != INVALID_HANDLE_VALUE)
- {
- DWORD result;
- LeaveCriticalSection (&lock->lock);
- /* Wait until another thread signals this event. */
- result = WaitForSingleObject (event, INFINITE);
- if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
- abort ();
- CloseHandle (event);
- /* The thread which signalled the event already did the bookkeeping:
- removed us from the waiting_writers, set lock->runcount = -1. */
- if (!(lock->runcount == -1))
- abort ();
- return 0;
- }
- else
- {
- /* Allocation failure. Weird. */
- do
- {
- LeaveCriticalSection (&lock->lock);
- Sleep (1);
- EnterCriticalSection (&lock->lock);
- }
- while (!(lock->runcount == 0));
- }
- }
- lock->runcount--; /* runcount becomes -1 */
- LeaveCriticalSection (&lock->lock);
- return 0;
-}
-
-int
-glthread_rwlock_unlock_func (gl_rwlock_t *lock)
-{
- if (!lock->guard.done)
- return EINVAL;
- EnterCriticalSection (&lock->lock);
- if (lock->runcount < 0)
- {
- /* Drop a writer lock. */
- if (!(lock->runcount == -1))
- abort ();
- lock->runcount = 0;
- }
- else
- {
- /* Drop a reader lock. */
- if (!(lock->runcount > 0))
- {
- LeaveCriticalSection (&lock->lock);
- return EPERM;
- }
- lock->runcount--;
- }
- if (lock->runcount == 0)
- {
- /* POSIX recommends that "write locks shall take precedence over read
- locks", to avoid "writer starvation". */
- if (lock->waiting_writers.count > 0)
- {
- /* Wake up one of the waiting writers. */
- lock->runcount--;
- gl_waitqueue_notify_first (&lock->waiting_writers);
- }
- else
- {
- /* Wake up all waiting readers. */
- lock->runcount += lock->waiting_readers.count;
- gl_waitqueue_notify_all (&lock->waiting_readers);
- }
- }
- LeaveCriticalSection (&lock->lock);
- return 0;
-}
-
-int
-glthread_rwlock_destroy_func (gl_rwlock_t *lock)
-{
- if (!lock->guard.done)
- return EINVAL;
- if (lock->runcount != 0)
- return EBUSY;
- DeleteCriticalSection (&lock->lock);
- if (lock->waiting_readers.array != NULL)
- free (lock->waiting_readers.array);
- if (lock->waiting_writers.array != NULL)
- free (lock->waiting_writers.array);
- lock->guard.done = 0;
- return 0;
-}
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-void
-glthread_recursive_lock_init_func (gl_recursive_lock_t *lock)
-{
- lock->owner = 0;
- lock->depth = 0;
- InitializeCriticalSection (&lock->lock);
- lock->guard.done = 1;
-}
-
-int
-glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock)
-{
- if (!lock->guard.done)
- {
- if (InterlockedIncrement (&lock->guard.started) == 0)
- /* This thread is the first one to need this lock. Initialize it. */
- glthread_recursive_lock_init (lock);
- else
- /* Yield the CPU while waiting for another thread to finish
- initializing this lock. */
- while (!lock->guard.done)
- Sleep (0);
- }
- {
- DWORD self = GetCurrentThreadId ();
- if (lock->owner != self)
- {
- EnterCriticalSection (&lock->lock);
- lock->owner = self;
- }
- if (++(lock->depth) == 0) /* wraparound? */
- {
- lock->depth--;
- return EAGAIN;
- }
- }
- return 0;
-}
-
-int
-glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock)
-{
- if (lock->owner != GetCurrentThreadId ())
- return EPERM;
- if (lock->depth == 0)
- return EINVAL;
- if (--(lock->depth) == 0)
- {
- lock->owner = 0;
- LeaveCriticalSection (&lock->lock);
- }
- return 0;
-}
-
-int
-glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock)
-{
- if (lock->owner != 0)
- return EBUSY;
- DeleteCriticalSection (&lock->lock);
- lock->guard.done = 0;
- return 0;
-}
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-void
-glthread_once_func (gl_once_t *once_control, void (*initfunction) (void))
-{
- if (once_control->inited <= 0)
- {
- if (InterlockedIncrement (&once_control->started) == 0)
- {
- /* This thread is the first one to come to this once_control. */
- InitializeCriticalSection (&once_control->lock);
- EnterCriticalSection (&once_control->lock);
- once_control->inited = 0;
- initfunction ();
- once_control->inited = 1;
- LeaveCriticalSection (&once_control->lock);
- }
- else
- {
- /* Undo last operation. */
- InterlockedDecrement (&once_control->started);
- /* Some other thread has already started the initialization.
- Yield the CPU while waiting for the other thread to finish
- initializing and taking the lock. */
- while (once_control->inited < 0)
- Sleep (0);
- if (once_control->inited <= 0)
- {
- /* Take the lock. This blocks until the other thread has
- finished calling the initfunction. */
- EnterCriticalSection (&once_control->lock);
- LeaveCriticalSection (&once_control->lock);
- if (!(once_control->inited > 0))
- abort ();
- }
- }
- }
-}
-
#endif
/* ========================================================================= */
diff --git a/macros/texinfo/texinfo/gnulib/lib/glthread/lock.h b/macros/texinfo/texinfo/gnulib/lib/glthread/lock.h
index 22580aa83c..a92c2a8345 100644
--- a/macros/texinfo/texinfo/gnulib/lib/glthread/lock.h
+++ b/macros/texinfo/texinfo/gnulib/lib/glthread/lock.h
@@ -15,8 +15,7 @@
along with this program; if not, see <https://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2005.
- Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
- gthr-win32.h. */
+ Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-win32.h. */
/* This file contains locking primitives for use with a given thread library.
It does not contain primitives for creating threads or for other
@@ -81,6 +80,16 @@
#include <errno.h>
#include <stdlib.h>
+#if !defined c11_threads_in_use
+# if HAVE_THREADS_H && USE_POSIX_THREADS_WEAK
+# include <threads.h>
+# pragma weak thrd_exit
+# define c11_threads_in_use() (thrd_exit != NULL)
+# else
+# define c11_threads_in_use() 0
+# endif
+#endif
+
/* ========================================================================= */
#if USE_POSIX_THREADS
@@ -156,7 +165,8 @@ extern int glthread_in_use (void);
pthread_rwlockattr_init
*/
# pragma weak pthread_mutexattr_gettype
-# define pthread_in_use() (pthread_mutexattr_gettype != NULL)
+# define pthread_in_use() \
+ (pthread_mutexattr_gettype != NULL || c11_threads_in_use ())
# endif
# else
@@ -395,287 +405,16 @@ extern int glthread_once_singlethreaded (pthread_once_t *once_control);
/* ========================================================================= */
-#if USE_PTH_THREADS
-
-/* Use the GNU Pth threads library. */
-
-# include <pth.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if USE_PTH_THREADS_WEAK
-
-/* Use weak references to the GNU Pth threads library. */
-
-# pragma weak pth_mutex_init
-# pragma weak pth_mutex_acquire
-# pragma weak pth_mutex_release
-# pragma weak pth_rwlock_init
-# pragma weak pth_rwlock_acquire
-# pragma weak pth_rwlock_release
-# pragma weak pth_once
-
-# pragma weak pth_cancel
-# define pth_in_use() (pth_cancel != NULL)
-
-# else
-
-# define pth_in_use() 1
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef pth_mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
- STORAGECLASS pth_mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
- STORAGECLASS pth_mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
- PTH_MUTEX_INIT
-# define glthread_lock_init(LOCK) \
- (pth_in_use () && !pth_mutex_init (LOCK) ? errno : 0)
-# define glthread_lock_lock(LOCK) \
- (pth_in_use () && !pth_mutex_acquire (LOCK, 0, NULL) ? errno : 0)
-# define glthread_lock_unlock(LOCK) \
- (pth_in_use () && !pth_mutex_release (LOCK) ? errno : 0)
-# define glthread_lock_destroy(LOCK) \
- ((void)(LOCK), 0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-/* Pth pth_rwlock_acquire always prefers readers. No autoconf test so far. */
-# if HAVE_PTH_RWLOCK_ACQUIRE_PREFER_WRITER
-
-typedef pth_rwlock_t gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
- STORAGECLASS pth_rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
- STORAGECLASS pth_rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
- PTH_RWLOCK_INIT
-# define glthread_rwlock_init(LOCK) \
- (pth_in_use () && !pth_rwlock_init (LOCK) ? errno : 0)
-# define glthread_rwlock_rdlock(LOCK) \
- (pth_in_use () && !pth_rwlock_acquire (LOCK, PTH_RWLOCK_RD, 0, NULL) ? errno : 0)
-# define glthread_rwlock_wrlock(LOCK) \
- (pth_in_use () && !pth_rwlock_acquire (LOCK, PTH_RWLOCK_RW, 0, NULL) ? errno : 0)
-# define glthread_rwlock_unlock(LOCK) \
- (pth_in_use () && !pth_rwlock_release (LOCK) ? errno : 0)
-# define glthread_rwlock_destroy(LOCK) \
- ((void)(LOCK), 0)
-
-# else
-
-typedef struct
- {
- int initialized;
- pth_mutex_t lock; /* protects the remaining fields */
- pth_cond_t waiting_readers; /* waiting readers */
- pth_cond_t waiting_writers; /* waiting writers */
- unsigned int waiting_writers_count; /* number of waiting writers */
- int runcount; /* number of readers running, or -1 when a writer runs */
- }
- gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
- STORAGECLASS gl_rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
- STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
- { 0 }
-# define glthread_rwlock_init(LOCK) \
- (pth_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
-# define glthread_rwlock_rdlock(LOCK) \
- (pth_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_wrlock(LOCK) \
- (pth_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_unlock(LOCK) \
- (pth_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
-# define glthread_rwlock_destroy(LOCK) \
- (pth_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
-extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
-
-# endif
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* In Pth, mutexes are recursive by default. */
-typedef pth_mutex_t gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME) \
- STORAGECLASS pth_mutex_t NAME;
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
- STORAGECLASS pth_mutex_t NAME = gl_recursive_lock_initializer;
-# define gl_recursive_lock_initializer \
- PTH_MUTEX_INIT
-# define glthread_recursive_lock_init(LOCK) \
- (pth_in_use () && !pth_mutex_init (LOCK) ? errno : 0)
-# define glthread_recursive_lock_lock(LOCK) \
- (pth_in_use () && !pth_mutex_acquire (LOCK, 0, NULL) ? errno : 0)
-# define glthread_recursive_lock_unlock(LOCK) \
- (pth_in_use () && !pth_mutex_release (LOCK) ? errno : 0)
-# define glthread_recursive_lock_destroy(LOCK) \
- ((void)(LOCK), 0)
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef pth_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
- STORAGECLASS pth_once_t NAME = PTH_ONCE_INIT;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
- (pth_in_use () \
- ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION) \
- : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_multithreaded (pth_once_t *once_control, void (*initfunction) (void));
-extern int glthread_once_singlethreaded (pth_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
-#if USE_SOLARIS_THREADS
-
-/* Use the old Solaris threads library. */
-
-# include <thread.h>
-# include <synch.h>
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# if USE_SOLARIS_THREADS_WEAK
-
-/* Use weak references to the old Solaris threads library. */
-
-# pragma weak mutex_init
-# pragma weak mutex_lock
-# pragma weak mutex_unlock
-# pragma weak mutex_destroy
-# pragma weak rwlock_init
-# pragma weak rw_rdlock
-# pragma weak rw_wrlock
-# pragma weak rw_unlock
-# pragma weak rwlock_destroy
-# pragma weak thr_self
-
-# pragma weak thr_suspend
-# define thread_in_use() (thr_suspend != NULL)
-
-# else
-
-# define thread_in_use() 1
-
-# endif
-
-/* -------------------------- gl_lock_t datatype -------------------------- */
-
-typedef mutex_t gl_lock_t;
-# define gl_lock_define(STORAGECLASS, NAME) \
- STORAGECLASS mutex_t NAME;
-# define gl_lock_define_initialized(STORAGECLASS, NAME) \
- STORAGECLASS mutex_t NAME = gl_lock_initializer;
-# define gl_lock_initializer \
- DEFAULTMUTEX
-# define glthread_lock_init(LOCK) \
- (thread_in_use () ? mutex_init (LOCK, USYNC_THREAD, NULL) : 0)
-# define glthread_lock_lock(LOCK) \
- (thread_in_use () ? mutex_lock (LOCK) : 0)
-# define glthread_lock_unlock(LOCK) \
- (thread_in_use () ? mutex_unlock (LOCK) : 0)
-# define glthread_lock_destroy(LOCK) \
- (thread_in_use () ? mutex_destroy (LOCK) : 0)
-
-/* ------------------------- gl_rwlock_t datatype ------------------------- */
-
-typedef rwlock_t gl_rwlock_t;
-# define gl_rwlock_define(STORAGECLASS, NAME) \
- STORAGECLASS rwlock_t NAME;
-# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
- STORAGECLASS rwlock_t NAME = gl_rwlock_initializer;
-# define gl_rwlock_initializer \
- DEFAULTRWLOCK
-# define glthread_rwlock_init(LOCK) \
- (thread_in_use () ? rwlock_init (LOCK, USYNC_THREAD, NULL) : 0)
-# define glthread_rwlock_rdlock(LOCK) \
- (thread_in_use () ? rw_rdlock (LOCK) : 0)
-# define glthread_rwlock_wrlock(LOCK) \
- (thread_in_use () ? rw_wrlock (LOCK) : 0)
-# define glthread_rwlock_unlock(LOCK) \
- (thread_in_use () ? rw_unlock (LOCK) : 0)
-# define glthread_rwlock_destroy(LOCK) \
- (thread_in_use () ? rwlock_destroy (LOCK) : 0)
-
-/* --------------------- gl_recursive_lock_t datatype --------------------- */
-
-/* Old Solaris threads did not have recursive locks.
- We have to implement them ourselves. */
-
-typedef struct
- {
- mutex_t mutex;
- thread_t owner;
- unsigned long depth;
- }
- gl_recursive_lock_t;
-# define gl_recursive_lock_define(STORAGECLASS, NAME) \
- STORAGECLASS gl_recursive_lock_t NAME;
-# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
- STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
-# define gl_recursive_lock_initializer \
- { DEFAULTMUTEX, (thread_t) 0, 0 }
-# define glthread_recursive_lock_init(LOCK) \
- (thread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_lock(LOCK) \
- (thread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_unlock(LOCK) \
- (thread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
-# define glthread_recursive_lock_destroy(LOCK) \
- (thread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
-extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
-
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef struct
- {
- volatile int inited;
- mutex_t mutex;
- }
- gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
- STORAGECLASS gl_once_t NAME = { 0, DEFAULTMUTEX };
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
- (thread_in_use () \
- ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION) \
- : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_multithreaded (gl_once_t *once_control, void (*initfunction) (void));
-extern int glthread_once_singlethreaded (gl_once_t *once_control);
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif
-
-/* ========================================================================= */
-
#if USE_WINDOWS_THREADS
# define WIN32_LEAN_AND_MEAN /* avoid including junk */
# include <windows.h>
+# include "windows-mutex.h"
+# include "windows-rwlock.h"
+# include "windows-recmutex.h"
+# include "windows-once.h"
+
# ifdef __cplusplus
extern "C" {
# endif
@@ -691,127 +430,69 @@ extern "C" {
/* There is no way to statically initialize a CRITICAL_SECTION. It needs
to be done lazily, once only. For this we need spinlocks. */
-typedef struct { volatile int done; volatile long started; } gl_spinlock_t;
-
/* -------------------------- gl_lock_t datatype -------------------------- */
-typedef struct
- {
- gl_spinlock_t guard; /* protects the initialization */
- CRITICAL_SECTION lock;
- }
- gl_lock_t;
+typedef glwthread_mutex_t gl_lock_t;
# define gl_lock_define(STORAGECLASS, NAME) \
STORAGECLASS gl_lock_t NAME;
# define gl_lock_define_initialized(STORAGECLASS, NAME) \
STORAGECLASS gl_lock_t NAME = gl_lock_initializer;
# define gl_lock_initializer \
- { { 0, -1 } }
+ GLWTHREAD_MUTEX_INIT
# define glthread_lock_init(LOCK) \
- (glthread_lock_init_func (LOCK), 0)
+ (glwthread_mutex_init (LOCK), 0)
# define glthread_lock_lock(LOCK) \
- glthread_lock_lock_func (LOCK)
+ glwthread_mutex_lock (LOCK)
# define glthread_lock_unlock(LOCK) \
- glthread_lock_unlock_func (LOCK)
+ glwthread_mutex_unlock (LOCK)
# define glthread_lock_destroy(LOCK) \
- glthread_lock_destroy_func (LOCK)
-extern void glthread_lock_init_func (gl_lock_t *lock);
-extern int glthread_lock_lock_func (gl_lock_t *lock);
-extern int glthread_lock_unlock_func (gl_lock_t *lock);
-extern int glthread_lock_destroy_func (gl_lock_t *lock);
+ glwthread_mutex_destroy (LOCK)
/* ------------------------- gl_rwlock_t datatype ------------------------- */
-/* It is impossible to implement read-write locks using plain locks, without
- introducing an extra thread dedicated to managing read-write locks.
- Therefore here we need to use the low-level Event type. */
-
-typedef struct
- {
- HANDLE *array; /* array of waiting threads, each represented by an event */
- unsigned int count; /* number of waiting threads */
- unsigned int alloc; /* length of allocated array */
- unsigned int offset; /* index of first waiting thread in array */
- }
- gl_carray_waitqueue_t;
-typedef struct
- {
- gl_spinlock_t guard; /* protects the initialization */
- CRITICAL_SECTION lock; /* protects the remaining fields */
- gl_carray_waitqueue_t waiting_readers; /* waiting readers */
- gl_carray_waitqueue_t waiting_writers; /* waiting writers */
- int runcount; /* number of readers running, or -1 when a writer runs */
- }
- gl_rwlock_t;
+typedef glwthread_rwlock_t gl_rwlock_t;
# define gl_rwlock_define(STORAGECLASS, NAME) \
STORAGECLASS gl_rwlock_t NAME;
# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
# define gl_rwlock_initializer \
- { { 0, -1 } }
+ GLWTHREAD_RWLOCK_INIT
# define glthread_rwlock_init(LOCK) \
- (glthread_rwlock_init_func (LOCK), 0)
+ (glwthread_rwlock_init (LOCK), 0)
# define glthread_rwlock_rdlock(LOCK) \
- glthread_rwlock_rdlock_func (LOCK)
+ glwthread_rwlock_rdlock (LOCK)
# define glthread_rwlock_wrlock(LOCK) \
- glthread_rwlock_wrlock_func (LOCK)
+ glwthread_rwlock_wrlock (LOCK)
# define glthread_rwlock_unlock(LOCK) \
- glthread_rwlock_unlock_func (LOCK)
+ glwthread_rwlock_unlock (LOCK)
# define glthread_rwlock_destroy(LOCK) \
- glthread_rwlock_destroy_func (LOCK)
-extern void glthread_rwlock_init_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_rdlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_wrlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_unlock_func (gl_rwlock_t *lock);
-extern int glthread_rwlock_destroy_func (gl_rwlock_t *lock);
+ glwthread_rwlock_destroy (LOCK)
/* --------------------- gl_recursive_lock_t datatype --------------------- */
-/* The native Windows documentation says that CRITICAL_SECTION already
- implements a recursive lock. But we need not rely on it: It's easy to
- implement a recursive lock without this assumption. */
-
-typedef struct
- {
- gl_spinlock_t guard; /* protects the initialization */
- DWORD owner;
- unsigned long depth;
- CRITICAL_SECTION lock;
- }
- gl_recursive_lock_t;
+typedef glwthread_recmutex_t gl_recursive_lock_t;
# define gl_recursive_lock_define(STORAGECLASS, NAME) \
STORAGECLASS gl_recursive_lock_t NAME;
# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
# define gl_recursive_lock_initializer \
- { { 0, -1 }, 0, 0 }
+ GLWTHREAD_RECMUTEX_INIT
# define glthread_recursive_lock_init(LOCK) \
- (glthread_recursive_lock_init_func (LOCK), 0)
+ (glwthread_recmutex_init (LOCK), 0)
# define glthread_recursive_lock_lock(LOCK) \
- glthread_recursive_lock_lock_func (LOCK)
+ glwthread_recmutex_lock (LOCK)
# define glthread_recursive_lock_unlock(LOCK) \
- glthread_recursive_lock_unlock_func (LOCK)
+ glwthread_recmutex_unlock (LOCK)
# define glthread_recursive_lock_destroy(LOCK) \
- glthread_recursive_lock_destroy_func (LOCK)
-extern void glthread_recursive_lock_init_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_lock_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_unlock_func (gl_recursive_lock_t *lock);
-extern int glthread_recursive_lock_destroy_func (gl_recursive_lock_t *lock);
+ glwthread_recmutex_destroy (LOCK)
/* -------------------------- gl_once_t datatype -------------------------- */
-typedef struct
- {
- volatile int inited;
- volatile long started;
- CRITICAL_SECTION lock;
- }
- gl_once_t;
+typedef glwthread_once_t gl_once_t;
# define gl_once_define(STORAGECLASS, NAME) \
- STORAGECLASS gl_once_t NAME = { -1, -1 };
+ STORAGECLASS gl_once_t NAME = GLWTHREAD_ONCE_INIT;
# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
- (glthread_once_func (ONCE_CONTROL, INITFUNCTION), 0)
-extern void glthread_once_func (gl_once_t *once_control, void (*initfunction) (void));
+ (glwthread_once (ONCE_CONTROL, INITFUNCTION), 0)
# ifdef __cplusplus
}
@@ -821,7 +502,7 @@ extern void glthread_once_func (gl_once_t *once_control, void (*initfunction) (v
/* ========================================================================= */
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
+#if !(USE_POSIX_THREADS || USE_WINDOWS_THREADS)
/* Provide dummy implementation if threads are not supported. */
diff --git a/macros/texinfo/texinfo/gnulib/lib/intprops.h b/macros/texinfo/texinfo/gnulib/lib/intprops.h
index 1a44ae5565..fe67c1f305 100644
--- a/macros/texinfo/texinfo/gnulib/lib/intprops.h
+++ b/macros/texinfo/texinfo/gnulib/lib/intprops.h
@@ -111,8 +111,8 @@
Subtract 1 for the sign bit if T is signed, and then add 1 more for
a minus sign if needed.
- Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 0 when its argument is
- signed, this macro may overestimate the true bound by one byte when
+ Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 1 when its argument is
+ unsigned, this macro may overestimate the true bound by one byte when
applied to unsigned types of size 2, 4, 16, ... bytes. */
#define INT_STRLEN_BOUND(t) \
(INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
@@ -281,7 +281,9 @@
The INT_<op>_OVERFLOW macros return 1 if the corresponding C operators
might not yield numerically correct answers due to arithmetic overflow.
- The INT_<op>_WRAPV macros also store the low-order bits of the answer.
+ The INT_<op>_WRAPV macros compute the low-order bits of the sum,
+ difference, and product of two C integers, and return 1 if these
+ low-order bits are not numerically correct.
These macros work correctly on all known practical hosts, and do not rely
on undefined behavior due to signed arithmetic overflow.
@@ -309,9 +311,11 @@
arguments should not have side effects.
The WRAPV macros are not constant expressions. They support only
- +, binary -, and *. The result type must be signed.
+ +, binary -, and *. Because the WRAPV macros convert the result,
+ they report overflow in different circumstances than the OVERFLOW
+ macros do.
- These macros are tuned for their last argument being a constant.
+ These macros are tuned for their last input argument being a constant.
Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B,
A % B, and A << B would overflow, respectively. */
@@ -348,11 +352,21 @@
/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
Return 1 if the result overflows. See above for restrictions. */
#define INT_ADD_WRAPV(a, b, r) \
- _GL_INT_OP_WRAPV (a, b, r, +, __builtin_add_overflow, INT_ADD_OVERFLOW)
+ _GL_INT_OP_WRAPV (a, b, r, +, __builtin_add_overflow, \
+ _GL_INT_ADD_RANGE_OVERFLOW)
#define INT_SUBTRACT_WRAPV(a, b, r) \
- _GL_INT_OP_WRAPV (a, b, r, -, __builtin_sub_overflow, INT_SUBTRACT_OVERFLOW)
+ _GL_INT_OP_WRAPV (a, b, r, -, __builtin_sub_overflow, \
+ _GL_INT_SUBTRACT_RANGE_OVERFLOW)
#define INT_MULTIPLY_WRAPV(a, b, r) \
- _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
+ _GL_INT_OP_WRAPV (a, b, r, *, _GL_BUILTIN_MUL_OVERFLOW, \
+ _GL_INT_MULTIPLY_RANGE_OVERFLOW)
+
+/* Like __builtin_mul_overflow, but work around GCC bug 91450. */
+#define _GL_BUILTIN_MUL_OVERFLOW(a, b, r) \
+ ((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && EXPR_SIGNED (a) && EXPR_SIGNED (b) \
+ && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \
+ ? ((void) __builtin_mul_overflow (a, b, r), 1) \
+ : __builtin_mul_overflow (a, b, r))
/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
@@ -379,41 +393,91 @@
signed char: \
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
signed char, SCHAR_MIN, SCHAR_MAX), \
+ unsigned char: \
+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+ unsigned char, 0, UCHAR_MAX), \
short int: \
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
short int, SHRT_MIN, SHRT_MAX), \
+ unsigned short int: \
+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+ unsigned short int, 0, USHRT_MAX), \
int: \
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
int, INT_MIN, INT_MAX), \
+ unsigned int: \
+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+ unsigned int, 0, UINT_MAX), \
long int: \
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
long int, LONG_MIN, LONG_MAX), \
+ unsigned long int: \
+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+ unsigned long int, 0, ULONG_MAX), \
long long int: \
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
- long long int, LLONG_MIN, LLONG_MAX)))
+ long long int, LLONG_MIN, LLONG_MAX), \
+ unsigned long long int: \
+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+ unsigned long long int, 0, ULLONG_MAX)))
#else
+/* Store the low-order bits of A <op> B into *R, where OP specifies
+ the operation and OVERFLOW the overflow predicate. If *R is
+ signed, its type is ST with bounds SMIN..SMAX; otherwise its type
+ is UT with bounds U..UMAX. ST and UT are narrower than int.
+ Return 1 if the result overflows. See above for restrictions. */
+# if _GL_HAVE___TYPEOF__
+# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \
+ (TYPE_SIGNED (__typeof__ (*(r))) \
+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, st, smin, smax) \
+ : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, ut, 0, umax))
+# else
+# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \
+ (overflow (a, b, smin, smax) \
+ ? (overflow (a, b, 0, umax) \
+ ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 1) \
+ : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) < 0) \
+ : (overflow (a, b, 0, umax) \
+ ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) >= 0 \
+ : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 0)))
+# endif
+
# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
(sizeof *(r) == sizeof (signed char) \
- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
- signed char, SCHAR_MIN, SCHAR_MAX) \
+ ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \
+ signed char, SCHAR_MIN, SCHAR_MAX, \
+ unsigned char, UCHAR_MAX) \
: sizeof *(r) == sizeof (short int) \
- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
- short int, SHRT_MIN, SHRT_MAX) \
+ ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \
+ short int, SHRT_MIN, SHRT_MAX, \
+ unsigned short int, USHRT_MAX) \
: sizeof *(r) == sizeof (int) \
- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
- int, INT_MIN, INT_MAX) \
+ ? (EXPR_SIGNED (*(r)) \
+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+ int, INT_MIN, INT_MAX) \
+ : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+ unsigned int, 0, UINT_MAX)) \
: _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow))
# ifdef LLONG_MAX
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
(sizeof *(r) == sizeof (long int) \
- ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
- long int, LONG_MIN, LONG_MAX) \
- : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
- long long int, LLONG_MIN, LLONG_MAX))
+ ? (EXPR_SIGNED (*(r)) \
+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+ long int, LONG_MIN, LONG_MAX) \
+ : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+ unsigned long int, 0, ULONG_MAX)) \
+ : (EXPR_SIGNED (*(r)) \
+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+ long long int, LLONG_MIN, LLONG_MAX) \
+ : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+ unsigned long long int, 0, ULLONG_MAX)))
# else
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
- _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
- long int, LONG_MIN, LONG_MAX)
+ (EXPR_SIGNED (*(r)) \
+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+ long int, LONG_MIN, LONG_MAX) \
+ : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+ unsigned long int, 0, ULONG_MAX))
# endif
#endif
@@ -422,13 +486,7 @@
overflow problems. *R's type is T, with extrema TMIN and TMAX.
T must be a signed integer type. Return 1 if the result overflows. */
#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
- (sizeof ((a) op (b)) < sizeof (t) \
- ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \
- : _GL_INT_OP_CALC1 (a, b, r, op, overflow, ut, t, tmin, tmax))
-#define _GL_INT_OP_CALC1(a, b, r, op, overflow, ut, t, tmin, tmax) \
- ((overflow (a, b) \
- || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \
- || (tmax) < ((a) op (b))) \
+ (overflow (a, b, tmin, tmax) \
? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \
: (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0))
@@ -452,4 +510,57 @@
#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \
((t) ((ut) (a) op (ut) (b)))
+/* Return true if the numeric values A + B, A - B, A * B fall outside
+ the range TMIN..TMAX. Arguments should be integer expressions
+ without side effects. TMIN should be signed and nonpositive.
+ TMAX should be positive, and should be signed unless TMIN is zero. */
+#define _GL_INT_ADD_RANGE_OVERFLOW(a, b, tmin, tmax) \
+ ((b) < 0 \
+ ? (((tmin) \
+ ? ((EXPR_SIGNED (_GL_INT_CONVERT (a, (tmin) - (b))) || (b) < (tmin)) \
+ && (a) < (tmin) - (b)) \
+ : (a) <= -1 - (b)) \
+ || ((EXPR_SIGNED (a) ? 0 <= (a) : (tmax) < (a)) && (tmax) < (a) + (b))) \
+ : (a) < 0 \
+ ? (((tmin) \
+ ? ((EXPR_SIGNED (_GL_INT_CONVERT (b, (tmin) - (a))) || (a) < (tmin)) \
+ && (b) < (tmin) - (a)) \
+ : (b) <= -1 - (a)) \
+ || ((EXPR_SIGNED (_GL_INT_CONVERT (a, b)) || (tmax) < (b)) \
+ && (tmax) < (a) + (b))) \
+ : (tmax) < (b) || (tmax) - (b) < (a))
+#define _GL_INT_SUBTRACT_RANGE_OVERFLOW(a, b, tmin, tmax) \
+ (((a) < 0) == ((b) < 0) \
+ ? ((a) < (b) \
+ ? !(tmin) || -1 - (tmin) < (b) - (a) - 1 \
+ : (tmax) < (a) - (b)) \
+ : (a) < 0 \
+ ? ((!EXPR_SIGNED (_GL_INT_CONVERT ((a) - (tmin), b)) && (a) - (tmin) < 0) \
+ || (a) - (tmin) < (b)) \
+ : ((! (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \
+ && EXPR_SIGNED (_GL_INT_CONVERT ((tmax) + (b), a))) \
+ && (tmax) <= -1 - (b)) \
+ || (tmax) + (b) < (a)))
+#define _GL_INT_MULTIPLY_RANGE_OVERFLOW(a, b, tmin, tmax) \
+ ((b) < 0 \
+ ? ((a) < 0 \
+ ? (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \
+ ? (a) < (tmax) / (b) \
+ : ((INT_NEGATE_OVERFLOW (b) \
+ ? _GL_INT_CONVERT (b, tmax) >> (TYPE_WIDTH (b) - 1) \
+ : (tmax) / -(b)) \
+ <= -1 - (a))) \
+ : INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (b, tmin)) && (b) == -1 \
+ ? (EXPR_SIGNED (a) \
+ ? 0 < (a) + (tmin) \
+ : 0 < (a) && -1 - (tmin) < (a) - 1) \
+ : (tmin) / (b) < (a)) \
+ : (b) == 0 \
+ ? 0 \
+ : ((a) < 0 \
+ ? (INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (a, tmin)) && (a) == -1 \
+ ? (EXPR_SIGNED (b) ? 0 < (b) + (tmin) : -1 - (tmin) < (b) - 1) \
+ : (tmin) / (a) < (b)) \
+ : (tmax) / (b) < (a)))
+
#endif /* _GL_INTPROPS_H */
diff --git a/macros/texinfo/texinfo/gnulib/lib/localcharset.c b/macros/texinfo/texinfo/gnulib/lib/localcharset.c
index 38e27e6f37..dabef94848 100644
--- a/macros/texinfo/texinfo/gnulib/lib/localcharset.c
+++ b/macros/texinfo/texinfo/gnulib/lib/localcharset.c
@@ -377,27 +377,166 @@ static const struct table_entry alias_table[] =
/* The list of encodings is taken from "List of OS/2 Codepages"
by Alex Taylor:
<http://altsan.org/os2/toolkits/uls/index.html#codepages>.
- See also "IBM Globalization - Code page identifiers":
- <https://www-01.ibm.com/software/globalization/cp/cp_cpgid.html>. */
- { "CP1089", "ISO-8859-6" },
- { "CP1208", "UTF-8" },
- { "CP1381", "GB2312" },
- { "CP1386", "GBK" },
- { "CP3372", "EUC-JP" },
- { "CP813", "ISO-8859-7" },
- { "CP819", "ISO-8859-1" },
- { "CP878", "KOI8-R" },
- { "CP912", "ISO-8859-2" },
- { "CP913", "ISO-8859-3" },
- { "CP914", "ISO-8859-4" },
- { "CP915", "ISO-8859-5" },
- { "CP916", "ISO-8859-8" },
- { "CP920", "ISO-8859-9" },
- { "CP921", "ISO-8859-13" },
- { "CP923", "ISO-8859-15" },
- { "CP954", "EUC-JP" },
- { "CP964", "EUC-TW" },
- { "CP970", "EUC-KR" }
+ See also "__convcp() of kLIBC":
+ <http://trac.netlabs.org/libc/browser/branches/libc-0.6/src/emx/src/lib/locale/__convcp.c>,
+ or:
+ <https://github.com/bitwiseworks/libc/blob/master/src/emx/src/lib/locale/__convcp.c>. */
+ { "CP1004", "CP1252" },
+ /*{ "CP1041", "CP943" },*/
+ /*{ "CP1088", "CP949" },*/
+ { "CP1089", "ISO-8859-6" },
+ /*{ "CP1114", "CP950" },*/
+ /*{ "CP1115", "GB2312" },*/
+ { "CP1208", "UTF-8" },
+ /*{ "CP1380", "GB2312" },*/
+ { "CP1381", "GB2312" },
+ { "CP1383", "GB2312" },
+ { "CP1386", "GBK" },
+ /*{ "CP301", "CP943" },*/
+ { "CP3372", "EUC-JP" },
+ { "CP4946", "CP850" },
+ /*{ "CP5048", "JIS_X0208-1990" },*/
+ /*{ "CP5049", "JIS_X0212-1990" },*/
+ /*{ "CP5067", "KS_C_5601-1987" },*/
+ { "CP813", "ISO-8859-7" },
+ { "CP819", "ISO-8859-1" },
+ { "CP878", "KOI8-R" },
+ /*{ "CP897", "CP943" },*/
+ { "CP912", "ISO-8859-2" },
+ { "CP913", "ISO-8859-3" },
+ { "CP914", "ISO-8859-4" },
+ { "CP915", "ISO-8859-5" },
+ { "CP916", "ISO-8859-8" },
+ { "CP920", "ISO-8859-9" },
+ { "CP921", "ISO-8859-13" },
+ { "CP923", "ISO-8859-15" },
+ /*{ "CP941", "CP943" },*/
+ /*{ "CP947", "CP950" },*/
+ /*{ "CP951", "CP949" },*/
+ /*{ "CP952", "JIS_X0208-1990" },*/
+ /*{ "CP953", "JIS_X0212-1990" },*/
+ { "CP954", "EUC-JP" },
+ { "CP964", "EUC-TW" },
+ { "CP970", "EUC-KR" },
+ /*{ "CP971", "KS_C_5601-1987" },*/
+ { "IBM-1004", "CP1252" },
+ /*{ "IBM-1006", "?" },*/
+ /*{ "IBM-1008", "?" },*/
+ /*{ "IBM-1041", "CP943" },*/
+ /*{ "IBM-1051", "?" },*/
+ /*{ "IBM-1088", "CP949" },*/
+ { "IBM-1089", "ISO-8859-6" },
+ /*{ "IBM-1098", "?" },*/
+ /*{ "IBM-1114", "CP950" },*/
+ /*{ "IBM-1115", "GB2312" },*/
+ /*{ "IBM-1116", "?" },*/
+ /*{ "IBM-1117", "?" },*/
+ /*{ "IBM-1118", "?" },*/
+ /*{ "IBM-1119", "?" },*/
+ { "IBM-1124", "CP1124" },
+ { "IBM-1125", "CP1125" },
+ { "IBM-1131", "CP1131" },
+ { "IBM-1208", "UTF-8" },
+ { "IBM-1250", "CP1250" },
+ { "IBM-1251", "CP1251" },
+ { "IBM-1252", "CP1252" },
+ { "IBM-1253", "CP1253" },
+ { "IBM-1254", "CP1254" },
+ { "IBM-1255", "CP1255" },
+ { "IBM-1256", "CP1256" },
+ { "IBM-1257", "CP1257" },
+ /*{ "IBM-1275", "?" },*/
+ /*{ "IBM-1276", "?" },*/
+ /*{ "IBM-1277", "?" },*/
+ /*{ "IBM-1280", "?" },*/
+ /*{ "IBM-1281", "?" },*/
+ /*{ "IBM-1282", "?" },*/
+ /*{ "IBM-1283", "?" },*/
+ /*{ "IBM-1380", "GB2312" },*/
+ { "IBM-1381", "GB2312" },
+ { "IBM-1383", "GB2312" },
+ { "IBM-1386", "GBK" },
+ /*{ "IBM-301", "CP943" },*/
+ { "IBM-3372", "EUC-JP" },
+ { "IBM-367", "ASCII" },
+ { "IBM-437", "CP437" },
+ { "IBM-4946", "CP850" },
+ /*{ "IBM-5048", "JIS_X0208-1990" },*/
+ /*{ "IBM-5049", "JIS_X0212-1990" },*/
+ /*{ "IBM-5067", "KS_C_5601-1987" },*/
+ { "IBM-813", "ISO-8859-7" },
+ { "IBM-819", "ISO-8859-1" },
+ { "IBM-850", "CP850" },
+ /*{ "IBM-851", "?" },*/
+ { "IBM-852", "CP852" },
+ { "IBM-855", "CP855" },
+ { "IBM-856", "CP856" },
+ { "IBM-857", "CP857" },
+ /*{ "IBM-859", "?" },*/
+ { "IBM-860", "CP860" },
+ { "IBM-861", "CP861" },
+ { "IBM-862", "CP862" },
+ { "IBM-863", "CP863" },
+ { "IBM-864", "CP864" },
+ { "IBM-865", "CP865" },
+ { "IBM-866", "CP866" },
+ /*{ "IBM-868", "?" },*/
+ { "IBM-869", "CP869" },
+ { "IBM-874", "CP874" },
+ { "IBM-878", "KOI8-R" },
+ /*{ "IBM-895", "?" },*/
+ /*{ "IBM-897", "CP943" },*/
+ /*{ "IBM-907", "?" },*/
+ /*{ "IBM-909", "?" },*/
+ { "IBM-912", "ISO-8859-2" },
+ { "IBM-913", "ISO-8859-3" },
+ { "IBM-914", "ISO-8859-4" },
+ { "IBM-915", "ISO-8859-5" },
+ { "IBM-916", "ISO-8859-8" },
+ { "IBM-920", "ISO-8859-9" },
+ { "IBM-921", "ISO-8859-13" },
+ { "IBM-922", "CP922" },
+ { "IBM-923", "ISO-8859-15" },
+ { "IBM-932", "CP932" },
+ /*{ "IBM-941", "CP943" },*/
+ /*{ "IBM-942", "?" },*/
+ { "IBM-943", "CP943" },
+ /*{ "IBM-947", "CP950" },*/
+ { "IBM-949", "CP949" },
+ { "IBM-950", "CP950" },
+ /*{ "IBM-951", "CP949" },*/
+ /*{ "IBM-952", "JIS_X0208-1990" },*/
+ /*{ "IBM-953", "JIS_X0212-1990" },*/
+ { "IBM-954", "EUC-JP" },
+ /*{ "IBM-955", "?" },*/
+ { "IBM-964", "EUC-TW" },
+ { "IBM-970", "EUC-KR" },
+ /*{ "IBM-971", "KS_C_5601-1987" },*/
+ { "IBM-eucCN", "GB2312" },
+ { "IBM-eucJP", "EUC-JP" },
+ { "IBM-eucKR", "EUC-KR" },
+ { "IBM-eucTW", "EUC-TW" },
+ { "IBM33722", "EUC-JP" },
+ { "ISO8859-1", "ISO-8859-1" },
+ { "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-3", "ISO-8859-3" },
+ { "ISO8859-4", "ISO-8859-4" },
+ { "ISO8859-5", "ISO-8859-5" },
+ { "ISO8859-6", "ISO-8859-6" },
+ { "ISO8859-7", "ISO-8859-7" },
+ { "ISO8859-8", "ISO-8859-8" },
+ { "ISO8859-9", "ISO-8859-9" },
+ /*{ "JISX0201-1976", "JISX0201-1976" },*/
+ /*{ "JISX0208-1978", "?" },*/
+ /*{ "JISX0208-1983", "JIS_X0208-1983" },*/
+ /*{ "JISX0208-1990", "JIS_X0208-1990" },*/
+ /*{ "JISX0212-1990", "JIS_X0212-1990" },*/
+ /*{ "KSC5601-1987", "KS_C_5601-1987" },*/
+ { "SJIS-1", "CP943" },
+ { "SJIS-2", "CP943" },
+ { "eucJP", "EUC-JP" },
+ { "eucKR", "EUC-KR" },
+ { "eucTW-1993", "EUC-TW" }
# define alias_table_defined
# endif
# if defined VMS /* OpenVMS */
@@ -787,7 +926,12 @@ locale_charset (void)
encoding is the best bet. */
sprintf (buf, "CP%u", GetACP ());
}
- codeset = buf;
+ /* For a locale name such as "French_France.65001", in Windows 10,
+ setlocale now returns "French_France.utf8" instead. */
+ if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0)
+ codeset = "UTF-8";
+ else
+ codeset = buf;
# elif defined OS2
diff --git a/macros/texinfo/texinfo/gnulib/lib/mbrtowc.c b/macros/texinfo/texinfo/gnulib/lib/mbrtowc.c
index bbe3f7a3b9..1aad22cd5a 100644
--- a/macros/texinfo/texinfo/gnulib/lib/mbrtowc.c
+++ b/macros/texinfo/texinfo/gnulib/lib/mbrtowc.c
@@ -34,6 +34,7 @@
# include "localcharset.h"
# include "streq.h"
# include "verify.h"
+# include "glthread/lock.h"
# ifndef FALLTHROUGH
# if __GNUC__ < 7
@@ -75,7 +76,7 @@ locale_enc (void)
return enc_other;
}
-#if GNULIB_WCHAR_SINGLE
+# if GNULIB_WCHAR_SINGLE
/* When we know that the locale does not change, provide a speedup by
caching the value of locale_enc. */
static int cached_locale_enc = -1;
@@ -86,10 +87,14 @@ locale_enc_cached (void)
cached_locale_enc = locale_enc ();
return cached_locale_enc;
}
-#else
+# else
/* By default, don't make assumptions, hence no caching. */
-# define locale_enc_cached locale_enc
-#endif
+# define locale_enc_cached locale_enc
+# endif
+
+/* This lock protects the internal state of mbtowc against multiple simultaneous
+ calls of mbrtowc. */
+gl_lock_define_initialized(static, mbtowc_lock)
verify (sizeof (mbstate_t) >= 4);
@@ -120,6 +125,8 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
char buf[4];
const char *p;
size_t m;
+ enc_t enc;
+ int res;
switch (nstate)
{
@@ -152,227 +159,296 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
/* Here m > 0. */
-# if __GLIBC__ || defined __UCLIBC__
- /* Work around bug <https://sourceware.org/bugzilla/show_bug.cgi?id=9674> */
- mbtowc (NULL, NULL, 0);
-# endif
- {
- int res = mbtowc (pwc, p, m);
+ enc = locale_enc_cached ();
- if (res >= 0)
- {
- if (pwc != NULL && ((*pwc == 0) != (res == 0)))
- abort ();
- if (nstate >= (res > 0 ? res : 1))
- abort ();
- res -= nstate;
- pstate[0] = 0;
- return res;
- }
+ if (enc == enc_utf8) /* UTF-8 */
+ {
+ /* Achieve multi-thread safety by not calling mbtowc() at all. */
+ /* Cf. unistr/u8-mbtouc.c. */
+ unsigned char c = (unsigned char) p[0];
- /* mbtowc does not distinguish between invalid and incomplete multibyte
- sequences. But mbrtowc needs to make this distinction.
- There are two possible approaches:
- - Use iconv() and its return value.
- - Use built-in knowledge about the possible encodings.
- Given the low quality of implementation of iconv() on the systems that
- lack mbrtowc(), we use the second approach.
- The possible encodings are:
- - 8-bit encodings,
- - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS,
- - UTF-8.
- Use specialized code for each. */
- if (m >= 4 || m >= MB_CUR_MAX)
- goto invalid;
- /* Here MB_CUR_MAX > 1 and 0 < m < 4. */
- switch (locale_enc_cached ())
- {
- case enc_utf8: /* UTF-8 */
+ if (c < 0x80)
{
- /* Cf. unistr/u8-mblen.c. */
- unsigned char c = (unsigned char) p[0];
-
- if (c >= 0xc2)
- {
- if (c < 0xe0)
- {
- if (m == 1)
- goto incomplete;
- }
- else if (c < 0xf0)
- {
- if (m == 1)
- goto incomplete;
- if (m == 2)
- {
- unsigned char c2 = (unsigned char) p[1];
-
- if ((c2 ^ 0x80) < 0x40
- && (c >= 0xe1 || c2 >= 0xa0)
- && (c != 0xed || c2 < 0xa0))
- goto incomplete;
- }
- }
- else if (c <= 0xf4)
- {
- if (m == 1)
- goto incomplete;
- else /* m == 2 || m == 3 */
- {
- unsigned char c2 = (unsigned char) p[1];
-
- if ((c2 ^ 0x80) < 0x40
- && (c >= 0xf1 || c2 >= 0x90)
- && (c < 0xf4 || (c == 0xf4 && c2 < 0x90)))
- {
- if (m == 2)
- goto incomplete;
- else /* m == 3 */
- {
- unsigned char c3 = (unsigned char) p[2];
-
- if ((c3 ^ 0x80) < 0x40)
- goto incomplete;
- }
- }
- }
- }
- }
- goto invalid;
+ if (pwc != NULL)
+ *pwc = c;
+ res = (c == 0 ? 0 : 1);
+ goto success;
}
-
- /* As a reference for this code, you can use the GNU libiconv
- implementation. Look for uses of the RET_TOOFEW macro. */
-
- case enc_eucjp: /* EUC-JP */
+ if (c >= 0xc2)
{
- if (m == 1)
+ if (c < 0xe0)
{
- unsigned char c = (unsigned char) p[0];
-
- if ((c >= 0xa1 && c < 0xff) || c == 0x8e || c == 0x8f)
+ if (m == 1)
goto incomplete;
- }
- if (m == 2)
- {
- unsigned char c = (unsigned char) p[0];
-
- if (c == 0x8f)
+ else /* m >= 2 */
{
unsigned char c2 = (unsigned char) p[1];
- if (c2 >= 0xa1 && c2 < 0xff)
- goto incomplete;
+ if ((c2 ^ 0x80) < 0x40)
+ {
+ if (pwc != NULL)
+ *pwc = ((unsigned int) (c & 0x1f) << 6)
+ | (unsigned int) (c2 ^ 0x80);
+ res = 2;
+ goto success;
+ }
}
}
- goto invalid;
- }
-
- case enc_94: /* EUC-KR, GB2312, BIG5 */
- {
- if (m == 1)
+ else if (c < 0xf0)
{
- unsigned char c = (unsigned char) p[0];
-
- if (c >= 0xa1 && c < 0xff)
+ if (m == 1)
goto incomplete;
- }
- goto invalid;
- }
-
- case enc_euctw: /* EUC-TW */
- {
- if (m == 1)
- {
- unsigned char c = (unsigned char) p[0];
+ else
+ {
+ unsigned char c2 = (unsigned char) p[1];
- if ((c >= 0xa1 && c < 0xff) || c == 0x8e)
- goto incomplete;
- }
- else /* m == 2 || m == 3 */
- {
- unsigned char c = (unsigned char) p[0];
+ if ((c2 ^ 0x80) < 0x40
+ && (c >= 0xe1 || c2 >= 0xa0)
+ && (c != 0xed || c2 < 0xa0))
+ {
+ if (m == 2)
+ goto incomplete;
+ else /* m >= 3 */
+ {
+ unsigned char c3 = (unsigned char) p[2];
- if (c == 0x8e)
- goto incomplete;
+ if ((c3 ^ 0x80) < 0x40)
+ {
+ if (pwc != NULL)
+ *pwc = ((unsigned int) (c & 0x0f) << 12)
+ | ((unsigned int) (c2 ^ 0x80) << 6)
+ | (unsigned int) (c3 ^ 0x80);
+ res = 3;
+ goto success;
+ }
+ }
+ }
+ }
}
- goto invalid;
- }
-
- case enc_gb18030: /* GB18030 */
- {
- if (m == 1)
+ else if (c <= 0xf4)
{
- unsigned char c = (unsigned char) p[0];
-
- if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe))
+ if (m == 1)
goto incomplete;
- }
- else /* m == 2 || m == 3 */
- {
- unsigned char c = (unsigned char) p[0];
-
- if (c >= 0x90 && c <= 0xe3)
+ else
{
unsigned char c2 = (unsigned char) p[1];
- if (c2 >= 0x30 && c2 <= 0x39)
+ if ((c2 ^ 0x80) < 0x40
+ && (c >= 0xf1 || c2 >= 0x90)
+ && (c < 0xf4 || (c == 0xf4 && c2 < 0x90)))
{
if (m == 2)
goto incomplete;
- else /* m == 3 */
+ else
{
unsigned char c3 = (unsigned char) p[2];
- if (c3 >= 0x81 && c3 <= 0xfe)
- goto incomplete;
+ if ((c3 ^ 0x80) < 0x40)
+ {
+ if (m == 3)
+ goto incomplete;
+ else /* m >= 4 */
+ {
+ unsigned char c4 = (unsigned char) p[3];
+
+ if ((c4 ^ 0x80) < 0x40)
+ {
+ if (pwc != NULL)
+ *pwc = ((unsigned int) (c & 0x07) << 18)
+ | ((unsigned int) (c2 ^ 0x80) << 12)
+ | ((unsigned int) (c3 ^ 0x80) << 6)
+ | (unsigned int) (c4 ^ 0x80);
+ res = 4;
+ goto success;
+ }
+ }
+ }
}
}
}
}
- goto invalid;
}
+ goto invalid;
+ }
+ else
+ {
+ /* The hidden internal state of mbtowc would make this function not
+ multi-thread safe. Achieve multi-thread safety through a lock. */
+ gl_lock_lock (mbtowc_lock);
- case enc_sjis: /* SJIS */
- {
- if (m == 1)
- {
- unsigned char c = (unsigned char) p[0];
+ /* Put the hidden internal state of mbtowc into its initial state.
+ This is needed at least with glibc, uClibc, and MSVC CRT.
+ See <https://sourceware.org/bugzilla/show_bug.cgi?id=9674>. */
+ mbtowc (NULL, NULL, 0);
- if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea)
- || (c >= 0xf0 && c <= 0xf9))
- goto incomplete;
- }
- goto invalid;
- }
+ res = mbtowc (pwc, p, m);
- default:
- /* An unknown multibyte encoding. */
- goto incomplete;
- }
+ gl_lock_unlock (mbtowc_lock);
- incomplete:
- {
- size_t k = nstate;
- /* Here 0 <= k < m < 4. */
- pstate[++k] = s[0];
- if (k < m)
+ if (res >= 0)
+ {
+ if (pwc != NULL && ((*pwc == 0) != (res == 0)))
+ abort ();
+ goto success;
+ }
+
+ /* mbtowc does not distinguish between invalid and incomplete multibyte
+ sequences. But mbrtowc needs to make this distinction.
+ There are two possible approaches:
+ - Use iconv() and its return value.
+ - Use built-in knowledge about the possible encodings.
+ Given the low quality of implementation of iconv() on the systems
+ that lack mbrtowc(), we use the second approach.
+ The possible encodings are:
+ - 8-bit encodings,
+ - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS,
+ - UTF-8 (already handled above).
+ Use specialized code for each. */
+ if (m >= 4 || m >= MB_CUR_MAX)
+ goto invalid;
+ /* Here MB_CUR_MAX > 1 and 0 < m < 4. */
+ switch (enc)
{
- pstate[++k] = s[1];
- if (k < m)
- pstate[++k] = s[2];
+ /* As a reference for this code, you can use the GNU libiconv
+ implementation. Look for uses of the RET_TOOFEW macro. */
+
+ case enc_eucjp: /* EUC-JP */
+ {
+ if (m == 1)
+ {
+ unsigned char c = (unsigned char) p[0];
+
+ if ((c >= 0xa1 && c < 0xff) || c == 0x8e || c == 0x8f)
+ goto incomplete;
+ }
+ if (m == 2)
+ {
+ unsigned char c = (unsigned char) p[0];
+
+ if (c == 0x8f)
+ {
+ unsigned char c2 = (unsigned char) p[1];
+
+ if (c2 >= 0xa1 && c2 < 0xff)
+ goto incomplete;
+ }
+ }
+ goto invalid;
+ }
+
+ case enc_94: /* EUC-KR, GB2312, BIG5 */
+ {
+ if (m == 1)
+ {
+ unsigned char c = (unsigned char) p[0];
+
+ if (c >= 0xa1 && c < 0xff)
+ goto incomplete;
+ }
+ goto invalid;
+ }
+
+ case enc_euctw: /* EUC-TW */
+ {
+ if (m == 1)
+ {
+ unsigned char c = (unsigned char) p[0];
+
+ if ((c >= 0xa1 && c < 0xff) || c == 0x8e)
+ goto incomplete;
+ }
+ else /* m == 2 || m == 3 */
+ {
+ unsigned char c = (unsigned char) p[0];
+
+ if (c == 0x8e)
+ goto incomplete;
+ }
+ goto invalid;
+ }
+
+ case enc_gb18030: /* GB18030 */
+ {
+ if (m == 1)
+ {
+ unsigned char c = (unsigned char) p[0];
+
+ if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe))
+ goto incomplete;
+ }
+ else /* m == 2 || m == 3 */
+ {
+ unsigned char c = (unsigned char) p[0];
+
+ if (c >= 0x90 && c <= 0xe3)
+ {
+ unsigned char c2 = (unsigned char) p[1];
+
+ if (c2 >= 0x30 && c2 <= 0x39)
+ {
+ if (m == 2)
+ goto incomplete;
+ else /* m == 3 */
+ {
+ unsigned char c3 = (unsigned char) p[2];
+
+ if (c3 >= 0x81 && c3 <= 0xfe)
+ goto incomplete;
+ }
+ }
+ }
+ }
+ goto invalid;
+ }
+
+ case enc_sjis: /* SJIS */
+ {
+ if (m == 1)
+ {
+ unsigned char c = (unsigned char) p[0];
+
+ if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea)
+ || (c >= 0xf0 && c <= 0xf9))
+ goto incomplete;
+ }
+ goto invalid;
+ }
+
+ default:
+ /* An unknown multibyte encoding. */
+ goto incomplete;
}
- if (k != m)
- abort ();
}
- pstate[0] = m;
- return (size_t)(-2);
- invalid:
- errno = EILSEQ;
- /* The conversion state is undefined, says POSIX. */
- return (size_t)(-1);
+ success:
+ /* res >= 0 is the corrected return value of mbtowc (pwc, p, m). */
+ if (nstate >= (res > 0 ? res : 1))
+ abort ();
+ res -= nstate;
+ pstate[0] = 0;
+ return res;
+
+ incomplete:
+ {
+ size_t k = nstate;
+ /* Here 0 <= k < m < 4. */
+ pstate[++k] = s[0];
+ if (k < m)
+ {
+ pstate[++k] = s[1];
+ if (k < m)
+ pstate[++k] = s[2];
+ }
+ if (k != m)
+ abort ();
}
+ pstate[0] = m;
+ return (size_t)(-2);
+
+ invalid:
+ errno = EILSEQ;
+ /* The conversion state is undefined, says POSIX. */
+ return (size_t)(-1);
}
}
diff --git a/macros/texinfo/texinfo/gnulib/lib/mbsstr.c b/macros/texinfo/texinfo/gnulib/lib/mbsstr.c
index 46bfdc6306..4aaebfe82c 100644
--- a/macros/texinfo/texinfo/gnulib/lib/mbsstr.c
+++ b/macros/texinfo/texinfo/gnulib/lib/mbsstr.c
@@ -22,6 +22,7 @@
#include <stdbool.h>
#include <stddef.h> /* for NULL, in case a nonstandard string.h lacks it */
+#include <stdlib.h>
#include "malloca.h"
#include "mbuiter.h"
diff --git a/macros/texinfo/texinfo/gnulib/lib/memchr.valgrind b/macros/texinfo/texinfo/gnulib/lib/memchr.valgrind
index 60f247e10d..1d60e29bac 100644
--- a/macros/texinfo/texinfo/gnulib/lib/memchr.valgrind
+++ b/macros/texinfo/texinfo/gnulib/lib/memchr.valgrind
@@ -1,4 +1,20 @@
# Suppress a valgrind message about use of uninitialized memory in memchr().
+
+# Copyright (C) 2009-2019 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
# POSIX states that when the character is found, memchr must not read extra
# bytes in an overestimated length (for example, where memchr is used to
# implement strnlen). However, we use a safe word read to provide a speedup.
diff --git a/macros/texinfo/texinfo/gnulib/lib/msvc-inval.h b/macros/texinfo/texinfo/gnulib/lib/msvc-inval.h
index e31cf65091..9d3aa1f7a1 100644
--- a/macros/texinfo/texinfo/gnulib/lib/msvc-inval.h
+++ b/macros/texinfo/texinfo/gnulib/lib/msvc-inval.h
@@ -95,7 +95,7 @@ extern void gl_msvc_inval_ensure_handler (void);
/* Gnulib can define its own status codes, as described in the page
"Raising Software Exceptions" on microsoft.com
- <https://msdn.microsoft.com/en-us/library/het71c37.aspx>.
+ <https://docs.microsoft.com/en-us/cpp/cpp/raising-software-exceptions>.
Our status codes are composed of
- 0xE0000000, mandatory for all user-defined status codes,
- 0x474E550, a API identifier ("GNU"),
@@ -106,7 +106,7 @@ extern void gl_msvc_inval_ensure_handler (void);
# if defined _MSC_VER
/* A compiler that supports __try/__except, as described in the page
"try-except statement" on microsoft.com
- <https://msdn.microsoft.com/en-us/library/s58ftw19.aspx>.
+ <https://docs.microsoft.com/en-us/cpp/cpp/try-except-statement>.
With __try/__except, we can use the multithread-safe exception handling. */
# ifdef __cplusplus
diff --git a/macros/texinfo/texinfo/gnulib/lib/nl_langinfo.c b/macros/texinfo/texinfo/gnulib/lib/nl_langinfo.c
index e8a5595aee..76579a8ad4 100644
--- a/macros/texinfo/texinfo/gnulib/lib/nl_langinfo.c
+++ b/macros/texinfo/texinfo/gnulib/lib/nl_langinfo.c
@@ -76,9 +76,15 @@ ctype_codeset (void)
memmove (buf + 2, codeset, codesetlen + 1);
else
sprintf (buf + 2, "%u", GetACP ());
- codeset = memcpy (buf, "CP", 2);
-# endif
+ /* For a locale name such as "French_France.65001", in Windows 10,
+ setlocale now returns "French_France.utf8" instead. */
+ if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0)
+ return "UTF-8";
+ else
+ return memcpy (buf, "CP", 2);
+# else
return codeset;
+#endif
}
#endif
diff --git a/macros/texinfo/texinfo/gnulib/lib/regcomp.c b/macros/texinfo/texinfo/gnulib/lib/regcomp.c
index 10a0a49d97..892139a02a 100644
--- a/macros/texinfo/texinfo/gnulib/lib/regcomp.c
+++ b/macros/texinfo/texinfo/gnulib/lib/regcomp.c
@@ -1800,8 +1800,8 @@ peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
token->word_char = 0;
#ifdef RE_ENABLE_I18N
token->mb_partial = 0;
- if (input->mb_cur_max > 1 &&
- !re_string_first_byte (input, re_string_cur_idx (input)))
+ if (input->mb_cur_max > 1
+ && !re_string_first_byte (input, re_string_cur_idx (input)))
{
token->type = CHARACTER;
token->mb_partial = 1;
@@ -1988,8 +1988,8 @@ peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
token->type = OP_PERIOD;
break;
case '^':
- if (!(syntax & (RE_CONTEXT_INDEP_ANCHORS | RE_CARET_ANCHORS_HERE)) &&
- re_string_cur_idx (input) != 0)
+ if (!(syntax & (RE_CONTEXT_INDEP_ANCHORS | RE_CARET_ANCHORS_HERE))
+ && re_string_cur_idx (input) != 0)
{
char prev = re_string_peek_byte (input, -1);
if (!(syntax & RE_NEWLINE_ALT) || prev != '\n')
@@ -1999,8 +1999,8 @@ peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
token->opr.ctx_type = LINE_FIRST;
break;
case '$':
- if (!(syntax & RE_CONTEXT_INDEP_ANCHORS) &&
- re_string_cur_idx (input) + 1 != re_string_length (input))
+ if (!(syntax & RE_CONTEXT_INDEP_ANCHORS)
+ && re_string_cur_idx (input) + 1 != re_string_length (input))
{
re_token_t next;
re_string_skip_bytes (input, 1);
@@ -2034,8 +2034,8 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
token->opr.c = c;
#ifdef RE_ENABLE_I18N
- if (input->mb_cur_max > 1 &&
- !re_string_first_byte (input, re_string_cur_idx (input)))
+ if (input->mb_cur_max > 1
+ && !re_string_first_byte (input, re_string_cur_idx (input)))
{
token->type = CHARACTER;
return 1;
@@ -2333,8 +2333,8 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
}
FALLTHROUGH;
case OP_CLOSE_SUBEXP:
- if ((token->type == OP_CLOSE_SUBEXP) &&
- !(syntax & RE_UNMATCHED_RIGHT_PAREN_ORD))
+ if ((token->type == OP_CLOSE_SUBEXP)
+ && !(syntax & RE_UNMATCHED_RIGHT_PAREN_ORD))
{
*err = REG_ERPAREN;
return NULL;
diff --git a/macros/texinfo/texinfo/gnulib/lib/regexec.c b/macros/texinfo/texinfo/gnulib/lib/regexec.c
index 21cf7915f7..f464869fb0 100644
--- a/macros/texinfo/texinfo/gnulib/lib/regexec.c
+++ b/macros/texinfo/texinfo/gnulib/lib/regexec.c
@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
else if (naccepted)
{
char *buf = (char *) re_string_get_buffer (&mctx->input);
- if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
- naccepted) != 0)
+ if (mctx->input.valid_len - *pidx < naccepted
+ || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
+ naccepted)
+ != 0))
return -1;
}
}
@@ -2202,12 +2204,12 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
int naccepted;
/* Check the node can accept "multi byte". */
naccepted = check_node_accept_bytes (dfa, node_idx, &mctx->input, str_idx);
- if (naccepted > 0 && str_idx + naccepted <= max_str_idx &&
- !STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + naccepted],
- dfa->nexts[node_idx]))
+ if (naccepted > 0 && str_idx + naccepted <= max_str_idx
+ && !STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + naccepted],
+ dfa->nexts[node_idx]))
/* The node can't accept the "multi byte", or the
destination was already thrown away, then the node
- could't accept the current input "multi byte". */
+ couldn't accept the current input "multi byte". */
naccepted = 0;
/* Otherwise, it is sure that the node could accept
'naccepted' bytes input. */
@@ -3780,10 +3782,10 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
/* FIXME: I don't think this if is needed, as both '\n'
and '\0' are char_len == 1. */
/* '.' accepts any one character except the following two cases. */
- if ((!(dfa->syntax & RE_DOT_NEWLINE) &&
- re_string_byte_at (input, str_idx) == '\n') ||
- ((dfa->syntax & RE_DOT_NOT_NULL) &&
- re_string_byte_at (input, str_idx) == '\0'))
+ if ((!(dfa->syntax & RE_DOT_NEWLINE)
+ && re_string_byte_at (input, str_idx) == '\n')
+ || ((dfa->syntax & RE_DOT_NOT_NULL)
+ && re_string_byte_at (input, str_idx) == '\0'))
return 0;
return char_len;
}
diff --git a/macros/texinfo/texinfo/gnulib/lib/stdio.in.h b/macros/texinfo/texinfo/gnulib/lib/stdio.in.h
index acf29c4be0..4a8aa55528 100644
--- a/macros/texinfo/texinfo/gnulib/lib/stdio.in.h
+++ b/macros/texinfo/texinfo/gnulib/lib/stdio.in.h
@@ -118,6 +118,13 @@
# include <unistd.h>
#endif
+/* Android 4.3 declares renameat in <sys/stat.h>, not in <stdio.h>. */
+/* But in any case avoid namespace pollution on glibc systems. */
+#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __ANDROID__ \
+ && ! defined __GLIBC__
+# include <sys/stat.h>
+#endif
+
/* MSVC declares 'perror' in <stdlib.h>, not in <stdio.h>. We must include
it before we #define perror rpl_perror. */
/* But in any case avoid namespace pollution on glibc systems. */
diff --git a/macros/texinfo/texinfo/gnulib/lib/stdlib.in.h b/macros/texinfo/texinfo/gnulib/lib/stdlib.in.h
index d80d7ec6b0..f829525c10 100644
--- a/macros/texinfo/texinfo/gnulib/lib/stdlib.in.h
+++ b/macros/texinfo/texinfo/gnulib/lib/stdlib.in.h
@@ -306,9 +306,18 @@ _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
_GL_FUNCDECL_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
_GL_CXXALIAS_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
# else
+# if !@HAVE_MBTOWC@
+_GL_FUNCDECL_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
+# endif
_GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n));
# endif
_GL_CXXALIASWARN (mbtowc);
+#elif defined GNULIB_POSIXCHECK
+# undef mbtowc
+# if HAVE_RAW_DECL_MBTOWC
+_GL_WARN_ON_USE (mbtowc, "mbtowc is not portable - "
+ "use gnulib module mbtowc for portability");
+# endif
#endif
#if @GNULIB_MKDTEMP@
@@ -573,10 +582,19 @@ _GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - "
#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
+# if @REPLACE_RANDOM@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef random
+# define random rpl_random
+# endif
+_GL_FUNCDECL_RPL (random, long, (void));
+_GL_CXXALIAS_RPL (random, long, (void));
+# else
+# if !@HAVE_RANDOM@
_GL_FUNCDECL_SYS (random, long, (void));
-# endif
+# endif
_GL_CXXALIAS_SYS (random, long, (void));
+# endif
_GL_CXXALIASWARN (random);
#elif defined GNULIB_POSIXCHECK
# undef random
@@ -587,10 +605,19 @@ _GL_WARN_ON_USE (random, "random is unportable - "
#endif
#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@
+# if @REPLACE_RANDOM@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef srandom
+# define srandom rpl_srandom
+# endif
+_GL_FUNCDECL_RPL (srandom, void, (unsigned int seed));
+_GL_CXXALIAS_RPL (srandom, void, (unsigned int seed));
+# else
+# if !@HAVE_RANDOM@
_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
-# endif
+# endif
_GL_CXXALIAS_SYS (srandom, void, (unsigned int seed));
+# endif
_GL_CXXALIASWARN (srandom);
#elif defined GNULIB_POSIXCHECK
# undef srandom
@@ -601,31 +628,52 @@ _GL_WARN_ON_USE (srandom, "srandom is unportable - "
#endif
#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@ || !@HAVE_DECL_INITSTATE@
+# if @REPLACE_INITSTATE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef initstate
+# define initstate rpl_initstate
+# endif
+_GL_FUNCDECL_RPL (initstate, char *,
+ (unsigned int seed, char *buf, size_t buf_size)
+ _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (initstate, char *,
+ (unsigned int seed, char *buf, size_t buf_size));
+# else
+# if !@HAVE_INITSTATE@ || !@HAVE_DECL_INITSTATE@
_GL_FUNCDECL_SYS (initstate, char *,
(unsigned int seed, char *buf, size_t buf_size)
_GL_ARG_NONNULL ((2)));
-# endif
+# endif
_GL_CXXALIAS_SYS (initstate, char *,
(unsigned int seed, char *buf, size_t buf_size));
+# endif
_GL_CXXALIASWARN (initstate);
#elif defined GNULIB_POSIXCHECK
# undef initstate
-# if HAVE_RAW_DECL_INITSTATE_R
+# if HAVE_RAW_DECL_INITSTATE
_GL_WARN_ON_USE (initstate, "initstate is unportable - "
"use gnulib module random for portability");
# endif
#endif
#if @GNULIB_RANDOM@
-# if !@HAVE_RANDOM@ || !@HAVE_DECL_SETSTATE@
+# if @REPLACE_SETSTATE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef setstate
+# define setstate rpl_setstate
+# endif
+_GL_FUNCDECL_RPL (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (setstate, char *, (char *arg_state));
+# else
+# if !@HAVE_SETSTATE@ || !@HAVE_DECL_SETSTATE@
_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
-# endif
+# endif
_GL_CXXALIAS_SYS (setstate, char *, (char *arg_state));
+# endif
_GL_CXXALIASWARN (setstate);
#elif defined GNULIB_POSIXCHECK
# undef setstate
-# if HAVE_RAW_DECL_SETSTATE_R
+# if HAVE_RAW_DECL_SETSTATE
_GL_WARN_ON_USE (setstate, "setstate is unportable - "
"use gnulib module random for portability");
# endif
@@ -881,6 +929,7 @@ _GL_WARN_ON_USE (setenv, "setenv is unportable - "
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# define strtod rpl_strtod
# endif
+# define GNULIB_defined_strtod_function 1
_GL_FUNCDECL_RPL (strtod, double, (const char *str, char **endp)
_GL_ARG_NONNULL ((1)));
_GL_CXXALIAS_RPL (strtod, double, (const char *str, char **endp));
@@ -900,6 +949,32 @@ _GL_WARN_ON_USE (strtod, "strtod is unportable - "
# endif
#endif
+#if @GNULIB_STRTOLD@
+ /* Parse a 'long double' from STRING, updating ENDP if appropriate. */
+# if @REPLACE_STRTOLD@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define strtold rpl_strtold
+# endif
+# define GNULIB_defined_strtold_function 1
+_GL_FUNCDECL_RPL (strtold, long double, (const char *str, char **endp)
+ _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (strtold, long double, (const char *str, char **endp));
+# else
+# if !@HAVE_STRTOLD@
+_GL_FUNCDECL_SYS (strtold, long double, (const char *str, char **endp)
+ _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (strtold, long double, (const char *str, char **endp));
+# endif
+_GL_CXXALIASWARN (strtold);
+#elif defined GNULIB_POSIXCHECK
+# undef strtold
+# if HAVE_RAW_DECL_STRTOLD
+_GL_WARN_ON_USE (strtold, "strtold is unportable - "
+ "use gnulib module strtold for portability");
+# endif
+#endif
+
#if @GNULIB_STRTOLL@
/* Parse a signed integer whose textual representation starts at STRING.
The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0,
diff --git a/macros/texinfo/texinfo/gnulib/lib/str-two-way.h b/macros/texinfo/texinfo/gnulib/lib/str-two-way.h
index 9155e6b560..7078c34bdc 100644
--- a/macros/texinfo/texinfo/gnulib/lib/str-two-way.h
+++ b/macros/texinfo/texinfo/gnulib/lib/str-two-way.h
@@ -18,7 +18,7 @@
/* Before including this file, you need to include <config.h> and
<string.h>, and define:
- RESULT_TYPE A macro that expands to the return type.
+ RETURN_TYPE A macro that expands to the return type.
AVAILABLE(h, h_l, j, n_l)
A macro that returns nonzero if there are
at least N_L bytes left starting at H[J].
diff --git a/macros/texinfo/texinfo/gnulib/lib/unistd.in.h b/macros/texinfo/texinfo/gnulib/lib/unistd.in.h
index a10ca28a53..59ee39ecea 100644
--- a/macros/texinfo/texinfo/gnulib/lib/unistd.in.h
+++ b/macros/texinfo/texinfo/gnulib/lib/unistd.in.h
@@ -52,7 +52,10 @@
#define _@GUARD_PREFIX@_UNISTD_H
/* NetBSD 5.0 mis-defines NULL. Also get size_t. */
-#include <stddef.h>
+/* But avoid namespace pollution on glibc systems. */
+#ifndef __GLIBC__
+# include <stddef.h>
+#endif
/* mingw doesn't define the SEEK_* or *_FILENO macros in <unistd.h>. */
/* MSVC declares 'unlink' in <stdio.h>, not in <unistd.h>. We must include
@@ -68,9 +71,11 @@
# include <stdio.h>
#endif
-/* Cygwin 1.7.1 declares unlinkat in <fcntl.h>, not in <unistd.h>. */
+/* Cygwin 1.7.1 and Android 4.3 declare unlinkat in <fcntl.h>, not in
+ <unistd.h>. */
/* But avoid namespace pollution on glibc systems. */
-#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \
+#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) \
+ && (defined __CYGWIN__ || defined __ANDROID__) \
&& ! defined __GLIBC__
# include <fcntl.h>
#endif
@@ -113,17 +118,18 @@
# include <netdb.h>
#endif
-/* MSVC defines off_t in <sys/types.h>.
- May also define off_t to a 64-bit type on native Windows. */
-#if !@HAVE_UNISTD_H@ || @WINDOWS_64_BIT_OFF_T@
-/* Get off_t. */
-# include <sys/types.h>
+/* Android 4.3 declares fchownat in <sys/stat.h>, not in <unistd.h>. */
+/* But avoid namespace pollution on glibc systems. */
+#if (@GNULIB_FCHOWNAT@ || defined GNULIB_POSIXCHECK) && defined __ANDROID__ \
+ && !defined __GLIBC__
+# include <sys/stat.h>
#endif
-#if (@GNULIB_READ@ || @GNULIB_WRITE@ \
- || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \
- || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK)
-/* Get ssize_t. */
+/* MSVC defines off_t in <sys/types.h>.
+ May also define off_t to a 64-bit type on native Windows. */
+/* But avoid namespace pollution on glibc systems. */
+#ifndef __GLIBC__
+/* Get off_t, ssize_t. */
# include <sys/types.h>
#endif
@@ -322,6 +328,24 @@ _GL_WARN_ON_USE (close, "close does not portably work on sockets - "
#endif
+#if @GNULIB_COPY_FILE_RANGE@
+# if !@HAVE_COPY_FILE_RANGE@
+_GL_FUNCDECL_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos,
+ int ofd, off_t *opos,
+ size_t len, unsigned flags));
+_GL_CXXALIAS_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos,
+ int ofd, off_t *opos,
+ size_t len, unsigned flags));
+# endif
+_GL_CXXALIASWARN (copy_file_range);
+#elif defined GNULIB_POSIXCHECK
+/* Assume copy_file_range is always declared. */
+_GL_WARN_ON_USE (copy_file_range,
+ "copy_file_range is unportable - "
+ "use gnulib module copy_file_range for portability");
+#endif
+
+
#if @GNULIB_DUP@
# if @REPLACE_DUP@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/macros/texinfo/texinfo/gnulib/lib/vasnprintf.c b/macros/texinfo/texinfo/gnulib/lib/vasnprintf.c
index c475903726..b3854e3ef9 100644
--- a/macros/texinfo/texinfo/gnulib/lib/vasnprintf.c
+++ b/macros/texinfo/texinfo/gnulib/lib/vasnprintf.c
@@ -4874,6 +4874,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
&& !defined __UCLIBC__) \
|| (defined __APPLE__ && defined __MACH__) \
+ || defined __ANDROID__ \
|| (defined _WIN32 && ! defined __CYGWIN__))
fbp[1] = '%';
fbp[2] = 'n';
@@ -4895,6 +4896,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
On Mac OS X 10.13 or newer, the use of %n in format strings
in writable memory by default crashes the program, so we
should avoid it in this situation. */
+ /* On Android, we know that snprintf's return value conforms to
+ ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 and
+ gl_SNPRINTF_TRUNCATION_C99 pass.
+ Therefore we can avoid using %n in this situation.
+ Starting on 2018-03-07, the use of %n in format strings
+ produces a fatal error (see
+ <https://android.googlesource.com/platform/bionic/+/41398d03b7e8e0dfb951660ae713e682e9fc0336>),
+ so we should avoid it. */
/* On native Windows systems (such as mingw), we can avoid using
%n because:
- Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
@@ -4908,7 +4917,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
Windows Vista, the use of %n in format strings by default
crashes the program. See
<https://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
- <https://msdn.microsoft.com/en-us/library/ms175782.aspx>
+ <https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/set-printf-count-output>
So we should avoid %n in this situation. */
fbp[1] = '\0';
# endif
diff --git a/macros/texinfo/texinfo/gnulib/lib/verify.h b/macros/texinfo/texinfo/gnulib/lib/verify.h
index b2e5f6446e..afdc1ad81f 100644
--- a/macros/texinfo/texinfo/gnulib/lib/verify.h
+++ b/macros/texinfo/texinfo/gnulib/lib/verify.h
@@ -21,31 +21,37 @@
#define _GL_VERIFY_H
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
- This is supported by GCC 4.6.0 and later, in C mode, and its use
- here generates easier-to-read diagnostics when verify (R) fails.
-
- Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
- This will likely be supported by future GCC versions, in C++ mode.
-
- Use this only with GCC. If we were willing to slow 'configure'
- down we could also use it with other compilers, but since this
- affects only the quality of diagnostics, why bother? */
-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
- && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \
- && !defined __cplusplus)
-# define _GL_HAVE__STATIC_ASSERT 1
-#endif
-/* The condition (99 < __GNUC__) is temporary, until we know about the
- first G++ release that supports static_assert. */
-#if (99 < __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
+/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert (R, DIAGNOSTIC)
+ works as per C11. This is supported by GCC 4.6.0 and later, in C
+ mode.
+
+ Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as
+ per C2X, and define _GL_HAVE_STATIC_ASSERT1 if static_assert (R)
+ works as per C++17. This is supported by GCC 9.1 and later.
+
+ Support compilers claiming conformance to the relevant standard,
+ and also support GCC when not pedantic. If we were willing to slow
+ 'configure' down we could also use it with other compilers, but
+ since this affects only the quality of diagnostics, why bother? */
+#ifndef __cplusplus
+# if (201112L <= __STDC_VERSION__ \
+ || (!defined __STRICT_ANSI__ && 4 < __GNUC__ + (6 <= __GNUC_MINOR__)))
+# define _GL_HAVE__STATIC_ASSERT 1
+# endif
+# if (202000L <= __STDC_VERSION__ \
+ || (!defined __STRICT_ANSI__ && 9 <= __GNUC__))
+# define _GL_HAVE__STATIC_ASSERT1 1
+# endif
+#else
+# if 201703L <= __cplusplus || 9 <= __GNUC__
+# define _GL_HAVE_STATIC_ASSERT1 1
+# endif
#endif
/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
system headers, defines a conflicting _Static_assert that is no
better than ours; override it. */
-#ifndef _GL_HAVE_STATIC_ASSERT
+#ifndef _GL_HAVE__STATIC_ASSERT
# include <stddef.h>
# undef _Static_assert
#endif
@@ -143,9 +149,9 @@
which do not support _Static_assert, also do not warn about the
last declaration mentioned above.
- * GCC warns if -Wnested-externs is enabled and verify() is used
+ * GCC warns if -Wnested-externs is enabled and 'verify' is used
within a function body; but inside a function, you can always
- arrange to use verify_expr() instead.
+ arrange to use verify_expr instead.
* In C++, any struct definition inside sizeof is invalid.
Use a template type to work around the problem. */
@@ -197,26 +203,30 @@ template <int w>
#endif
/* Verify requirement R at compile-time, as a declaration without a
- trailing ';'. If R is false, fail at compile-time, preferably
- with a diagnostic that includes the string-literal DIAGNOSTIC.
+ trailing ';'. If R is false, fail at compile-time.
+
+ This macro requires three or more arguments but uses at most the first
+ two, so that the _Static_assert macro optionally defined below supports
+ both the C11 two-argument syntax and the C2X one-argument syntax.
Unfortunately, unlike C11, this implementation must appear as an
ordinary declaration, and cannot appear inside struct { ... }. */
-#ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
+#if defined _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC)
#else
-# define _GL_VERIFY(R, DIAGNOSTIC) \
+# define _GL_VERIFY(R, DIAGNOSTIC, ...) \
extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
[_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
#endif
/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */
#ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
+# if !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert
+# define _Static_assert(...) \
+ _GL_VERIFY (__VA_ARGS__, "static assertion failed", -)
# endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
+# if !defined _GL_HAVE_STATIC_ASSERT1 && !defined static_assert
# define static_assert _Static_assert /* C11 requires this #define. */
# endif
#endif
@@ -228,17 +238,10 @@ template <int w>
assert (R), there is no run-time overhead.
There are two macros, since no single macro can be used in all
- contexts in C. verify_true (R) is for scalar contexts, including
+ contexts in C. verify_expr (R, E) is for scalar contexts, including
integer constant expression contexts. verify (R) is for declaration
contexts, e.g., the top level. */
-/* Verify requirement R at compile-time, as an integer constant expression.
- Return 1. This is equivalent to verify_expr (R, 1).
-
- verify_true is obsolescent; please use verify_expr instead. */
-
-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
-
/* Verify requirement R at compile-time. Return the value of the
expression E. */
@@ -246,22 +249,26 @@ template <int w>
(_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
/* Verify requirement R at compile-time, as a declaration without a
- trailing ';'. */
+ trailing ';'. verify (R) acts like static_assert (R) except that
+ it is portable to C11/C++14 and earlier, it can issue better
+ diagnostics, and its name is shorter and may be more convenient. */
-#ifdef __GNUC__
-# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+#ifdef __PGI
+/* PGI barfs if R is long. */
+# define verify(R) _GL_VERIFY (R, "verify (...)", -)
#else
-/* PGI barfs if R is long. Play it safe. */
-# define verify(R) _GL_VERIFY (R, "verify (...)")
+# define verify(R) _GL_VERIFY (R, "verify (" #R ")", -)
#endif
#ifndef __has_builtin
# define __has_builtin(x) 0
#endif
-/* Assume that R always holds. This lets the compiler optimize
- accordingly. R should not have side-effects; it may or may not be
- evaluated. Behavior is undefined if R is false. */
+/* Assume that R always holds. Behavior is undefined if R is false,
+ fails to evaluate, or has side effects. Although assuming R can
+ help a compiler generate better code or diagnostics, performance
+ can suffer if R uses hard-to-optimize features such as function
+ calls not inlined by the compiler. */
#if (__has_builtin (__builtin_unreachable) \
|| 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
diff --git a/macros/texinfo/texinfo/gnulib/lib/wcrtomb.c b/macros/texinfo/texinfo/gnulib/lib/wcrtomb.c
index 9fc40cfc9e..8e56732bd4 100644
--- a/macros/texinfo/texinfo/gnulib/lib/wcrtomb.c
+++ b/macros/texinfo/texinfo/gnulib/lib/wcrtomb.c
@@ -27,8 +27,8 @@
size_t
wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
{
- /* This implementation of wcrtomb on top of wctomb() supports only
- stateless encodings. ps must be in the initial state. */
+ /* This implementation of wcrtomb supports only stateless encodings.
+ ps must be in the initial state. */
if (ps != NULL && !mbsinit (ps))
{
errno = EINVAL;
@@ -40,10 +40,21 @@ wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
return 1;
else
{
+#if defined __ANDROID__
+ /* Implement consistently with mbrtowc(): through a 1:1 correspondence,
+ as in ISO-8859-1. */
+ if (wc >= 0 && wc <= 0xff)
+ {
+ *s = (unsigned char) wc;
+ return 1;
+ }
+#else
+ /* Implement on top of wctomb(). */
int ret = wctomb (s, wc);
if (ret >= 0)
return ret;
+#endif
else
{
errno = EILSEQ;
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-initguard.h b/macros/texinfo/texinfo/gnulib/lib/windows-initguard.h
new file mode 100644
index 0000000000..8aefd0b0ff
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-initguard.h
@@ -0,0 +1,35 @@
+/* Init guards, somewhat like spinlocks (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#ifndef _WINDOWS_INITGUARD_H
+#define _WINDOWS_INITGUARD_H
+
+#define WIN32_LEAN_AND_MEAN /* avoid including junk */
+#include <windows.h>
+
+typedef struct
+ {
+ volatile int done;
+ volatile LONG started;
+ }
+ glwthread_initguard_t;
+
+#define GLWTHREAD_INITGUARD_INIT { 0, -1 }
+
+#endif /* _WINDOWS_INITGUARD_H */
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-mutex.c b/macros/texinfo/texinfo/gnulib/lib/windows-mutex.c
new file mode 100644
index 0000000000..94338816ef
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-mutex.c
@@ -0,0 +1,95 @@
+/* Plain mutexes (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#include <config.h>
+
+/* Specification. */
+#include "windows-mutex.h"
+
+#include <errno.h>
+
+void
+glwthread_mutex_init (glwthread_mutex_t *mutex)
+{
+ InitializeCriticalSection (&mutex->lock);
+ mutex->guard.done = 1;
+}
+
+int
+glwthread_mutex_lock (glwthread_mutex_t *mutex)
+{
+ if (!mutex->guard.done)
+ {
+ if (InterlockedIncrement (&mutex->guard.started) == 0)
+ /* This thread is the first one to need this mutex. Initialize it. */
+ glwthread_mutex_init (mutex);
+ else
+ {
+ /* Don't let mutex->guard.started grow and wrap around. */
+ InterlockedDecrement (&mutex->guard.started);
+ /* Yield the CPU while waiting for another thread to finish
+ initializing this mutex. */
+ while (!mutex->guard.done)
+ Sleep (0);
+ }
+ }
+ EnterCriticalSection (&mutex->lock);
+ return 0;
+}
+
+int
+glwthread_mutex_trylock (glwthread_mutex_t *mutex)
+{
+ if (!mutex->guard.done)
+ {
+ if (InterlockedIncrement (&mutex->guard.started) == 0)
+ /* This thread is the first one to need this mutex. Initialize it. */
+ glwthread_mutex_init (mutex);
+ else
+ {
+ /* Don't let mutex->guard.started grow and wrap around. */
+ InterlockedDecrement (&mutex->guard.started);
+ /* Let another thread finish initializing this mutex, and let it also
+ lock this mutex. */
+ return EBUSY;
+ }
+ }
+ if (!TryEnterCriticalSection (&mutex->lock))
+ return EBUSY;
+ return 0;
+}
+
+int
+glwthread_mutex_unlock (glwthread_mutex_t *mutex)
+{
+ if (!mutex->guard.done)
+ return EINVAL;
+ LeaveCriticalSection (&mutex->lock);
+ return 0;
+}
+
+int
+glwthread_mutex_destroy (glwthread_mutex_t *mutex)
+{
+ if (!mutex->guard.done)
+ return EINVAL;
+ DeleteCriticalSection (&mutex->lock);
+ mutex->guard.done = 0;
+ return 0;
+}
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-mutex.h b/macros/texinfo/texinfo/gnulib/lib/windows-mutex.h
new file mode 100644
index 0000000000..5364f92d07
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-mutex.h
@@ -0,0 +1,51 @@
+/* Plain mutexes (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#ifndef _WINDOWS_MUTEX_H
+#define _WINDOWS_MUTEX_H
+
+#define WIN32_LEAN_AND_MEAN /* avoid including junk */
+#include <windows.h>
+
+#include "windows-initguard.h"
+
+typedef struct
+ {
+ glwthread_initguard_t guard; /* protects the initialization */
+ CRITICAL_SECTION lock;
+ }
+ glwthread_mutex_t;
+
+#define GLWTHREAD_MUTEX_INIT { GLWTHREAD_INITGUARD_INIT }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void glwthread_mutex_init (glwthread_mutex_t *mutex);
+extern int glwthread_mutex_lock (glwthread_mutex_t *mutex);
+extern int glwthread_mutex_trylock (glwthread_mutex_t *mutex);
+extern int glwthread_mutex_unlock (glwthread_mutex_t *mutex);
+extern int glwthread_mutex_destroy (glwthread_mutex_t *mutex);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_MUTEX_H */
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-once.c b/macros/texinfo/texinfo/gnulib/lib/windows-once.c
new file mode 100644
index 0000000000..455c50ef81
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-once.c
@@ -0,0 +1,62 @@
+/* Once-only control (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#include <config.h>
+
+/* Specification. */
+#include "windows-once.h"
+
+#include <stdlib.h>
+
+void
+glwthread_once (glwthread_once_t *once_control, void (*initfunction) (void))
+{
+ if (once_control->inited <= 0)
+ {
+ if (InterlockedIncrement (&once_control->started) == 0)
+ {
+ /* This thread is the first one to come to this once_control. */
+ InitializeCriticalSection (&once_control->lock);
+ EnterCriticalSection (&once_control->lock);
+ once_control->inited = 0;
+ initfunction ();
+ once_control->inited = 1;
+ LeaveCriticalSection (&once_control->lock);
+ }
+ else
+ {
+ /* Don't let once_control->started grow and wrap around. */
+ InterlockedDecrement (&once_control->started);
+ /* Some other thread has already started the initialization.
+ Yield the CPU while waiting for the other thread to finish
+ initializing and taking the lock. */
+ while (once_control->inited < 0)
+ Sleep (0);
+ if (once_control->inited <= 0)
+ {
+ /* Take the lock. This blocks until the other thread has
+ finished calling the initfunction. */
+ EnterCriticalSection (&once_control->lock);
+ LeaveCriticalSection (&once_control->lock);
+ if (!(once_control->inited > 0))
+ abort ();
+ }
+ }
+ }
+}
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-once.h b/macros/texinfo/texinfo/gnulib/lib/windows-once.h
new file mode 100644
index 0000000000..15999839b8
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-once.h
@@ -0,0 +1,47 @@
+/* Once-only control (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#ifndef _WINDOWS_ONCE_H
+#define _WINDOWS_ONCE_H
+
+#define WIN32_LEAN_AND_MEAN /* avoid including junk */
+#include <windows.h>
+
+typedef struct
+ {
+ volatile int inited;
+ volatile LONG started;
+ CRITICAL_SECTION lock;
+ }
+ glwthread_once_t;
+
+#define GLWTHREAD_ONCE_INIT { -1, -1 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void glwthread_once (glwthread_once_t *once_control,
+ void (*initfunction) (void));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_ONCE_H */
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-recmutex.c b/macros/texinfo/texinfo/gnulib/lib/windows-recmutex.c
new file mode 100644
index 0000000000..7e6e44650c
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-recmutex.c
@@ -0,0 +1,127 @@
+/* Plain recursive mutexes (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#include <config.h>
+
+/* Specification. */
+#include "windows-recmutex.h"
+
+#include <errno.h>
+
+void
+glwthread_recmutex_init (glwthread_recmutex_t *mutex)
+{
+ mutex->owner = 0;
+ mutex->depth = 0;
+ InitializeCriticalSection (&mutex->lock);
+ mutex->guard.done = 1;
+}
+
+int
+glwthread_recmutex_lock (glwthread_recmutex_t *mutex)
+{
+ if (!mutex->guard.done)
+ {
+ if (InterlockedIncrement (&mutex->guard.started) == 0)
+ /* This thread is the first one to need this mutex. Initialize it. */
+ glwthread_recmutex_init (mutex);
+ else
+ {
+ /* Don't let mutex->guard.started grow and wrap around. */
+ InterlockedDecrement (&mutex->guard.started);
+ /* Yield the CPU while waiting for another thread to finish
+ initializing this mutex. */
+ while (!mutex->guard.done)
+ Sleep (0);
+ }
+ }
+ {
+ DWORD self = GetCurrentThreadId ();
+ if (mutex->owner != self)
+ {
+ EnterCriticalSection (&mutex->lock);
+ mutex->owner = self;
+ }
+ if (++(mutex->depth) == 0) /* wraparound? */
+ {
+ mutex->depth--;
+ return EAGAIN;
+ }
+ }
+ return 0;
+}
+
+int
+glwthread_recmutex_trylock (glwthread_recmutex_t *mutex)
+{
+ if (!mutex->guard.done)
+ {
+ if (InterlockedIncrement (&mutex->guard.started) == 0)
+ /* This thread is the first one to need this mutex. Initialize it. */
+ glwthread_recmutex_init (mutex);
+ else
+ {
+ /* Don't let mutex->guard.started grow and wrap around. */
+ InterlockedDecrement (&mutex->guard.started);
+ /* Let another thread finish initializing this mutex, and let it also
+ lock this mutex. */
+ return EBUSY;
+ }
+ }
+ {
+ DWORD self = GetCurrentThreadId ();
+ if (mutex->owner != self)
+ {
+ if (!TryEnterCriticalSection (&mutex->lock))
+ return EBUSY;
+ mutex->owner = self;
+ }
+ if (++(mutex->depth) == 0) /* wraparound? */
+ {
+ mutex->depth--;
+ return EAGAIN;
+ }
+ }
+ return 0;
+}
+
+int
+glwthread_recmutex_unlock (glwthread_recmutex_t *mutex)
+{
+ if (mutex->owner != GetCurrentThreadId ())
+ return EPERM;
+ if (mutex->depth == 0)
+ return EINVAL;
+ if (--(mutex->depth) == 0)
+ {
+ mutex->owner = 0;
+ LeaveCriticalSection (&mutex->lock);
+ }
+ return 0;
+}
+
+int
+glwthread_recmutex_destroy (glwthread_recmutex_t *mutex)
+{
+ if (mutex->owner != 0)
+ return EBUSY;
+ DeleteCriticalSection (&mutex->lock);
+ mutex->guard.done = 0;
+ return 0;
+}
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-recmutex.h b/macros/texinfo/texinfo/gnulib/lib/windows-recmutex.h
new file mode 100644
index 0000000000..d1431086f9
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-recmutex.h
@@ -0,0 +1,57 @@
+/* Plain recursive mutexes (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#ifndef _WINDOWS_RECMUTEX_H
+#define _WINDOWS_RECMUTEX_H
+
+#define WIN32_LEAN_AND_MEAN /* avoid including junk */
+#include <windows.h>
+
+#include "windows-initguard.h"
+
+/* The native Windows documentation says that CRITICAL_SECTION already
+ implements a recursive lock. But we need not rely on it: It's easy to
+ implement a recursive lock without this assumption. */
+
+typedef struct
+ {
+ glwthread_initguard_t guard; /* protects the initialization */
+ DWORD owner;
+ unsigned long depth;
+ CRITICAL_SECTION lock;
+ }
+ glwthread_recmutex_t;
+
+#define GLWTHREAD_RECMUTEX_INIT { GLWTHREAD_INITGUARD_INIT, 0, 0 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void glwthread_recmutex_init (glwthread_recmutex_t *mutex);
+extern int glwthread_recmutex_lock (glwthread_recmutex_t *mutex);
+extern int glwthread_recmutex_trylock (glwthread_recmutex_t *mutex);
+extern int glwthread_recmutex_unlock (glwthread_recmutex_t *mutex);
+extern int glwthread_recmutex_destroy (glwthread_recmutex_t *mutex);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_RECMUTEX_H */
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-rwlock.c b/macros/texinfo/texinfo/gnulib/lib/windows-rwlock.c
new file mode 100644
index 0000000000..9207d1b997
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-rwlock.c
@@ -0,0 +1,373 @@
+/* Read-write locks (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#include <config.h>
+
+/* Specification. */
+#include "windows-rwlock.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+/* In this file, the waitqueues are implemented as circular arrays. */
+#define glwthread_waitqueue_t glwthread_carray_waitqueue_t
+
+static void
+glwthread_waitqueue_init (glwthread_waitqueue_t *wq)
+{
+ wq->array = NULL;
+ wq->count = 0;
+ wq->alloc = 0;
+ wq->offset = 0;
+}
+
+/* Enqueues the current thread, represented by an event, in a wait queue.
+ Returns INVALID_HANDLE_VALUE if an allocation failure occurs. */
+static HANDLE
+glwthread_waitqueue_add (glwthread_waitqueue_t *wq)
+{
+ HANDLE event;
+ unsigned int index;
+
+ if (wq->count == wq->alloc)
+ {
+ unsigned int new_alloc = 2 * wq->alloc + 1;
+ HANDLE *new_array =
+ (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
+ if (new_array == NULL)
+ /* No more memory. */
+ return INVALID_HANDLE_VALUE;
+ /* Now is a good opportunity to rotate the array so that its contents
+ starts at offset 0. */
+ if (wq->offset > 0)
+ {
+ unsigned int old_count = wq->count;
+ unsigned int old_alloc = wq->alloc;
+ unsigned int old_offset = wq->offset;
+ unsigned int i;
+ if (old_offset + old_count > old_alloc)
+ {
+ unsigned int limit = old_offset + old_count - old_alloc;
+ for (i = 0; i < limit; i++)
+ new_array[old_alloc + i] = new_array[i];
+ }
+ for (i = 0; i < old_count; i++)
+ new_array[i] = new_array[old_offset + i];
+ wq->offset = 0;
+ }
+ wq->array = new_array;
+ wq->alloc = new_alloc;
+ }
+ /* Whether the created event is a manual-reset one or an auto-reset one,
+ does not matter, since we will wait on it only once. */
+ event = CreateEvent (NULL, TRUE, FALSE, NULL);
+ if (event == INVALID_HANDLE_VALUE)
+ /* No way to allocate an event. */
+ return INVALID_HANDLE_VALUE;
+ index = wq->offset + wq->count;
+ if (index >= wq->alloc)
+ index -= wq->alloc;
+ wq->array[index] = event;
+ wq->count++;
+ return event;
+}
+
+/* Notifies the first thread from a wait queue and dequeues it. */
+static void
+glwthread_waitqueue_notify_first (glwthread_waitqueue_t *wq)
+{
+ SetEvent (wq->array[wq->offset + 0]);
+ wq->offset++;
+ wq->count--;
+ if (wq->count == 0 || wq->offset == wq->alloc)
+ wq->offset = 0;
+}
+
+/* Notifies all threads from a wait queue and dequeues them all. */
+static void
+glwthread_waitqueue_notify_all (glwthread_waitqueue_t *wq)
+{
+ unsigned int i;
+
+ for (i = 0; i < wq->count; i++)
+ {
+ unsigned int index = wq->offset + i;
+ if (index >= wq->alloc)
+ index -= wq->alloc;
+ SetEvent (wq->array[index]);
+ }
+ wq->count = 0;
+ wq->offset = 0;
+}
+
+void
+glwthread_rwlock_init (glwthread_rwlock_t *lock)
+{
+ InitializeCriticalSection (&lock->lock);
+ glwthread_waitqueue_init (&lock->waiting_readers);
+ glwthread_waitqueue_init (&lock->waiting_writers);
+ lock->runcount = 0;
+ lock->guard.done = 1;
+}
+
+int
+glwthread_rwlock_rdlock (glwthread_rwlock_t *lock)
+{
+ if (!lock->guard.done)
+ {
+ if (InterlockedIncrement (&lock->guard.started) == 0)
+ /* This thread is the first one to need this lock. Initialize it. */
+ glwthread_rwlock_init (lock);
+ else
+ {
+ /* Don't let lock->guard.started grow and wrap around. */
+ InterlockedDecrement (&lock->guard.started);
+ /* Yield the CPU while waiting for another thread to finish
+ initializing this lock. */
+ while (!lock->guard.done)
+ Sleep (0);
+ }
+ }
+ EnterCriticalSection (&lock->lock);
+ /* Test whether only readers are currently running, and whether the runcount
+ field will not overflow, and whether no writer is waiting. The latter
+ condition is because POSIX recommends that "write locks shall take
+ precedence over read locks", to avoid "writer starvation". */
+ if (!(lock->runcount + 1 > 0 && lock->waiting_writers.count == 0))
+ {
+ /* This thread has to wait for a while. Enqueue it among the
+ waiting_readers. */
+ HANDLE event = glwthread_waitqueue_add (&lock->waiting_readers);
+ if (event != INVALID_HANDLE_VALUE)
+ {
+ DWORD result;
+ LeaveCriticalSection (&lock->lock);
+ /* Wait until another thread signals this event. */
+ result = WaitForSingleObject (event, INFINITE);
+ if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
+ abort ();
+ CloseHandle (event);
+ /* The thread which signalled the event already did the bookkeeping:
+ removed us from the waiting_readers, incremented lock->runcount. */
+ if (!(lock->runcount > 0))
+ abort ();
+ return 0;
+ }
+ else
+ {
+ /* Allocation failure. Weird. */
+ do
+ {
+ LeaveCriticalSection (&lock->lock);
+ Sleep (1);
+ EnterCriticalSection (&lock->lock);
+ }
+ while (!(lock->runcount + 1 > 0));
+ }
+ }
+ lock->runcount++;
+ LeaveCriticalSection (&lock->lock);
+ return 0;
+}
+
+int
+glwthread_rwlock_wrlock (glwthread_rwlock_t *lock)
+{
+ if (!lock->guard.done)
+ {
+ if (InterlockedIncrement (&lock->guard.started) == 0)
+ /* This thread is the first one to need this lock. Initialize it. */
+ glwthread_rwlock_init (lock);
+ else
+ {
+ /* Don't let lock->guard.started grow and wrap around. */
+ InterlockedDecrement (&lock->guard.started);
+ /* Yield the CPU while waiting for another thread to finish
+ initializing this lock. */
+ while (!lock->guard.done)
+ Sleep (0);
+ }
+ }
+ EnterCriticalSection (&lock->lock);
+ /* Test whether no readers or writers are currently running. */
+ if (!(lock->runcount == 0))
+ {
+ /* This thread has to wait for a while. Enqueue it among the
+ waiting_writers. */
+ HANDLE event = glwthread_waitqueue_add (&lock->waiting_writers);
+ if (event != INVALID_HANDLE_VALUE)
+ {
+ DWORD result;
+ LeaveCriticalSection (&lock->lock);
+ /* Wait until another thread signals this event. */
+ result = WaitForSingleObject (event, INFINITE);
+ if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
+ abort ();
+ CloseHandle (event);
+ /* The thread which signalled the event already did the bookkeeping:
+ removed us from the waiting_writers, set lock->runcount = -1. */
+ if (!(lock->runcount == -1))
+ abort ();
+ return 0;
+ }
+ else
+ {
+ /* Allocation failure. Weird. */
+ do
+ {
+ LeaveCriticalSection (&lock->lock);
+ Sleep (1);
+ EnterCriticalSection (&lock->lock);
+ }
+ while (!(lock->runcount == 0));
+ }
+ }
+ lock->runcount--; /* runcount becomes -1 */
+ LeaveCriticalSection (&lock->lock);
+ return 0;
+}
+
+int
+glwthread_rwlock_tryrdlock (glwthread_rwlock_t *lock)
+{
+ if (!lock->guard.done)
+ {
+ if (InterlockedIncrement (&lock->guard.started) == 0)
+ /* This thread is the first one to need this lock. Initialize it. */
+ glwthread_rwlock_init (lock);
+ else
+ {
+ /* Don't let lock->guard.started grow and wrap around. */
+ InterlockedDecrement (&lock->guard.started);
+ /* Yield the CPU while waiting for another thread to finish
+ initializing this lock. */
+ while (!lock->guard.done)
+ Sleep (0);
+ }
+ }
+ /* It's OK to wait for this critical section, because it is never taken for a
+ long time. */
+ EnterCriticalSection (&lock->lock);
+ /* Test whether only readers are currently running, and whether the runcount
+ field will not overflow, and whether no writer is waiting. The latter
+ condition is because POSIX recommends that "write locks shall take
+ precedence over read locks", to avoid "writer starvation". */
+ if (!(lock->runcount + 1 > 0 && lock->waiting_writers.count == 0))
+ {
+ /* This thread would have to wait for a while. Return instead. */
+ LeaveCriticalSection (&lock->lock);
+ return EBUSY;
+ }
+ lock->runcount++;
+ LeaveCriticalSection (&lock->lock);
+ return 0;
+}
+
+int
+glwthread_rwlock_trywrlock (glwthread_rwlock_t *lock)
+{
+ if (!lock->guard.done)
+ {
+ if (InterlockedIncrement (&lock->guard.started) == 0)
+ /* This thread is the first one to need this lock. Initialize it. */
+ glwthread_rwlock_init (lock);
+ else
+ {
+ /* Don't let lock->guard.started grow and wrap around. */
+ InterlockedDecrement (&lock->guard.started);
+ /* Yield the CPU while waiting for another thread to finish
+ initializing this lock. */
+ while (!lock->guard.done)
+ Sleep (0);
+ }
+ }
+ /* It's OK to wait for this critical section, because it is never taken for a
+ long time. */
+ EnterCriticalSection (&lock->lock);
+ /* Test whether no readers or writers are currently running. */
+ if (!(lock->runcount == 0))
+ {
+ /* This thread would have to wait for a while. Return instead. */
+ LeaveCriticalSection (&lock->lock);
+ return EBUSY;
+ }
+ lock->runcount--; /* runcount becomes -1 */
+ LeaveCriticalSection (&lock->lock);
+ return 0;
+}
+
+int
+glwthread_rwlock_unlock (glwthread_rwlock_t *lock)
+{
+ if (!lock->guard.done)
+ return EINVAL;
+ EnterCriticalSection (&lock->lock);
+ if (lock->runcount < 0)
+ {
+ /* Drop a writer lock. */
+ if (!(lock->runcount == -1))
+ abort ();
+ lock->runcount = 0;
+ }
+ else
+ {
+ /* Drop a reader lock. */
+ if (!(lock->runcount > 0))
+ {
+ LeaveCriticalSection (&lock->lock);
+ return EPERM;
+ }
+ lock->runcount--;
+ }
+ if (lock->runcount == 0)
+ {
+ /* POSIX recommends that "write locks shall take precedence over read
+ locks", to avoid "writer starvation". */
+ if (lock->waiting_writers.count > 0)
+ {
+ /* Wake up one of the waiting writers. */
+ lock->runcount--;
+ glwthread_waitqueue_notify_first (&lock->waiting_writers);
+ }
+ else
+ {
+ /* Wake up all waiting readers. */
+ lock->runcount += lock->waiting_readers.count;
+ glwthread_waitqueue_notify_all (&lock->waiting_readers);
+ }
+ }
+ LeaveCriticalSection (&lock->lock);
+ return 0;
+}
+
+int
+glwthread_rwlock_destroy (glwthread_rwlock_t *lock)
+{
+ if (!lock->guard.done)
+ return EINVAL;
+ if (lock->runcount != 0)
+ return EBUSY;
+ DeleteCriticalSection (&lock->lock);
+ if (lock->waiting_readers.array != NULL)
+ free (lock->waiting_readers.array);
+ if (lock->waiting_writers.array != NULL)
+ free (lock->waiting_writers.array);
+ lock->guard.done = 0;
+ return 0;
+}
diff --git a/macros/texinfo/texinfo/gnulib/lib/windows-rwlock.h b/macros/texinfo/texinfo/gnulib/lib/windows-rwlock.h
new file mode 100644
index 0000000000..90020406af
--- /dev/null
+++ b/macros/texinfo/texinfo/gnulib/lib/windows-rwlock.h
@@ -0,0 +1,68 @@
+/* Read-write locks (native Windows implementation).
+ Copyright (C) 2005-2019 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+ Based on GCC's gthr-win32.h. */
+
+#ifndef _WINDOWS_RWLOCK_H
+#define _WINDOWS_RWLOCK_H
+
+#define WIN32_LEAN_AND_MEAN /* avoid including junk */
+#include <windows.h>
+
+#include "windows-initguard.h"
+
+/* It is impossible to implement read-write locks using plain locks, without
+ introducing an extra thread dedicated to managing read-write locks.
+ Therefore here we need to use the low-level Event type. */
+
+typedef struct
+ {
+ HANDLE *array; /* array of waiting threads, each represented by an event */
+ unsigned int count; /* number of waiting threads */
+ unsigned int alloc; /* length of allocated array */
+ unsigned int offset; /* index of first waiting thread in array */
+ }
+ glwthread_carray_waitqueue_t;
+typedef struct
+ {
+ glwthread_initguard_t guard; /* protects the initialization */
+ CRITICAL_SECTION lock; /* protects the remaining fields */
+ glwthread_carray_waitqueue_t waiting_readers; /* waiting readers */
+ glwthread_carray_waitqueue_t waiting_writers; /* waiting writers */
+ int runcount; /* number of readers running, or -1 when a writer runs */
+ }
+ glwthread_rwlock_t;
+
+#define GLWTHREAD_RWLOCK_INIT { GLWTHREAD_INITGUARD_INIT }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void glwthread_rwlock_init (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_rdlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_wrlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_tryrdlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_trywrlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_unlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_destroy (glwthread_rwlock_t *lock);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_RWLOCK_H */
diff --git a/macros/texinfo/texinfo/gnulib/m4/alloca.m4 b/macros/texinfo/texinfo/gnulib/m4/alloca.m4
index 46d60f9c8c..29bd289b02 100644
--- a/macros/texinfo/texinfo/gnulib/m4/alloca.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/alloca.m4
@@ -1,4 +1,4 @@
-# alloca.m4 serial 14
+# alloca.m4 serial 15
dnl Copyright (C) 2002-2004, 2006-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -37,6 +37,13 @@ AC_DEFUN([gl_FUNC_ALLOCA],
fi
AC_SUBST([ALLOCA_H])
AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
+
+ if test $ac_cv_working_alloca_h = yes; then
+ HAVE_ALLOCA_H=1
+ else
+ HAVE_ALLOCA_H=0
+ fi
+ AC_SUBST([HAVE_ALLOCA_H])
])
# Prerequisites of lib/alloca.c.
diff --git a/macros/texinfo/texinfo/gnulib/m4/gettext.m4 b/macros/texinfo/texinfo/gnulib/m4/gettext.m4
index eef5073b32..e7832418ea 100644
--- a/macros/texinfo/texinfo/gnulib/m4/gettext.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/gettext.m4
@@ -1,5 +1,5 @@
-# gettext.m4 serial 68 (gettext-0.19.8)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+# gettext.m4 serial 70 (gettext-0.20)
+dnl Copyright (C) 1995-2014, 2016, 2018 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -20,15 +20,13 @@ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
dnl Macro to add for using GNU gettext.
dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl default (if it is not specified or empty) is 'no-libtool'.
-dnl INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl INTLSYMBOL must be one of 'external', 'use-libtool'.
+dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and
+dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'.
dnl If INTLSYMBOL is 'use-libtool', then a libtool library
dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
dnl depending on --{enable,disable}-{shared,static} and on the presence of
-dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl $(top_builddir)/intl/libintl.a will be created.
+dnl AM-DISABLE-SHARED).
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
dnl implementations (in libc or libintl) without the ngettext() function
dnl will be ignored. If NEEDSYMBOL is specified and is
@@ -57,19 +55,17 @@ dnl
AC_DEFUN([AM_GNU_GETTEXT],
[
dnl Argument checking.
- ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], ,
[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
+])])])])
ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
- [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+ [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
+])])
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
])])])])
define([gt_included_intl],
- ifelse([$1], [external],
- ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
- [yes]))
- define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+ ifelse([$1], [external], [no], [yes]))
gt_NEEDS_INIT
AM_GNU_GETTEXT_NEED([$2])
@@ -91,8 +87,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
dnl again, outside any 'if'. There are two solutions:
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
- dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
- dnl documented, we avoid it.
+ dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
ifelse(gt_included_intl, yes, , [
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
@@ -278,8 +273,8 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
dnl Mark actions used to generate GNU NLS library.
BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes
- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi
@@ -347,43 +342,14 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
fi
ifelse(gt_included_intl, yes, [
- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
- dnl to 'yes' because some of the testsuite requires it.
- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
- BUILD_INCLUDED_LIBINTL=yes
- fi
+ dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
+ dnl because some of the testsuite requires it.
+ BUILD_INCLUDED_LIBINTL=yes
dnl Make all variables we use known to autoconf.
AC_SUBST([BUILD_INCLUDED_LIBINTL])
AC_SUBST([USE_INCLUDED_LIBINTL])
AC_SUBST([CATOBJEXT])
-
- dnl For backward compatibility. Some configure.ins may be using this.
- nls_cv_header_intl=
- nls_cv_header_libgt=
-
- dnl For backward compatibility. Some Makefiles may be using this.
- DATADIRNAME=share
- AC_SUBST([DATADIRNAME])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INSTOBJEXT=.mo
- AC_SUBST([INSTOBJEXT])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- GENCAT=gencat
- AC_SUBST([GENCAT])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INTLOBJS=
- if test "$USE_INCLUDED_LIBINTL" = yes; then
- INTLOBJS="\$(GETTOBJS)"
- fi
- AC_SUBST([INTLOBJS])
-
- dnl Enable libtool support if the surrounding package wishes it.
- INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
- AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
])
dnl For backward compatibility. Some Makefiles may be using this.
diff --git a/macros/texinfo/texinfo/gnulib/m4/gnulib-common.m4 b/macros/texinfo/texinfo/gnulib/m4/gnulib-common.m4
index 7c0e3e8fa4..57b94ed532 100644
--- a/macros/texinfo/texinfo/gnulib/m4/gnulib-common.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 41
+# gnulib-common.m4 serial 44
dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -17,10 +17,13 @@ AC_DEFUN([gl_COMMON_BODY], [
AH_VERBATIM([_Noreturn],
[/* The _Noreturn keyword of C11. */
#ifndef _Noreturn
-# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# if (defined __cplusplus \
+ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
+ || (defined _MSC_VER && 1900 <= _MSC_VER)))
# define _Noreturn [[noreturn]]
-# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
- || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+# elif ((!defined __cplusplus || defined __clang__) \
+ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
+ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)))
/* _Noreturn works as-is. */
# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
# define _Noreturn __attribute__ ((__noreturn__))
@@ -85,6 +88,33 @@ AC_DEFUN([gl_COMMON_BODY], [
# define _GL_ATTRIBUTE_MALLOC /* empty */
#endif
])
+ AH_VERBATIM([async_safe],
+[/* The _GL_ASYNC_SAFE marker should be attached to functions that are
+ signal handlers (for signals other than SIGABRT, SIGPIPE) or can be
+ invoked from such signal handlers. Such functions have some restrictions:
+ * All functions that it calls should be marked _GL_ASYNC_SAFE as well,
+ or should be listed as async-signal-safe in POSIX
+ <http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04>
+ section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in
+ particular, are NOT async-signal-safe.
+ * All memory locations (variables and struct fields) that these functions
+ access must be marked 'volatile'. This holds for both read and write
+ accesses. Otherwise the compiler might optimize away stores to and
+ reads from such locations that occur in the program, depending on its
+ data flow analysis. For example, when the program contains a loop
+ that is intended to inspect a variable set from within a signal handler
+ while (!signal_occurred)
+ ;
+ the compiler is allowed to transform this into an endless loop if the
+ variable 'signal_occurred' is not declared 'volatile'.
+ Additionally, recall that:
+ * A signal handler should not modify errno (except if it is a handler
+ for a fatal signal and ends by raising the same signal again, thus
+ provoking the termination of the process). If it invokes a function
+ that may clobber errno, it needs to save and restore the value of
+ errno. */
+#define _GL_ASYNC_SAFE
+])
dnl Preparation for running test programs:
dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
dnl to /dev/tty, so they can be redirected to log files. Such diagnostics
diff --git a/macros/texinfo/texinfo/gnulib/m4/gnulib-comp.m4 b/macros/texinfo/texinfo/gnulib/m4/gnulib-comp.m4
index f195d1f294..19167d5b21 100644
--- a/macros/texinfo/texinfo/gnulib/m4/gnulib-comp.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/gnulib-comp.m4
@@ -141,6 +141,10 @@ AC_DEFUN([gl_EARLY],
# Code from module wcrtomb:
# Code from module wctype-h:
# Code from module wcwidth:
+ # Code from module windows-mutex:
+ # Code from module windows-once:
+ # Code from module windows-recmutex:
+ # Code from module windows-rwlock:
# Code from module xalloc:
# Code from module xalloc-die:
# Code from module xalloc-oversized:
@@ -352,6 +356,10 @@ AC_DEFUN([gl_INIT],
gl_gnulib_enabled_threadlib=false
gl_gnulib_enabled_vasnprintf=false
gl_gnulib_enabled_wcrtomb=false
+ gl_gnulib_enabled_503a4cb75d69c787103d0aa2ab7d8440=false
+ gl_gnulib_enabled_68a4501daeca58988392c7e60b4917ab=false
+ gl_gnulib_enabled_f0efff84a70f4afba30902bb8ffe9354=false
+ gl_gnulib_enabled_8bb827fe37eaccf1b97feb0c87bc92ef=false
gl_gnulib_enabled_xsize=false
func_gl_gnulib_m4code_btowc ()
{
@@ -438,13 +446,25 @@ AC_DEFUN([gl_INIT],
gl_MODULE_INDICATOR([lock])
gl_gnulib_enabled_lock=true
func_gl_gnulib_m4code_threadlib
+ if test $gl_threads_api = windows; then
+ func_gl_gnulib_m4code_503a4cb75d69c787103d0aa2ab7d8440
+ fi
+ if test $gl_threads_api = windows; then
+ func_gl_gnulib_m4code_68a4501daeca58988392c7e60b4917ab
+ fi
+ if test $gl_threads_api = windows; then
+ func_gl_gnulib_m4code_f0efff84a70f4afba30902bb8ffe9354
+ fi
+ if test $gl_threads_api = windows; then
+ func_gl_gnulib_m4code_8bb827fe37eaccf1b97feb0c87bc92ef
+ fi
fi
}
func_gl_gnulib_m4code_mbtowc ()
{
if ! $gl_gnulib_enabled_mbtowc; then
gl_FUNC_MBTOWC
- if test $REPLACE_MBTOWC = 1; then
+ if test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1; then
AC_LIBOBJ([mbtowc])
gl_PREREQ_MBTOWC
fi
@@ -571,7 +591,7 @@ AC_DEFUN([gl_INIT],
func_gl_gnulib_m4code_threadlib ()
{
if ! $gl_gnulib_enabled_threadlib; then
- gl_THREADLIB
+ AC_REQUIRE([gl_THREADLIB])
gl_gnulib_enabled_threadlib=true
fi
}
@@ -595,6 +615,54 @@ AC_DEFUN([gl_INIT],
gl_gnulib_enabled_wcrtomb=true
fi
}
+ func_gl_gnulib_m4code_503a4cb75d69c787103d0aa2ab7d8440 ()
+ {
+ if ! $gl_gnulib_enabled_503a4cb75d69c787103d0aa2ab7d8440; then
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ case "$host_os" in
+ mingw*)
+ AC_LIBOBJ([windows-mutex])
+ ;;
+ esac
+ gl_gnulib_enabled_503a4cb75d69c787103d0aa2ab7d8440=true
+ fi
+ }
+ func_gl_gnulib_m4code_68a4501daeca58988392c7e60b4917ab ()
+ {
+ if ! $gl_gnulib_enabled_68a4501daeca58988392c7e60b4917ab; then
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ case "$host_os" in
+ mingw*)
+ AC_LIBOBJ([windows-once])
+ ;;
+ esac
+ gl_gnulib_enabled_68a4501daeca58988392c7e60b4917ab=true
+ fi
+ }
+ func_gl_gnulib_m4code_f0efff84a70f4afba30902bb8ffe9354 ()
+ {
+ if ! $gl_gnulib_enabled_f0efff84a70f4afba30902bb8ffe9354; then
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ case "$host_os" in
+ mingw*)
+ AC_LIBOBJ([windows-recmutex])
+ ;;
+ esac
+ gl_gnulib_enabled_f0efff84a70f4afba30902bb8ffe9354=true
+ fi
+ }
+ func_gl_gnulib_m4code_8bb827fe37eaccf1b97feb0c87bc92ef ()
+ {
+ if ! $gl_gnulib_enabled_8bb827fe37eaccf1b97feb0c87bc92ef; then
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ case "$host_os" in
+ mingw*)
+ AC_LIBOBJ([windows-rwlock])
+ ;;
+ esac
+ gl_gnulib_enabled_8bb827fe37eaccf1b97feb0c87bc92ef=true
+ fi
+ }
func_gl_gnulib_m4code_xsize ()
{
if ! $gl_gnulib_enabled_xsize; then
@@ -624,6 +692,9 @@ AC_DEFUN([gl_INIT],
if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
func_gl_gnulib_m4code_localcharset
fi
+ if test $HAVE_MBRTOWC = 0 || { test $REPLACE_MBRTOWC = 1 && { test $HAVE_MBSINIT = 0 || test $REPLACE_MBSTATE_T = 1; }; }; then
+ func_gl_gnulib_m4code_lock
+ fi
if test $ac_use_included_regex = yes; then
func_gl_gnulib_m4code_btowc
fi
@@ -685,6 +756,10 @@ AC_DEFUN([gl_INIT],
AM_CONDITIONAL([gl_GNULIB_ENABLED_threadlib], [$gl_gnulib_enabled_threadlib])
AM_CONDITIONAL([gl_GNULIB_ENABLED_vasnprintf], [$gl_gnulib_enabled_vasnprintf])
AM_CONDITIONAL([gl_GNULIB_ENABLED_wcrtomb], [$gl_gnulib_enabled_wcrtomb])
+ AM_CONDITIONAL([gl_GNULIB_ENABLED_503a4cb75d69c787103d0aa2ab7d8440], [$gl_gnulib_enabled_503a4cb75d69c787103d0aa2ab7d8440])
+ AM_CONDITIONAL([gl_GNULIB_ENABLED_68a4501daeca58988392c7e60b4917ab], [$gl_gnulib_enabled_68a4501daeca58988392c7e60b4917ab])
+ AM_CONDITIONAL([gl_GNULIB_ENABLED_f0efff84a70f4afba30902bb8ffe9354], [$gl_gnulib_enabled_f0efff84a70f4afba30902bb8ffe9354])
+ AM_CONDITIONAL([gl_GNULIB_ENABLED_8bb827fe37eaccf1b97feb0c87bc92ef], [$gl_gnulib_enabled_8bb827fe37eaccf1b97feb0c87bc92ef])
AM_CONDITIONAL([gl_GNULIB_ENABLED_xsize], [$gl_gnulib_enabled_xsize])
# End of code from modules
m4_ifval(gl_LIBSOURCES_LIST, [
@@ -959,6 +1034,15 @@ AC_DEFUN([gl_FILE_LIST], [
lib/wctype-h.c
lib/wctype.in.h
lib/wcwidth.c
+ lib/windows-initguard.h
+ lib/windows-mutex.c
+ lib/windows-mutex.h
+ lib/windows-once.c
+ lib/windows-once.h
+ lib/windows-recmutex.c
+ lib/windows-recmutex.h
+ lib/windows-rwlock.c
+ lib/windows-rwlock.h
lib/xalloc-die.c
lib/xalloc-oversized.h
lib/xalloc.h
diff --git a/macros/texinfo/texinfo/gnulib/m4/intlmacosx.m4 b/macros/texinfo/texinfo/gnulib/m4/intlmacosx.m4
index aca924c6cd..30e6f50e0a 100644
--- a/macros/texinfo/texinfo/gnulib/m4/intlmacosx.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
-# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 6 (gettext-0.20)
+dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@ dnl Checks for special options needed on Mac OS X.
dnl Defines INTL_MACOSX_LIBS.
AC_DEFUN([gt_INTL_MACOSX],
[
- dnl Check for API introduced in Mac OS X 10.2.
+ dnl Check for API introduced in Mac OS X 10.4.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue],
[gt_save_LIBS="$LIBS"
@@ -33,7 +33,7 @@ AC_DEFUN([gt_INTL_MACOSX],
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
[Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
fi
- dnl Check for API introduced in Mac OS X 10.3.
+ dnl Check for API introduced in Mac OS X 10.5.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
[gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -48,8 +48,24 @@ AC_DEFUN([gt_INTL_MACOSX],
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
[Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
fi
+ AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
+ [gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFLocale.h>]],
+ [[CFLocaleCopyPreferredLanguages();]])],
+ [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
+ [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+ AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
+ fi
INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
fi
AC_SUBST([INTL_MACOSX_LIBS])
diff --git a/macros/texinfo/texinfo/gnulib/m4/malloc.m4 b/macros/texinfo/texinfo/gnulib/m4/malloc.m4
index f78a484f1f..c469c4508d 100644
--- a/macros/texinfo/texinfo/gnulib/m4/malloc.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/malloc.m4
@@ -1,4 +1,4 @@
-# malloc.m4 serial 17
+# malloc.m4 serial 19
dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -32,15 +32,22 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
[ac_cv_func_malloc_0_nonnull=no],
[case "$host_os" in
# Guess yes on platforms where we know the result.
- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
+ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
| hpux* | solaris* | cygwin* | mingw*)
- ac_cv_func_malloc_0_nonnull=yes ;;
+ ac_cv_func_malloc_0_nonnull="guessing yes" ;;
# If we don't know, assume the worst.
- *) ac_cv_func_malloc_0_nonnull=no ;;
+ *) ac_cv_func_malloc_0_nonnull="guessing no" ;;
esac
])
])
- AS_IF([test $ac_cv_func_malloc_0_nonnull = yes], [$1], [$2])
+ case "$ac_cv_func_malloc_0_nonnull" in
+ *yes)
+ $1
+ ;;
+ *)
+ $2
+ ;;
+ esac
])# _AC_FUNC_MALLOC_IF
])
diff --git a/macros/texinfo/texinfo/gnulib/m4/mbtowc.m4 b/macros/texinfo/texinfo/gnulib/m4/mbtowc.m4
index 202c3fbdb5..5a4b92ee52 100644
--- a/macros/texinfo/texinfo/gnulib/m4/mbtowc.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/mbtowc.m4
@@ -1,4 +1,4 @@
-# mbtowc.m4 serial 2
+# mbtowc.m4 serial 3
dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,8 +8,13 @@ AC_DEFUN([gl_FUNC_MBTOWC],
[
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
- if false; then
- REPLACE_MBTOWC=1
+ AC_CHECK_FUNCS([mbtowc])
+ if test $ac_cv_func_mbtowc = no; then
+ HAVE_MBTOWC=0
+ else
+ if false; then
+ REPLACE_MBTOWC=1
+ fi
fi
])
diff --git a/macros/texinfo/texinfo/gnulib/m4/memchr.m4 b/macros/texinfo/texinfo/gnulib/m4/memchr.m4
index db227e7de1..0be394db4f 100644
--- a/macros/texinfo/texinfo/gnulib/m4/memchr.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/memchr.m4
@@ -1,4 +1,4 @@
-# memchr.m4 serial 13
+# memchr.m4 serial 14
dnl Copyright (C) 2002-2004, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -29,6 +29,8 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
# memchr should not dereference overestimated length after a match
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737
# https://sourceware.org/bugzilla/show_bug.cgi?id=10162
+ # memchr should cast the second argument to 'unsigned char'.
+ # This bug exists in Android 4.3.
# Assume that memchr works on platforms that lack mprotect.
AC_CACHE_CHECK([whether memchr works], [gl_cv_func_memchr_works],
[AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -74,15 +76,26 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
if (memchr (fence - 1, 0, 3) != fence - 1)
result |= 4;
}
+ /* Test against bug on Android 4.3. */
+ {
+ char input[3];
+ input[0] = 'a';
+ input[1] = 'b';
+ input[2] = 'c';
+ if (memchr (input, 0x789abc00 | 'b', 3) != input + 1)
+ result |= 8;
+ }
return result;
]])],
[gl_cv_func_memchr_works=yes],
[gl_cv_func_memchr_works=no],
[case "$host_os" in
- # Guess yes on native Windows.
- mingw*) gl_cv_func_memchr_works="guessing yes" ;;
- # Be pessimistic for now.
- *) gl_cv_func_memchr_works="guessing no" ;;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_memchr_works="guessing no" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_memchr_works="guessing yes" ;;
+ # Be pessimistic for now.
+ *) gl_cv_func_memchr_works="guessing no" ;;
esac
])
])
diff --git a/macros/texinfo/texinfo/gnulib/m4/nls.m4 b/macros/texinfo/texinfo/gnulib/m4/nls.m4
index afdb9cacd0..b62f614857 100644
--- a/macros/texinfo/texinfo/gnulib/m4/nls.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/nls.m4
@@ -1,5 +1,5 @@
# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software
dnl Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff --git a/macros/texinfo/texinfo/gnulib/m4/po.m4 b/macros/texinfo/texinfo/gnulib/m4/po.m4
index c5a2f6bf2a..143792dba5 100644
--- a/macros/texinfo/texinfo/gnulib/m4/po.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/po.m4
@@ -1,5 +1,5 @@
-# po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+# po.m4 serial 30 (gettext-0.20)
+dnl Copyright (C) 1995-2014, 2016, 2018-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
dnl Release version of the gettext macros. This is used to ensure that
dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.20])
dnl Perform the following tests also if --disable-nls has been given,
dnl because they are needed for "make dist" to work.
@@ -46,13 +46,6 @@ AC_DEFUN([AM_PO_SUBDIRS],
dnl Test whether it is GNU msgfmt >= 0.15.
changequote(,)dnl
- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([MSGFMT_015])
-changequote(,)dnl
case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
*) GMSGFMT_015=$GMSGFMT ;;
@@ -83,11 +76,21 @@ changequote([,])dnl
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
[$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
- dnl Installation directories.
- dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
- dnl have to define it here, so that it can be used in po/Makefile.
- test -n "$localedir" || localedir='${datadir}/locale'
- AC_SUBST([localedir])
+ dnl Test whether it is GNU msgmerge >= 0.20.
+ if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
+ MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
+ else
+ dnl Test whether it is GNU msgmerge >= 0.12.
+ if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
+ MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
+ else
+ dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is
+ dnl slow. But this is not a big problem, as such old gettext versions are
+ dnl hardly in use any more.
+ MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
+ fi
+ fi
+ AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION])
dnl Support for AM_XGETTEXT_OPTION.
test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
@@ -130,14 +133,11 @@ changequote([,])dnl
if test -n "$OBSOLETE_ALL_LINGUAS"; then
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
fi
# Compute POFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -208,9 +208,8 @@ changequote([,])dnl
esac
done]],
[# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
+ OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
])
@@ -311,15 +310,13 @@ changequote([,])dnl
fi
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages.
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
- ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+ ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
fi
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
# Compute POFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
# Compute UPDATEPOFILES
@@ -329,9 +326,9 @@ changequote([,])dnl
# Compute GMOFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
# Compute PROPERTIESFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).properties)
# Compute CLASSFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class)
# Compute QMFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
# Compute MSGFILES
@@ -356,8 +353,8 @@ changequote([,])dnl
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
- CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+ PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties"
+ CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class"
QMFILES="$QMFILES $srcdirpre$lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
diff --git a/macros/texinfo/texinfo/gnulib/m4/printf.m4 b/macros/texinfo/texinfo/gnulib/m4/printf.m4
index 1db13bf846..6d2280ef5c 100644
--- a/macros/texinfo/texinfo/gnulib/m4/printf.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/printf.m4
@@ -1,4 +1,4 @@
-# printf.m4 serial 59
+# printf.m4 serial 61
dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -62,6 +62,8 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
@@ -79,6 +81,8 @@ changequote(,)dnl
netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
gl_cv_func_printf_sizes_c99="guessing no";;
netbsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_sizes_c99="guessing yes";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -132,17 +136,20 @@ int main ()
[gl_cv_func_printf_long_double=yes],
[gl_cv_func_printf_long_double=no],
[case "$host_os" in
- beos*) gl_cv_func_printf_long_double="guessing no";;
- # Guess yes on MSVC, no on mingw.
- mingw*) AC_EGREP_CPP([Known], [
+ # Guess no on BeOS.
+ beos*) gl_cv_func_printf_long_double="guessing no";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_long_double="guessing yes";;
+ # Guess yes on MSVC, no on mingw.
+ mingw*) AC_EGREP_CPP([Known], [
#ifdef _MSC_VER
Known
#endif
- ],
- [gl_cv_func_printf_long_double="guessing yes"],
- [gl_cv_func_printf_long_double="guessing no"])
- ;;
- *) gl_cv_func_printf_long_double="guessing yes";;
+ ],
+ [gl_cv_func_printf_long_double="guessing yes"],
+ [gl_cv_func_printf_long_double="guessing no"])
+ ;;
+ *) gl_cv_func_printf_long_double="guessing yes";;
esac
])
])
@@ -235,6 +242,8 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_infinite="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
@@ -250,6 +259,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_printf_infinite="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_printf_infinite="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_infinite="guessing no";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -450,12 +461,16 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
# Guess yes on HP-UX >= 11.
hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";;
hpux*) gl_cv_func_printf_infinite_long_double="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_infinite_long_double="guessing no";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -566,6 +581,10 @@ int main ()
[gl_cv_func_printf_directive_a="guessing yes"],
[gl_cv_func_printf_directive_a="guessing no"])
;;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_directive_a="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_directive_a="guessing no";;
# Guess no on native Windows.
mingw*) gl_cv_func_printf_directive_a="guessing no";;
# If we don't know, assume the worst.
@@ -614,6 +633,8 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_directive_f="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
@@ -623,6 +644,8 @@ changequote(,)dnl
# Guess yes on Solaris >= 2.10.
solaris2.[1-9][0-9]*) gl_cv_func_printf_directive_f="guessing yes";;
solaris*) gl_cv_func_printf_directive_f="guessing no";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_directive_f="guessing no";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -688,9 +711,11 @@ int main ()
[gl_cv_func_printf_directive_n=yes],
[gl_cv_func_printf_directive_n=no],
[case "$host_os" in
- # Guess no on native Windows.
- mingw*) gl_cv_func_printf_directive_n="guessing no";;
- *) gl_cv_func_printf_directive_n="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_directive_n="guessing no";;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_printf_directive_n="guessing no";;
+ *) gl_cv_func_printf_directive_n="guessing yes";;
esac
])
])
@@ -766,14 +791,16 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
- irix*) gl_cv_func_printf_directive_ls="guessing no";;
- solaris*) gl_cv_func_printf_directive_ls="guessing no";;
- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
- beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_printf_directive_ls="guessing yes";;
- *) gl_cv_func_printf_directive_ls="guessing yes";;
+ openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
+ irix*) gl_cv_func_printf_directive_ls="guessing no";;
+ solaris*) gl_cv_func_printf_directive_ls="guessing no";;
+ cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
+ beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_directive_ls="guessing no";;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_printf_directive_ls="guessing yes";;
+ *) gl_cv_func_printf_directive_ls="guessing yes";;
esac
changequote([,])dnl
])
@@ -810,11 +837,13 @@ int main ()
changequote(,)dnl
case "$host_os" in
netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*)
- gl_cv_func_printf_positions="guessing no";;
- beos*) gl_cv_func_printf_positions="guessing no";;
- # Guess no on native Windows.
- mingw* | pw*) gl_cv_func_printf_positions="guessing no";;
- *) gl_cv_func_printf_positions="guessing yes";;
+ gl_cv_func_printf_positions="guessing no";;
+ beos*) gl_cv_func_printf_positions="guessing no";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_positions="guessing yes";;
+ # Guess no on native Windows.
+ mingw* | pw*) gl_cv_func_printf_positions="guessing no";;
+ *) gl_cv_func_printf_positions="guessing yes";;
esac
changequote([,])dnl
])
@@ -849,11 +878,13 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
- netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
- # Guess no on native Windows.
- mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
- *) gl_cv_func_printf_flag_grouping="guessing yes";;
+ cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
+ netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";;
+ # Guess no on native Windows.
+ mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+ *) gl_cv_func_printf_flag_grouping="guessing yes";;
esac
changequote([,])dnl
])
@@ -890,14 +921,16 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- # Guess yes on HP-UX 11.
- hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
- # Guess no on HP-UX 10 and older.
- hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
- # Guess yes otherwise.
- *) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+ # Guess yes on HP-UX 11.
+ hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+ # Guess no on HP-UX 10 and older.
+ hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+ # Guess yes otherwise.
+ *) gl_cv_func_printf_flag_leftadjust="guessing yes";;
esac
changequote([,])dnl
])
@@ -935,14 +968,18 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
- # Guess yes on BeOS.
- beos*) gl_cv_func_printf_flag_zero="guessing yes";;
- # Guess no on native Windows.
- mingw*) gl_cv_func_printf_flag_zero="guessing no";;
- # If we don't know, assume the worst.
- *) gl_cv_func_printf_flag_zero="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_flag_zero="guessing yes";;
+ # Guess yes on BeOS.
+ beos*) gl_cv_func_printf_flag_zero="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_flag_zero="guessing no";;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_printf_flag_zero="guessing no";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_printf_flag_zero="guessing no";;
esac
changequote([,])dnl
])
@@ -995,10 +1032,12 @@ int main ()
changequote(,)dnl
case "$host_os" in
# Guess no only on Solaris, native Windows, and BeOS systems.
- solaris*) gl_cv_func_printf_precision="guessing no" ;;
- mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;;
- beos*) gl_cv_func_printf_precision="guessing no" ;;
- *) gl_cv_func_printf_precision="guessing yes" ;;
+ solaris*) gl_cv_func_printf_precision="guessing no" ;;
+ mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;;
+ beos*) gl_cv_func_printf_precision="guessing no" ;;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_precision="guessing yes" ;;
+ *) gl_cv_func_printf_precision="guessing yes" ;;
esac
changequote([,])dnl
])
@@ -1095,28 +1134,30 @@ changequote([,])dnl
if test "$gl_cv_func_printf_enomem" = "guessing no"; then
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on Solaris.
- solaris*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on AIX.
- aix*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on HP-UX/hppa.
- hpux*) case "$host_cpu" in
- hppa*) gl_cv_func_printf_enomem="guessing yes";;
- *) gl_cv_func_printf_enomem="guessing no";;
- esac
- ;;
- # Guess yes on IRIX.
- irix*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on OSF/1.
- osf*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on BeOS.
- beos*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on Haiku.
- haiku*) gl_cv_func_printf_enomem="guessing yes";;
- # If we don't know, assume the worst.
- *) gl_cv_func_printf_enomem="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on Solaris.
+ solaris*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on AIX.
+ aix*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on HP-UX/hppa.
+ hpux*) case "$host_cpu" in
+ hppa*) gl_cv_func_printf_enomem="guessing yes";;
+ *) gl_cv_func_printf_enomem="guessing no";;
+ esac
+ ;;
+ # Guess yes on IRIX.
+ irix*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on OSF/1.
+ osf*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on BeOS.
+ beos*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on Haiku.
+ haiku*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_enomem="guessing no";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_printf_enomem="guessing no";;
esac
changequote([,])dnl
fi
@@ -1177,6 +1218,8 @@ changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
@@ -1208,6 +1251,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
# Guess no on native Windows.
mingw*) gl_cv_func_snprintf_truncation_c99="guessing no";;
# If we don't know, assume the worst.
@@ -1277,6 +1322,8 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
@@ -1299,6 +1346,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -1367,6 +1416,8 @@ changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_snprintf_directive_n="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
@@ -1391,6 +1442,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_snprintf_directive_n="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_snprintf_directive_n="guessing no";;
# Guess no on native Windows.
mingw*) gl_cv_func_snprintf_directive_n="guessing no";;
# If we don't know, assume the worst.
@@ -1440,9 +1493,11 @@ int main()
[gl_cv_func_snprintf_size1=yes],
[gl_cv_func_snprintf_size1=no],
[case "$host_os" in
- # Guess yes on native Windows.
- mingw*) gl_cv_func_snprintf_size1="guessing yes" ;;
- *) gl_cv_func_snprintf_size1="guessing yes" ;;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_snprintf_size1="guessing yes" ;;
+ *) gl_cv_func_snprintf_size1="guessing yes" ;;
esac
])
])
@@ -1517,6 +1572,8 @@ changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
@@ -1540,6 +1597,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on native Windows.
mingw* | pw*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# If we don't know, assume the worst.
@@ -1626,6 +1685,7 @@ dnl NetBSD 4.0 . ? ? ? ? ? . ? . ? ? ? ? ? .
dnl NetBSD 3.0 . . . . # # . ? # # ? # . # . . . . . .
dnl Haiku . . . # # # . # . . . . . ? . . ? . . .
dnl BeOS # # . # # # . ? # . ? . # ? . . ? . . .
+dnl Android 4.3 . . # # # # # # . # . # . # . . . # . .
dnl old mingw / msvcrt # # # # # # . . # # . # # ? . # # # . .
dnl MSVC 9 # # # # # # # . # # . # # ? # # # # . .
dnl mingw 2009-2011 . # . # . . . . # # . . . ? . . . . . .
diff --git a/macros/texinfo/texinfo/gnulib/m4/progtest.m4 b/macros/texinfo/texinfo/gnulib/m4/progtest.m4
index 9ace7c3418..5f186b1490 100644
--- a/macros/texinfo/texinfo/gnulib/m4/progtest.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/progtest.m4
@@ -1,5 +1,5 @@
# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
diff --git a/macros/texinfo/texinfo/gnulib/m4/stdlib_h.m4 b/macros/texinfo/texinfo/gnulib/m4/stdlib_h.m4
index cf064284b6..6121602aea 100644
--- a/macros/texinfo/texinfo/gnulib/m4/stdlib_h.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 45
+# stdlib_h.m4 serial 48
dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -23,10 +23,10 @@ AC_DEFUN([gl_STDLIB_H],
# include <random.h>
#endif
]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt
- initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps
+ initstate initstate_r mbtowc mkdtemp mkostemp mkostemps mkstemp mkstemps
posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray
realpath rpmatch secure_getenv setenv setstate setstate_r srandom
- srandom_r strtod strtoll strtoull unlockpt unsetenv])
+ srandom_r strtod strtold strtoll strtoull unlockpt unsetenv])
])
AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
@@ -68,6 +68,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV])
GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV])
GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD])
+ GNULIB_STRTOLD=0; AC_SUBST([GNULIB_STRTOLD])
GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL])
GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL])
GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX])
@@ -81,7 +82,9 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG])
HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT])
HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT])
+ HAVE_INITSTATE=1; AC_SUBST([HAVE_INITSTATE])
HAVE_DECL_INITSTATE=1; AC_SUBST([HAVE_DECL_INITSTATE])
+ HAVE_MBTOWC=1; AC_SUBST([HAVE_MBTOWC])
HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP])
HAVE_MKOSTEMP=1; AC_SUBST([HAVE_MKOSTEMP])
HAVE_MKOSTEMPS=1; AC_SUBST([HAVE_MKOSTEMPS])
@@ -100,8 +103,10 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
HAVE_SECURE_GETENV=1; AC_SUBST([HAVE_SECURE_GETENV])
HAVE_SETENV=1; AC_SUBST([HAVE_SETENV])
HAVE_DECL_SETENV=1; AC_SUBST([HAVE_DECL_SETENV])
+ HAVE_SETSTATE=1; AC_SUBST([HAVE_SETSTATE])
HAVE_DECL_SETSTATE=1; AC_SUBST([HAVE_DECL_SETSTATE])
HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD])
+ HAVE_STRTOLD=1; AC_SUBST([HAVE_STRTOLD])
HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL])
HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL])
HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
@@ -110,6 +115,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
HAVE_DECL_UNSETENV=1; AC_SUBST([HAVE_DECL_UNSETENV])
REPLACE_CALLOC=0; AC_SUBST([REPLACE_CALLOC])
REPLACE_CANONICALIZE_FILE_NAME=0; AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
+ REPLACE_INITSTATE=0; AC_SUBST([REPLACE_INITSTATE])
REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC])
REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC])
REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP])
@@ -117,11 +123,14 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R])
REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV])
REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R])
+ REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM])
REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R])
REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC])
REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH])
REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV])
+ REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE])
REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD])
+ REPLACE_STRTOLD=0; AC_SUBST([REPLACE_STRTOLD])
REPLACE_UNSETENV=0; AC_SUBST([REPLACE_UNSETENV])
REPLACE_WCTOMB=0; AC_SUBST([REPLACE_WCTOMB])
])
diff --git a/macros/texinfo/texinfo/gnulib/m4/strerror.m4 b/macros/texinfo/texinfo/gnulib/m4/strerror.m4
index b452f7f894..2c90f3163c 100644
--- a/macros/texinfo/texinfo/gnulib/m4/strerror.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/strerror.m4
@@ -1,4 +1,4 @@
-# strerror.m4 serial 19
+# strerror.m4 serial 20
dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -26,6 +26,8 @@ AC_DEFUN([gl_FUNC_STRERROR],
[case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_working_strerror="guessing yes" ;;
# If we don't know, assume the worst.
*) gl_cv_func_working_strerror="guessing no" ;;
esac
@@ -80,6 +82,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0],
[case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;;
# Guess yes on native Windows.
mingw*) gl_cv_func_strerror_0_works="guessing yes" ;;
# If we don't know, assume the worst.
diff --git a/macros/texinfo/texinfo/gnulib/m4/sys_socket_h.m4 b/macros/texinfo/texinfo/gnulib/m4/sys_socket_h.m4
index 1ea7b0b3f3..d0a902061a 100644
--- a/macros/texinfo/texinfo/gnulib/m4/sys_socket_h.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/sys_socket_h.m4
@@ -1,4 +1,4 @@
-# sys_socket_h.m4 serial 23
+# sys_socket_h.m4 serial 24
dnl Copyright (C) 2005-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -104,17 +104,11 @@ AC_DEFUN([gl_PREREQ_SYS_H_SOCKET],
gl_CHECK_NEXT_HEADERS([sys/socket.h])
if test $ac_cv_header_sys_socket_h = yes; then
HAVE_SYS_SOCKET_H=1
- HAVE_WS2TCPIP_H=0
else
HAVE_SYS_SOCKET_H=0
- if test $ac_cv_header_ws2tcpip_h = yes; then
- HAVE_WS2TCPIP_H=1
- else
- HAVE_WS2TCPIP_H=0
- fi
fi
AC_SUBST([HAVE_SYS_SOCKET_H])
- AC_SUBST([HAVE_WS2TCPIP_H])
+ gl_PREREQ_SYS_H_WS2TCPIP
])
# Common prerequisites of the <sys/socket.h> replacement and of the
@@ -142,6 +136,24 @@ AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2],
AC_SUBST([HAVE_WINSOCK2_H])
])
+# Common prerequisites of the <sys/socket.h> replacement and of the
+# <arpa/inet.h> replacement.
+# Sets and substitutes HAVE_WS2TCPIP_H.
+AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP],
+[
+ AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
+ if test $ac_cv_header_sys_socket_h = yes; then
+ HAVE_WS2TCPIP_H=0
+ else
+ if test $ac_cv_header_ws2tcpip_h = yes; then
+ HAVE_WS2TCPIP_H=1
+ else
+ HAVE_WS2TCPIP_H=0
+ fi
+ fi
+ AC_SUBST([HAVE_WS2TCPIP_H])
+])
+
AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff --git a/macros/texinfo/texinfo/gnulib/m4/threadlib.m4 b/macros/texinfo/texinfo/gnulib/m4/threadlib.m4
index f7841b6099..045d9dad29 100644
--- a/macros/texinfo/texinfo/gnulib/m4/threadlib.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/threadlib.m4
@@ -1,4 +1,4 @@
-# threadlib.m4 serial 15
+# threadlib.m4 serial 20
dnl Copyright (C) 2005-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -16,8 +16,7 @@ dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the
dnl default is 'no', otherwise it is system dependent. In both cases, the user
dnl can change the choice through the options --enable-threads=choice or
dnl --disable-threads.
-dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
-dnl USE_PTH_THREADS, USE_WINDOWS_THREADS
+dnl Defines at most one of the macros USE_POSIX_THREADS, USE_WINDOWS_THREADS.
dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
dnl libtool).
@@ -27,6 +26,9 @@ dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not.
dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
dnl multithread-safe programs.
+dnl Since support for GNU pth was removed, $LTLIBTHREAD and $LIBTHREAD have the
+dnl same value, and similarly $LTLIBMULTITHREAD and $LIBMULTITHREAD have the
+dnl same value. Only system libraries are needed.
AC_DEFUN([gl_THREADLIB_EARLY],
[
@@ -50,8 +52,9 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY],
m4_ifdef([gl_THREADLIB_DEFAULT_NO],
[m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
[m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
+ m4_divert_text([DEFAULTS], [gl_use_winpthreads_default=])
AC_ARG_ENABLE([threads],
-AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
+AC_HELP_STRING([--enable-threads={posix|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
AC_HELP_STRING([--disable-threads], [build without multithread safety])]),
[gl_use_threads=$enableval],
[if test -n "$gl_use_threads_default"; then
@@ -62,16 +65,24 @@ changequote(,)dnl
dnl Disable multithreading by default on OSF/1, because it interferes
dnl with fork()/exec(): When msgexec is linked with -lpthread, its
dnl child process gets an endless segmentation fault inside execvp().
+ osf*) gl_use_threads=no ;;
dnl Disable multithreading by default on Cygwin 1.5.x, because it has
dnl bugs that lead to endless loops or crashes. See
dnl <https://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
- osf*) gl_use_threads=no ;;
cygwin*)
case `uname -r` in
1.[0-5].*) gl_use_threads=no ;;
*) gl_use_threads=yes ;;
esac
;;
+ dnl Obey gl_AVOID_WINPTHREAD on mingw.
+ mingw*)
+ case "$gl_use_winpthreads_default" in
+ yes) gl_use_threads=posix ;;
+ no) gl_use_threads=windows ;;
+ *) gl_use_threads=yes ;;
+ esac
+ ;;
*) gl_use_threads=yes ;;
esac
changequote([,])dnl
@@ -151,36 +162,13 @@ int main ()
*" -static "*) gl_cv_have_weak=no ;;
esac
])
- dnl Check whether the linker supports the --as-needed/--no-as-needed options.
- dnl Assume GCC, so that we can use the -Wl option.
- AC_CACHE_CHECK([whether the linker supports --as-needed],
- [gl_cv_linker_have_as_needed],
- [if test -n "$GCC"; then
- gl_saved_ldflags="$LDFLAGS"
- LDFLAGS="$gl_saved_ldflags -Wl,--as-needed -Wl,--no-as-needed"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],
- [gl_cv_linker_have_as_needed=yes],
- [gl_cv_linker_have_as_needed=no])
- LDFLAGS="$gl_saved_ldflags"
- else
- gl_cv_linker_have_as_needed=no
- fi
- ])
- dnl Check whether the linker supports the --push-state/--pop-state options.
- dnl Assume GCC, so that we can use the -Wl option.
- AC_CACHE_CHECK([whether the linker supports --push-state],
- [gl_cv_linker_have_push_state],
- [if test -n "$GCC"; then
- gl_saved_ldflags="$LDFLAGS"
- LDFLAGS="$gl_saved_ldflags -Wl,--push-state -Wl,--pop-state"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],
- [gl_cv_linker_have_push_state=yes],
- [gl_cv_linker_have_push_state=no])
- LDFLAGS="$gl_saved_ldflags"
- else
- gl_cv_linker_have_push_state=no
- fi
- ])
+ if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+ dnl If we use weak symbols to implement pthread_in_use / pth_in_use /
+ dnl thread_in_use, we also need to test whether the ISO C 11 thrd_create
+ dnl facility is in use.
+ AC_CHECK_HEADERS_ONCE([threads.h])
+ :
+ fi
if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
# On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
# it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
@@ -259,123 +247,12 @@ int main ()
[Define if references to the POSIX multithreading library should be made weak.])
LIBTHREAD=
LTLIBTHREAD=
- dnl On platforms where GCC enables --as-needed by default, attempt
- dnl to make sure that LIBMULTITHREAD really links with -lpthread.
- dnl Otherwise linking with LIBMULTITHREAD has no effect; then
- dnl the weak symbols are not defined and thus evaluate to NULL.
- case "$LIBMULTITHREAD" in
- "") ;;
- -pthread)
- if test $gl_cv_linker_have_as_needed = yes; then
- if test $gl_cv_linker_have_push_state = yes; then
- LIBMULTITHREAD="$LIBMULTITHREAD -Wl,--push-state -Wl,--no-as-needed -lpthread -Wl,--pop-state"
- else
- LIBMULTITHREAD="$LIBMULTITHREAD -Wl,--no-as-needed -lpthread"
- fi
- fi
- ;;
- *)
- if test $gl_cv_linker_have_as_needed = yes; then
- if test $gl_cv_linker_have_push_state = yes; then
- LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state"
- else
- LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD"
- fi
- fi
- ;;
- esac
- # TODO: May need to modify LTLIBMULTITHREAD similarly.
fi
fi
fi
fi
fi
if test -z "$gl_have_pthread"; then
- if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
- gl_have_solaristhread=
- gl_save_LIBS="$LIBS"
- LIBS="$LIBS -lthread"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <thread.h>
-#include <synch.h>
- ]],
- [[thr_self();]])],
- [gl_have_solaristhread=yes])
- LIBS="$gl_save_LIBS"
- if test -n "$gl_have_solaristhread"; then
- gl_threads_api=solaris
- LIBTHREAD=-lthread
- LTLIBTHREAD=-lthread
- LIBMULTITHREAD="$LIBTHREAD"
- LTLIBMULTITHREAD="$LTLIBTHREAD"
- AC_DEFINE([USE_SOLARIS_THREADS], [1],
- [Define if the old Solaris multithreading library can be used.])
- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
- AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1],
- [Define if references to the old Solaris multithreading library should be made weak.])
- LIBTHREAD=
- LTLIBTHREAD=
- dnl On platforms where GCC enables --as-needed by default, attempt
- dnl to make sure that LIBMULTITHREAD really links with -lthread.
- dnl Otherwise linking with LIBMULTITHREAD has no effect; then
- dnl the weak symbols are not defined and thus evaluate to NULL.
- if test $gl_cv_linker_have_as_needed = yes; then
- if test $gl_cv_linker_have_push_state = yes; then
- LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state"
- else
- LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD"
- fi
- fi
- # TODO: May need to modify LTLIBMULTITHREAD similarly.
- fi
- fi
- fi
- fi
- if test "$gl_use_threads" = pth; then
- gl_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_LINKFLAGS([pth])
- gl_have_pth=
- gl_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBPTH"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <pth.h>]], [[pth_self();]])],
- [gl_have_pth=yes])
- LIBS="$gl_save_LIBS"
- if test -n "$gl_have_pth"; then
- gl_threads_api=pth
- LIBTHREAD="$LIBPTH"
- LTLIBTHREAD="$LTLIBPTH"
- LIBMULTITHREAD="$LIBTHREAD"
- LTLIBMULTITHREAD="$LTLIBTHREAD"
- AC_DEFINE([USE_PTH_THREADS], [1],
- [Define if the GNU Pth multithreading library can be used.])
- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
- if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
- AC_DEFINE([USE_PTH_THREADS_WEAK], [1],
- [Define if references to the GNU Pth multithreading library should be made weak.])
- LIBTHREAD=
- LTLIBTHREAD=
- dnl On platforms where GCC enables --as-needed by default, attempt
- dnl to make sure that LIBMULTITHREAD really links with -lpth.
- dnl Otherwise linking with LIBMULTITHREAD has no effect; then
- dnl the weak symbols are not defined and thus evaluate to NULL.
- if test $gl_cv_linker_have_as_needed = yes; then
- if test $gl_cv_linker_have_push_state = yes; then
- LIBMULTITHREAD="-Wl,--push-state -Wl,--no-as-needed $LIBMULTITHREAD -Wl,--pop-state"
- else
- LIBMULTITHREAD="-Wl,--no-as-needed $LIBMULTITHREAD"
- fi
- fi
- # TODO: May need to modify LTLIBMULTITHREAD similarly.
- fi
- fi
- else
- CPPFLAGS="$gl_save_CPPFLAGS"
- fi
- fi
- if test -z "$gl_have_pthread"; then
case "$gl_use_threads" in
yes | windows | win32) # The 'win32' is for backward compatibility.
if { case "$host_os" in
@@ -417,6 +294,18 @@ AC_DEFUN([gl_DISABLE_THREADS], [
])
+dnl gl_AVOID_WINPTHREAD
+dnl -------------------
+dnl Sets the gl_THREADLIB default so that on mingw, a dependency to the
+dnl libwinpthread DLL (mingw-w64 winpthreads library) is avoided.
+dnl The user can still override it at installation time, by using the
+dnl configure option '--enable-threads'.
+
+AC_DEFUN([gl_AVOID_WINPTHREAD], [
+ m4_divert_text([INIT_PREPARE], [gl_use_winpthreads_default=no])
+])
+
+
dnl Survey of platforms:
dnl
dnl Platform Available Compiler Supports test-lock
@@ -446,7 +335,6 @@ dnl
dnl Mac OS X 10.[123] posix -lpthread Y OK
dnl
dnl Solaris 7,8,9 posix -lpthread Y Sol 7,8: 0.0; Sol 9: OK
-dnl solaris -lthread Y Sol 7,8: 0.0; Sol 9: OK
dnl
dnl HP-UX 11 posix -lpthread N (cc) OK
dnl Y (gcc)
@@ -460,8 +348,6 @@ dnl -lpthread (gcc) Y
dnl
dnl Cygwin posix -lpthread Y OK
dnl
-dnl Any of the above pth -lpth 0.0
-dnl
dnl Mingw windows N OK
dnl
dnl BeOS 5 --
diff --git a/macros/texinfo/texinfo/gnulib/m4/unistd_h.m4 b/macros/texinfo/texinfo/gnulib/m4/unistd_h.m4
index a04055d2aa..a3b3905f84 100644
--- a/macros/texinfo/texinfo/gnulib/m4/unistd_h.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 74
+# unistd_h.m4 serial 75
dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -64,6 +64,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR])
GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN])
GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE])
+ GNULIB_COPY_FILE_RANGE=0; AC_SUBST([GNULIB_COPY_FILE_RANGE])
GNULIB_DUP=0; AC_SUBST([GNULIB_DUP])
GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2])
GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3])
@@ -113,6 +114,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE])
dnl Assume proper GNU behavior unless another module says otherwise.
HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN])
+ HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE])
HAVE_DUP2=1; AC_SUBST([HAVE_DUP2])
HAVE_DUP3=1; AC_SUBST([HAVE_DUP3])
HAVE_EUIDACCESS=1; AC_SUBST([HAVE_EUIDACCESS])
diff --git a/macros/texinfo/texinfo/gnulib/m4/wcrtomb.m4 b/macros/texinfo/texinfo/gnulib/m4/wcrtomb.m4
index f4f37f5670..fec22f34e0 100644
--- a/macros/texinfo/texinfo/gnulib/m4/wcrtomb.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/wcrtomb.m4
@@ -1,4 +1,4 @@
-# wcrtomb.m4 serial 13
+# wcrtomb.m4 serial 14
dnl Copyright (C) 2008-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -33,7 +33,9 @@ AC_DEFUN([gl_FUNC_WCRTOMB],
else
if test $REPLACE_MBSTATE_T = 1; then
REPLACE_WCRTOMB=1
- else
+ fi
+ if test $REPLACE_WCRTOMB = 0; then
+ dnl On Android 4.3, wcrtomb produces wrong characters in the C locale.
dnl On AIX 4.3, OSF/1 5.1 and Solaris <= 11.3, wcrtomb (NULL, 0, NULL)
dnl sometimes returns 0 instead of 1.
AC_REQUIRE([AC_PROG_CC])
@@ -42,6 +44,45 @@ AC_DEFUN([gl_FUNC_WCRTOMB],
AC_REQUIRE([gt_LOCALE_JA])
AC_REQUIRE([gt_LOCALE_ZH_CN])
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+ AC_CACHE_CHECK([whether wcrtomb works in the C locale],
+ [gl_cv_func_wcrtomb_works],
+ [AC_RUN_IFELSE(
+ [AC_LANG_SOURCE([[
+#include <string.h>
+#include <stdlib.h>
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+ <wchar.h>.
+ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+ included before <wchar.h>. */
+#include <stddef.h>
+#include <stdio.h>
+#include <wchar.h>
+int main ()
+{
+ mbstate_t state;
+ char out[64];
+ int count;
+ memset (&state, 0, sizeof (state));
+ out[0] = 'x';
+ count = wcrtomb (out, L'a', &state);
+ return !(count == 1 && out[0] == 'a');
+}]])],
+ [gl_cv_func_wcrtomb_works=yes],
+ [gl_cv_func_wcrtomb_works=no],
+ [case "$host_os" in
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_wcrtomb_works="guessing no";;
+ # Guess yes otherwise.
+ *) gl_cv_func_wcrtomb_works="guessing yes";;
+ esac
+ ])
+ ])
+ case "$gl_cv_func_wcrtomb_works" in
+ *yes) ;;
+ *) REPLACE_WCRTOMB=1 ;;
+ esac
+ fi
+ if test $REPLACE_WCRTOMB = 0; then
AC_CACHE_CHECK([whether wcrtomb return value is correct],
[gl_cv_func_wcrtomb_retval],
[
diff --git a/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4 b/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4
index baa2002949..e9b5bf48fc 100644
--- a/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4
+++ b/macros/texinfo/texinfo/gnulib/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 27
+# wcwidth.m4 serial 29
dnl Copyright (C) 2006-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -54,6 +54,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
dnl On OpenBSD 5.8, wcwidth(0xFF1A) (FULLWIDTH COLON) returns 0.
dnl This leads to bugs in 'ls' (coreutils).
+ dnl On Solaris 11.4, wcwidth(0x2202) (PARTIAL DIFFERENTIAL) returns 2,
+ dnl even in Western locales.
AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
[gl_cv_func_wcwidth_works],
[
@@ -80,7 +82,7 @@ int wcwidth (int);
int main ()
{
int result = 0;
- if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
+ if (setlocale (LC_ALL, "en_US.UTF-8") != NULL)
{
if (wcwidth (0x0301) > 0)
result |= 1;
@@ -90,6 +92,8 @@ int main ()
result |= 4;
if (wcwidth (0xFF1A) == 0)
result |= 8;
+ if (wcwidth (0x2202) > 1)
+ result |= 16;
}
return result;
}]])],
@@ -98,9 +102,13 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc and AIX 7 systems.
- *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
- *) gl_cv_func_wcwidth_works="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_wcwidth_works="guessing yes";;
+ # Guess yes on AIX 7 systems.
+ aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
+ *) gl_cv_func_wcwidth_works="guessing no";;
esac
changequote([,])dnl
])
diff --git a/macros/texinfo/texinfo/info/Makefile.in b/macros/texinfo/texinfo/info/Makefile.in
index 798940219b..c02de55a18 100644
--- a/macros/texinfo/texinfo/info/Makefile.in
+++ b/macros/texinfo/texinfo/info/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -581,6 +581,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -736,6 +737,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -803,11 +805,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -873,6 +877,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -893,6 +898,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -927,6 +933,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -941,6 +948,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -1019,8 +1027,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -1036,14 +1042,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1133,6 +1138,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1166,6 +1172,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1178,6 +1185,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1196,6 +1204,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1299,6 +1308,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/info/dribble.c b/macros/texinfo/texinfo/info/dribble.c
index 43ab39cec8..bf6cac2f29 100644
--- a/macros/texinfo/texinfo/info/dribble.c
+++ b/macros/texinfo/texinfo/info/dribble.c
@@ -35,14 +35,8 @@ open_dribble_file (char *name)
/* Keystrokes can be non-printable characters, so we need binary I/O. */
info_dribble_file = fopen (name, FOPEN_WBIN);
-#if defined (HAVE_SETVBUF)
if (info_dribble_file)
-# if defined (SETVBUF_REVERSED)
- setvbuf (info_dribble_file, _IONBF, NULL, 1);
-# else
setvbuf (info_dribble_file, NULL, _IONBF, 1);
-# endif /* !SETVBUF_REVERSED */
-#endif /* HAVE_SETVBUF */
}
/* If there is a dribble file already open, close it. */
diff --git a/macros/texinfo/texinfo/info/pcterm.c b/macros/texinfo/texinfo/info/pcterm.c
index 9bf796485b..57520466dc 100644
--- a/macros/texinfo/texinfo/info/pcterm.c
+++ b/macros/texinfo/texinfo/info/pcterm.c
@@ -1613,7 +1613,7 @@ kill (pid_t pid, int sig)
{
switch (sig)
{
- RETSIGTYPE (*old_INT)(int), (*old_QUIT)(int);
+ void (*old_INT)(int), (*old_QUIT)(int);
case SIGINT:
#ifdef __DJGPP__
diff --git a/macros/texinfo/texinfo/info/session.c b/macros/texinfo/texinfo/info/session.c
index 694522ed4b..105f72c781 100644
--- a/macros/texinfo/texinfo/info/session.c
+++ b/macros/texinfo/texinfo/info/session.c
@@ -4257,6 +4257,9 @@ info_search_1 (WINDOW *window, int count, int case_sensitive)
|| !search_string)
return;
+ /* Disable any active tree search. */
+ window->node->active_menu = 0;
+
start_off = window->point + direction;
/* If the search string includes upper-case letters, make the search
@@ -4647,6 +4650,12 @@ DECLARE_INFO_COMMAND (info_search_next,
NODE *starting_node = window->node;
int result;
+ if (window->search_string && window->node->active_menu)
+ {
+ tree_search_check_node (window);
+ return;
+ }
+
if (!last_search_direction || !search_string)
{
info_error ("%s", _("No previous search string"));
@@ -4692,6 +4701,12 @@ DECLARE_INFO_COMMAND (info_search_previous,
NODE *starting_node = window->node;
int result;
+ if (window->search_string && window->node->active_menu)
+ {
+ tree_search_check_node_backwards (window);
+ return;
+ }
+
if (!last_search_direction || !search_string)
{
info_error ("%s", _("No previous search string"));
diff --git a/macros/texinfo/texinfo/info/signals.c b/macros/texinfo/texinfo/info/signals.c
index 78f30ee84a..c32a0407cf 100644
--- a/macros/texinfo/texinfo/info/signals.c
+++ b/macros/texinfo/texinfo/info/signals.c
@@ -27,43 +27,11 @@ void initialize_info_signal_handler (void);
/* **************************************************************** */
/* */
-/* Pretending That We Have POSIX Signals */
-/* */
-/* **************************************************************** */
-
-#if !defined (HAVE_SIGPROCMASK) && defined (HAVE_SIGSETMASK)
-/* Perform OPERATION on NEWSET, perhaps leaving information in OLDSET. */
-static void
-sigprocmask (int operation, int *newset, int *oldset)
-{
- switch (operation)
- {
- case SIG_UNBLOCK:
- sigsetmask (sigblock (0) & ~(*newset));
- break;
-
- case SIG_BLOCK:
- *oldset = sigblock (*newset);
- break;
-
- case SIG_SETMASK:
- sigsetmask (*newset);
- break;
-
- default:
- abort ();
- }
-}
-#endif /* !HAVE_SIGPROCMASK && HAVE_SIGSETMASK */
-
-/* **************************************************************** */
-/* */
/* Signal Handling for Info */
/* */
/* **************************************************************** */
-#if defined (HAVE_SIGACTION) || defined (HAVE_SIGPROCMASK) ||\
- defined (HAVE_SIGSETMASK)
+#if defined (HAVE_SIGACTION) || defined (HAVE_SIGPROCMASK)
static void
mask_termsig (sigset_t *set)
{
@@ -88,9 +56,9 @@ mask_termsig (sigset_t *set)
sigaddset (set, SIGUSR1);
# endif
}
-#endif /* HAVE_SIGACTION || HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
+#endif /* HAVE_SIGACTION || HAVE_SIGPROCMASK */
-static RETSIGTYPE info_signal_proc (int sig);
+static void info_signal_proc (int sig);
#if defined (HAVE_SIGACTION)
typedef struct sigaction signal_info;
signal_info info_signal_handler;
@@ -107,7 +75,7 @@ restore_termsig (int sig, const signal_info *saved)
sigaction (sig, saved, NULL);
}
#else /* !HAVE_SIGACTION */
-typedef RETSIGTYPE (*signal_info) ();
+typedef void (*signal_info) ();
#define set_termsig(sig, old) (void)(*(old) = signal (sig, info_signal_proc))
#define restore_termsig(sig, saved) (void)signal (sig, *(saved))
#define info_signal_handler info_signal_proc
@@ -204,7 +172,7 @@ signal_unblock_winch (void)
#endif
}
-static RETSIGTYPE
+static void
info_signal_proc (int sig)
{
signal_info *old_signal_handler = NULL;
@@ -214,14 +182,14 @@ info_signal_proc (int sig)
if (term_conf_busy)
return;
term_conf_busy++;
-#if defined (HAVE_SIGPROCMASK) || defined (HAVE_SIGSETMASK)
+#if defined (HAVE_SIGPROCMASK)
{
sigset_t nvar, ovar;
sigemptyset (&nvar);
mask_termsig (&nvar);
sigprocmask (SIG_BLOCK, &nvar, &ovar);
}
-#endif /* HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
+#endif /* HAVE_SIGPROCMASK */
#endif /* !HAVE_SIGACTION */
switch (sig)
{
@@ -330,14 +298,14 @@ info_signal_proc (int sig)
#if !defined (HAVE_SIGACTION)
/* at this time it is safer to perform unblock after decrement */
term_conf_busy--;
-#if defined (HAVE_SIGPROCMASK) || defined (HAVE_SIGSETMASK)
+#if defined (HAVE_SIGPROCMASK)
{
sigset_t nvar, ovar;
sigemptyset (&nvar);
mask_termsig (&nvar);
sigprocmask (SIG_UNBLOCK, &nvar, &ovar);
}
-#endif /* HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
+#endif /* HAVE_SIGPROCMASK */
#endif /* !HAVE_SIGACTION */
}
diff --git a/macros/texinfo/texinfo/info/t/Init-test.inc b/macros/texinfo/texinfo/info/t/Init-test.inc
index ec214b92aa..69b3f9d34e 100644
--- a/macros/texinfo/texinfo/info/t/Init-test.inc
+++ b/macros/texinfo/texinfo/info/t/Init-test.inc
@@ -158,8 +158,7 @@ init_interactive_test ()
# Get name of pseudo-terminal slave device
read pts_device <$pipein
- # Keeping the FIFO open for writing prevents the select call in
- # pseudotty returning EOF after a single "printf something >$pty_type".
+ # For passing bytes to the program
exec 7>$pty_type
# glibc can kill a running process if it detects a condition like a
diff --git a/macros/texinfo/texinfo/info/t/adjust-anchors.sh b/macros/texinfo/texinfo/info/t/adjust-anchors.sh
index f067d444e4..ebdcc37de8 100644
--- a/macros/texinfo/texinfo/info/t/adjust-anchors.sh
+++ b/macros/texinfo/texinfo/info/t/adjust-anchors.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,8 +26,8 @@ run_ginfo -f anchors
# Go to anchor in a UTF-8 encoded file when the current character encoding is
# supposed to be ISO-8859-1
-printf 'ganchor-2\r\002\002\002\002\002\002' >$pty_type
-printf '\002\002\002\002\002\002\002\002\rDq' >$pty_type
+printf 'ganchor-2\r\002\002\002\002\002\002' >&7
+printf '\002\002\002\002\002\002\002\002\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/all-only.sh b/macros/texinfo/texinfo/info/t/all-only.sh
index a3a84c7a05..e34b918617 100644
--- a/macros/texinfo/texinfo/info/t/all-only.sh
+++ b/macros/texinfo/texinfo/info/t/all-only.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ MANPATH=.; export MANPATH
# to that file without loading a menu of matching files. This relies
# on there being no "intera" entry in "dir".
run_ginfo --all intera
-printf 'Dq' >$pty_type
+printf 'Dq' >&7
timeout_test
grep '^File: intera.info, Node: Top' $ginfo_output
diff --git a/macros/texinfo/texinfo/info/t/anchor-positions.sh b/macros/texinfo/texinfo/info/t/anchor-positions.sh
index 0031e7dce2..abe81061c3 100644
--- a/macros/texinfo/texinfo/info/t/anchor-positions.sh
+++ b/macros/texinfo/texinfo/info/t/anchor-positions.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ srcdir=${srcdir:-.}
# encoding conversion doesn't cause the program to freeze.
LANG=en_US.iso8859-1; export LANG
run_ginfo -f anchor-positions
-printf q >$pty_type
+printf q >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/body-start.sh b/macros/texinfo/texinfo/info/t/body-start.sh
index fca8a8019d..7a81d9652e 100644
--- a/macros/texinfo/texinfo/info/t/body-start.sh
+++ b/macros/texinfo/texinfo/info/t/body-start.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f body-start
# Check that node headers aren't included in searches
-printf 'sPotential match\r\rDq' >$pty_type &
+printf 'sPotential match\r\rDq' >&7 &
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/c-u-m-x-scroll-forward.sh b/macros/texinfo/texinfo/info/t/c-u-m-x-scroll-forward.sh
index 7a3795581a..76abcf94f6 100644
--- a/macros/texinfo/texinfo/info/t/c-u-m-x-scroll-forward.sh
+++ b/macros/texinfo/texinfo/info/t/c-u-m-x-scroll-forward.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@ COLUMNS=80; export COLUMNS
run_ginfo -f intera -n 'Scroll four lines'
# C-u M-x scroll-forward should scroll four lines, not four screens
-printf '\025\033xscroll-forward\r' >$pty_type
-printf '\rDq' >$pty_type
+printf '\025\033xscroll-forward\r' >&7
+printf '\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/close-window-after-search.sh b/macros/texinfo/texinfo/info/t/close-window-after-search.sh
index d7d63df411..049226e5f7 100644
--- a/macros/texinfo/texinfo/info/t/close-window-after-search.sh
+++ b/macros/texinfo/texinfo/info/t/close-window-after-search.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2017-2018 Free Software Foundation, Inc.
+# Copyright (C) 2017-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ run_ginfo -f intera
# Split window, do a search, and then close the window the search took
# place in.
-printf '\0302sblah\r\0300q' >$pty_type
+printf '\0302sblah\r\0300q' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/dir-3-menus.sh b/macros/texinfo/texinfo/info/t/dir-3-menus.sh
index 6125c2db1e..b62d75c73f 100644
--- a/macros/texinfo/texinfo/info/t/dir-3-menus.sh
+++ b/macros/texinfo/texinfo/info/t/dir-3-menus.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-dangling-entry.sh b/macros/texinfo/texinfo/info/t/dir-dangling-entry.sh
index 01d33f3a75..c6201c4ff4 100644
--- a/macros/texinfo/texinfo/info/t/dir-dangling-entry.sh
+++ b/macros/texinfo/texinfo/info/t/dir-dangling-entry.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-entry-to-subdir.sh b/macros/texinfo/texinfo/info/t/dir-entry-to-subdir.sh
index 11cb5b9970..c2b54d2859 100644
--- a/macros/texinfo/texinfo/info/t/dir-entry-to-subdir.sh
+++ b/macros/texinfo/texinfo/info/t/dir-entry-to-subdir.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2015-2018 Free Software Foundation, Inc.
+# Copyright (C) 2015-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
# Follow a dir entry to a file in a subdirectory of infodir
run_ginfo subdir
-printf 'Dq' >$pty_type
+printf 'Dq' >&7
timeout_test
cat $ginfo_output
diff --git a/macros/texinfo/texinfo/info/t/dir-file-index.sh b/macros/texinfo/texinfo/info/t/dir-file-index.sh
index 96093ec7cf..af35228df8 100644
--- a/macros/texinfo/texinfo/info/t/dir-file-index.sh
+++ b/macros/texinfo/texinfo/info/t/dir-file-index.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-file-menu.sh b/macros/texinfo/texinfo/info/t/dir-file-menu.sh
index 01eca6b732..850fd365f8 100644
--- a/macros/texinfo/texinfo/info/t/dir-file-menu.sh
+++ b/macros/texinfo/texinfo/info/t/dir-file-menu.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-file-no-menu.sh b/macros/texinfo/texinfo/info/t/dir-file-no-menu.sh
index 537596c495..8ecc5852a1 100644
--- a/macros/texinfo/texinfo/info/t/dir-file-no-menu.sh
+++ b/macros/texinfo/texinfo/info/t/dir-file-no-menu.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-file-node.sh b/macros/texinfo/texinfo/info/t/dir-file-node.sh
index ccac3f2d28..802187300c 100644
--- a/macros/texinfo/texinfo/info/t/dir-file-node.sh
+++ b/macros/texinfo/texinfo/info/t/dir-file-node.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-file-sloppily.sh b/macros/texinfo/texinfo/info/t/dir-file-sloppily.sh
index 156591fd9a..f98c8631dd 100644
--- a/macros/texinfo/texinfo/info/t/dir-file-sloppily.sh
+++ b/macros/texinfo/texinfo/info/t/dir-file-sloppily.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-file.sh b/macros/texinfo/texinfo/info/t/dir-file.sh
index 674eaa2c02..024b7dbad0 100644
--- a/macros/texinfo/texinfo/info/t/dir-file.sh
+++ b/macros/texinfo/texinfo/info/t/dir-file.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-menus-sloppily.sh b/macros/texinfo/texinfo/info/t/dir-menus-sloppily.sh
index 897454ba08..93b3251a66 100644
--- a/macros/texinfo/texinfo/info/t/dir-menus-sloppily.sh
+++ b/macros/texinfo/texinfo/info/t/dir-menus-sloppily.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-merge.sh b/macros/texinfo/texinfo/info/t/dir-merge.sh
index bfc1babe35..b914bc9dd5 100644
--- a/macros/texinfo/texinfo/info/t/dir-merge.sh
+++ b/macros/texinfo/texinfo/info/t/dir-merge.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ INFOPATH=$INFOPATH:$t/infodir/subdir
# Follow a reference to file in merged dir
run_ginfo -v hide-note-references=On file-in-subdir
-printf q >$pty_type
+printf q >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/dir-no-file.sh b/macros/texinfo/texinfo/info/t/dir-no-file.sh
index 71289cc1d3..7d29b872ac 100644
--- a/macros/texinfo/texinfo/info/t/dir-no-file.sh
+++ b/macros/texinfo/texinfo/info/t/dir-no-file.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir-nondir.sh b/macros/texinfo/texinfo/info/t/dir-nondir.sh
index 5bbfff6b6c..af9d24077b 100644
--- a/macros/texinfo/texinfo/info/t/dir-nondir.sh
+++ b/macros/texinfo/texinfo/info/t/dir-nondir.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/dir.sh b/macros/texinfo/texinfo/info/t/dir.sh
index 2bed697e43..fd5c05fffb 100644
--- a/macros/texinfo/texinfo/info/t/dir.sh
+++ b/macros/texinfo/texinfo/info/t/dir.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/echo-area-no-completions.sh b/macros/texinfo/texinfo/info/t/echo-area-no-completions.sh
index e2fc52acd7..4aa3fbaea3 100644
--- a/macros/texinfo/texinfo/info/t/echo-area-no-completions.sh
+++ b/macros/texinfo/texinfo/info/t/echo-area-no-completions.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@ srcdir=${srcdir:-.}
run_ginfo -f intera -n xrefnode
# Enter echo area and try to follow a cross-reference that doesn't exist
-printf 'fs\r\r\r\r\r\r' >$pty_type
-printf '\030\030q' >$pty_type
+printf 'fs\r\r\r\r\r\r' >&7
+printf '\030\030q' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/empty-infopath.sh b/macros/texinfo/texinfo/info/t/empty-infopath.sh
index e2be72cdf2..20d7a44139 100644
--- a/macros/texinfo/texinfo/info/t/empty-infopath.sh
+++ b/macros/texinfo/texinfo/info/t/empty-infopath.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2015-2018 Free Software Foundation, Inc.
+# Copyright (C) 2015-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ srcdir=${srcdir:-.}
INFOPATH=
export INFOPATH
run_ginfo
-printf q >$pty_type
+printf q >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/empty.sh b/macros/texinfo/texinfo/info/t/empty.sh
index edae9e718e..c40d1db7d3 100644
--- a/macros/texinfo/texinfo/info/t/empty.sh
+++ b/macros/texinfo/texinfo/info/t/empty.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/end-of-line.sh b/macros/texinfo/texinfo/info/t/end-of-line.sh
index 9c4d31088a..62e82e463d 100644
--- a/macros/texinfo/texinfo/info/t/end-of-line.sh
+++ b/macros/texinfo/texinfo/info/t/end-of-line.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera
# Check that typing C-e on an empty line doesn't go to previous line
-printf '\x0e\x0e\x0e\x0e\x0e\x05\x0e\rDq' >$pty_type
+printf '\x0e\x0e\x0e\x0e\x0e\x05\x0e\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/file-file-with-dot.sh b/macros/texinfo/texinfo/info/t/file-file-with-dot.sh
index 0260a500e6..659f55d714 100644
--- a/macros/texinfo/texinfo/info/t/file-file-with-dot.sh
+++ b/macros/texinfo/texinfo/info/t/file-file-with-dot.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/file-index-colons.sh b/macros/texinfo/texinfo/info/t/file-index-colons.sh
index d5a17cd6ff..1b577ae93e 100644
--- a/macros/texinfo/texinfo/info/t/file-index-colons.sh
+++ b/macros/texinfo/texinfo/info/t/file-index-colons.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2017-2018 Free Software Foundation, Inc.
+# Copyright (C) 2017-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/file-index.sh b/macros/texinfo/texinfo/info/t/file-index.sh
index 5d8e3ddfd0..0911fadef2 100644
--- a/macros/texinfo/texinfo/info/t/file-index.sh
+++ b/macros/texinfo/texinfo/info/t/file-index.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/file-node-with-dot.sh b/macros/texinfo/texinfo/info/t/file-node-with-dot.sh
index bfffccf1b9..414381693f 100644
--- a/macros/texinfo/texinfo/info/t/file-node-with-dot.sh
+++ b/macros/texinfo/texinfo/info/t/file-node-with-dot.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/file-node.sh b/macros/texinfo/texinfo/info/t/file-node.sh
index 0b9dea63f4..26deb995b6 100644
--- a/macros/texinfo/texinfo/info/t/file-node.sh
+++ b/macros/texinfo/texinfo/info/t/file-node.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/file-nodes.sh b/macros/texinfo/texinfo/info/t/file-nodes.sh
index 354bab4d8e..322d156820 100644
--- a/macros/texinfo/texinfo/info/t/file-nodes.sh
+++ b/macros/texinfo/texinfo/info/t/file-nodes.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/file-relative-path.sh b/macros/texinfo/texinfo/info/t/file-relative-path.sh
index 32f7c68a6e..4fc9c5bf1f 100644
--- a/macros/texinfo/texinfo/info/t/file-relative-path.sh
+++ b/macros/texinfo/texinfo/info/t/file-relative-path.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/file.sh b/macros/texinfo/texinfo/info/t/file.sh
index b4276f1c0f..db9a3c9df4 100644
--- a/macros/texinfo/texinfo/info/t/file.sh
+++ b/macros/texinfo/texinfo/info/t/file.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/gc-split.sh b/macros/texinfo/texinfo/info/t/gc-split.sh
index d6f5b04839..812cd0861f 100644
--- a/macros/texinfo/texinfo/info/t/gc-split.sh
+++ b/macros/texinfo/texinfo/info/t/gc-split.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ run_ginfo -f split
# Cause the garbage collector to run in a split file by cancelling an
# incremental search. Refresh the screen afterwards to increase the
# chances of trying to access freed file contents.
-printf '\023aa\033[B\014q' >$pty_type
+printf '\023aa\033[B\014q' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/goal-column.sh b/macros/texinfo/texinfo/info/t/goal-column.sh
index 0f385b04c5..48612e1d06 100644
--- a/macros/texinfo/texinfo/info/t/goal-column.sh
+++ b/macros/texinfo/texinfo/info/t/goal-column.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@ srcdir=${srcdir:-.}
run_ginfo -f intera -n 'Goal column'
-printf '/^Goal column test\r\016' >$pty_type
-printf '\005\016\016\006\006' >$pty_type
-printf '\rDq' >$pty_type
+printf '/^Goal column test\r\016' >&7
+printf '\005\016\016\006\006' >&7
+printf '\rDq' >&7
timeout_test
diff $ginfo_output $t/node-target
diff --git a/macros/texinfo/texinfo/info/t/goto-quoted.sh b/macros/texinfo/texinfo/info/t/goto-quoted.sh
index 2c8a45e07d..8223bc4dd7 100644
--- a/macros/texinfo/texinfo/info/t/goto-quoted.sh
+++ b/macros/texinfo/texinfo/info/t/goto-quoted.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f quoting
# Go to a node with colons and commas in its name with "g"
-printf 'g\tColo\t\r\t\rDq' >$pty_type
+printf 'g\tColo\t\r\t\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/help.sh b/macros/texinfo/texinfo/info/t/help.sh
index 92423e9c32..8f6516a115 100644
--- a/macros/texinfo/texinfo/info/t/help.sh
+++ b/macros/texinfo/texinfo/info/t/help.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/inc-sea-bs.sh b/macros/texinfo/texinfo/info/t/inc-sea-bs.sh
index 9ef1f70f4f..88d1099740 100644
--- a/macros/texinfo/texinfo/info/t/inc-sea-bs.sh
+++ b/macros/texinfo/texinfo/info/t/inc-sea-bs.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2017-2018 Free Software Foundation, Inc.
+# Copyright (C) 2017-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@ run_ginfo -f intera -n Top
# Do a incremental search and enter a single backslash. This is to
# test that it doesn't crash when the input is not valid.
-printf '\023' >$pty_type
-printf '\\\n' >$pty_type
-printf q >$pty_type
+printf '\023' >&7
+printf '\\\n' >&7
+printf q >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/inc-sea-forward-nonregex.sh b/macros/texinfo/texinfo/info/t/inc-sea-forward-nonregex.sh
index ebd39d6f9d..2a1099fb73 100644
--- a/macros/texinfo/texinfo/info/t/inc-sea-forward-nonregex.sh
+++ b/macros/texinfo/texinfo/info/t/inc-sea-forward-nonregex.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@ run_ginfo -f search
# search. Test deleting characters from search string with backspace. Go
# forward to match in next node. Test we end up at the end of the match
# string by trying to wrap to the next line with C-f.
-printf 'R\023matchxy\010\010' >$pty_type
-printf '\023\023\023\r\006\rDq' >$pty_type
+printf 'R\023matchxy\010\010' >&7
+printf '\023\023\023\r\006\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/inc-sea-forward.sh b/macros/texinfo/texinfo/info/t/inc-sea-forward.sh
index 145308c217..c6dd7a9891 100644
--- a/macros/texinfo/texinfo/info/t/inc-sea-forward.sh
+++ b/macros/texinfo/texinfo/info/t/inc-sea-forward.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@ run_ginfo -f search
# search string with backspace. Go forward to match in next node. Test
# we end up at the end of the match string by trying to wrap to the next line
# with C-f.
-printf '\023matchxy\010\010' >$pty_type
-printf '\023\023\023\r\006\rDq' >$pty_type
+printf '\023matchxy\010\010' >&7
+printf '\023\023\023\r\006\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/inc-sea-history.sh b/macros/texinfo/texinfo/info/t/inc-sea-history.sh
index cd2938f7f6..118da41565 100644
--- a/macros/texinfo/texinfo/info/t/inc-sea-history.sh
+++ b/macros/texinfo/texinfo/info/t/inc-sea-history.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,15 +20,15 @@ srcdir=${srcdir:-.}
run_ginfo -f inc-sea-history
# Check that we go back to the right node after an incremental search
-printf '\02301234\b4\b\b34\b\bqwerty\b\b\b\b\b\b34' >$pty_type
-printf '\rD' >$pty_type
+printf '\02301234\b4\b\b34\b\bqwerty\b\b\b\b\b\b34' >&7
+printf '\rD' >&7
# Check we reached node with "01234" in it
sleep 1
grep 'Node: Four' $ginfo_output
retval=$?
-printf 'lDq' >$pty_type
+printf 'lDq' >&7
timeout_test
if test $retval = 0; then
diff --git a/macros/texinfo/texinfo/info/t/inc-sea-insensitive.sh b/macros/texinfo/texinfo/info/t/inc-sea-insensitive.sh
index ee06434b77..63aa4c5b21 100644
--- a/macros/texinfo/texinfo/info/t/inc-sea-insensitive.sh
+++ b/macros/texinfo/texinfo/info/t/inc-sea-insensitive.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@ run_ginfo -f intera -n 'Incremental search case-insensitive'
# Search for "match" with incremental search, adding an upper-case character
# to make the search case-sensitive. Delete it and check the search goes back
# to being case insensitive by checking that a "Match" is included.
-printf '\023matchX\010' >$pty_type
-printf '\023\023\r\rDq' >$pty_type
+printf '\023matchX\010' >&7
+printf '\023\023\r\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/index-apropos.sh b/macros/texinfo/texinfo/info/t/index-apropos.sh
index 562a98e2a9..98f70b522d 100644
--- a/macros/texinfo/texinfo/info/t/index-apropos.sh
+++ b/macros/texinfo/texinfo/info/t/index-apropos.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ run_ginfo
# result. Then type "i" followed by <TAB> to check the indices in the
# file are still there.
-printf '\033xindex-apropos\rlink\r\t\ri\t\030qq' >$pty_type
+printf '\033xindex-apropos\rlink\r\t\ri\t\030qq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/index-completing.sh b/macros/texinfo/texinfo/info/t/index-completing.sh
index 440e0cceaa..c0c579d894 100644
--- a/macros/texinfo/texinfo/info/t/index-completing.sh
+++ b/macros/texinfo/texinfo/info/t/index-completing.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f index-search
# Check that pressing tab to complete works for index search
-printf 'i\t\rDq' >$pty_type
+printf 'i\t\rDq' >&7
timeout_test
grep '^Node: Node 2' $ginfo_output
diff --git a/macros/texinfo/texinfo/info/t/index-long-nodeline.sh b/macros/texinfo/texinfo/info/t/index-long-nodeline.sh
index dfdad9f970..e883e5ecb9 100644
--- a/macros/texinfo/texinfo/info/t/index-long-nodeline.sh
+++ b/macros/texinfo/texinfo/info/t/index-long-nodeline.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -f split
# Follow an menu item from the index node to a node where physical lines
# don't match logical lines.
-printf 'gIndex\r\t\t\r\rDq' >$pty_type
+printf 'gIndex\r\t\t\r\rDq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/index-search.sh b/macros/texinfo/texinfo/info/t/index-search.sh
index 0ac4816f9f..6f211829cc 100644
--- a/macros/texinfo/texinfo/info/t/index-search.sh
+++ b/macros/texinfo/texinfo/info/t/index-search.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera
# Search in indices with 'virtual-index' command. Go down to index
# entry and select it.
-printf 'Ibc\r\016\016\016\016\016\016\016\016\016\rDq' >$pty_type
+printf 'Ibc\r\016\016\016\016\016\016\016\016\016\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/index.sh b/macros/texinfo/texinfo/info/t/index.sh
index a4d415ff11..121e45add1 100644
--- a/macros/texinfo/texinfo/info/t/index.sh
+++ b/macros/texinfo/texinfo/info/t/index.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera
# Follow an index entry
-printf 'iabc\rDq' >$pty_type
+printf 'iabc\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info b/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info
deleted file mode 100644
index 98b13aca7c..0000000000
--- a/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Indirect:
-split-in-subdir.info-1: 0
-split-in-subdir.info-2: 111
-
-Tag Table:
-(Indirect)
-Node: Top0
-Node: Second111
-Node: Target node214
-Node: Index320
-Node: Long nodeline567
-Ref: Anchor570
-
-End Tag Table
diff --git a/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info-1 b/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info-1
deleted file mode 100644
index d84b4f8b0e..0000000000
--- a/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info-1
+++ /dev/null
@@ -1,8 +0,0 @@
-
-File: split.info, Node: Top, Next: Second
-
-This is the Top node of split.info, contained in 'split.info-1.
-
-* Menu:
-
-* Second:: Node contained in 'split.info-2'
diff --git a/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info-2 b/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info-2
deleted file mode 100644
index 50fcdce8bb..0000000000
--- a/macros/texinfo/texinfo/info/t/infodir/subdir/split-in-subdir.info-2
+++ /dev/null
Binary files differ
diff --git a/macros/texinfo/texinfo/info/t/last-no-history.sh b/macros/texinfo/texinfo/info/t/last-no-history.sh
index 938026d5f9..3c49d35a01 100644
--- a/macros/texinfo/texinfo/info/t/last-no-history.sh
+++ b/macros/texinfo/texinfo/info/t/last-no-history.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera
# Try to go back in history when there is no earlier node
-printf lq >$pty_type
+printf lq >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/last-node-not-top-level.sh b/macros/texinfo/texinfo/info/t/last-node-not-top-level.sh
index a7625d0bbd..48dfd95887 100644
--- a/macros/texinfo/texinfo/info/t/last-node-not-top-level.sh
+++ b/macros/texinfo/texinfo/info/t/last-node-not-top-level.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -f last-node-not-top-level -v scroll-last-node=Top
# Wrap round to top node when last node does not have Top as Up
-printf ']]]Dq' >$pty_type
+printf ']]]Dq' >&7
timeout_test
grep 'Node: Top' $ginfo_output
diff --git a/macros/texinfo/texinfo/info/t/malformed-split.sh b/macros/texinfo/texinfo/info/t/malformed-split.sh
index a6e5b0a6cb..7180ee6979 100644
--- a/macros/texinfo/texinfo/info/t/malformed-split.sh
+++ b/macros/texinfo/texinfo/info/t/malformed-split.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2017-2018 Free Software Foundation, Inc.
+# Copyright (C) 2017-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
# Load a split file with a malformed or missing tag table.
run_ginfo --file malformed-split --node Two
-printf q >$pty_type
+printf q >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/menu-sequence.sh b/macros/texinfo/texinfo/info/t/menu-sequence.sh
index 37d3506a64..cf86a263a4 100644
--- a/macros/texinfo/texinfo/info/t/menu-sequence.sh
+++ b/macros/texinfo/texinfo/info/t/menu-sequence.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera
# M-x menu-sequence
-printf '\033xmenu-sequence\rfile-menu,first,no,nod\rDq' >$pty_type
+printf '\033xmenu-sequence\rfile-menu,first,no,nod\rDq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/multiple-completions.sh b/macros/texinfo/texinfo/info/t/multiple-completions.sh
index ef6104202f..86e6d6b549 100644
--- a/macros/texinfo/texinfo/info/t/multiple-completions.sh
+++ b/macros/texinfo/texinfo/info/t/multiple-completions.sh
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera
# Ask for completions multiple times, and then cancel. Check we went back
# to the original node.
-printf 'm\t\t\t\t\030\030Dq' >$pty_type
+printf 'm\t\t\t\t\030\030Dq' >&7
timeout_test
grep '^File: intera\.info, *Node: Top' $ginfo_output
diff --git a/macros/texinfo/texinfo/info/t/next-quoted.sh b/macros/texinfo/texinfo/info/t/next-quoted.sh
index 6d3d9d11da..9cc1ba7591 100644
--- a/macros/texinfo/texinfo/info/t/next-quoted.sh
+++ b/macros/texinfo/texinfo/info/t/next-quoted.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f quoting
# Go to a node with colons and commas in its name with "n"
-printf 'n\t\rDq' >$pty_type
+printf 'n\t\rDq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/no-file.sh b/macros/texinfo/texinfo/info/t/no-file.sh
index a119a4d4b4..22950e4c8c 100644
--- a/macros/texinfo/texinfo/info/t/no-file.sh
+++ b/macros/texinfo/texinfo/info/t/no-file.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/no-index.sh b/macros/texinfo/texinfo/info/t/no-index.sh
index 7f52b45816..12cb0f21ef 100644
--- a/macros/texinfo/texinfo/info/t/no-index.sh
+++ b/macros/texinfo/texinfo/info/t/no-index.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f sample
# Try to search in the indices when there aren't any
-printf 'ia\rq' >$pty_type
+printf 'ia\rq' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/node-no-file.sh b/macros/texinfo/texinfo/info/t/node-no-file.sh
index 048ab58eaf..59a5b72aed 100644
--- a/macros/texinfo/texinfo/info/t/node-no-file.sh
+++ b/macros/texinfo/texinfo/info/t/node-no-file.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/quoted-label-and-target.sh b/macros/texinfo/texinfo/info/t/quoted-label-and-target.sh
index 7567c1c3a6..bbbc99ae94 100644
--- a/macros/texinfo/texinfo/info/t/quoted-label-and-target.sh
+++ b/macros/texinfo/texinfo/info/t/quoted-label-and-target.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -f quoting
# Follow a cross-reference with both the label and destination quoted.
-printf '\t\t\t\r\t\rDq' >$pty_type &
+printf '\t\t\t\r\t\rDq' >&7 &
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/quoted-label-as-target.sh b/macros/texinfo/texinfo/info/t/quoted-label-as-target.sh
index f8ac2ae651..981c0c75b7 100644
--- a/macros/texinfo/texinfo/info/t/quoted-label-as-target.sh
+++ b/macros/texinfo/texinfo/info/t/quoted-label-as-target.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f quoting
# Follow a cross-reference to a node with colons and commas in its name
-printf '\t\r\t\rDq' >$pty_type
+printf '\t\r\t\rDq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/quoted-manual-in-label.sh b/macros/texinfo/texinfo/info/t/quoted-manual-in-label.sh
index 1a8cdcdde0..2d08ced482 100644
--- a/macros/texinfo/texinfo/info/t/quoted-manual-in-label.sh
+++ b/macros/texinfo/texinfo/info/t/quoted-manual-in-label.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2015-2018 Free Software Foundation, Inc.
+# Copyright (C) 2015-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f quoting
# Follow a cross-reference with a manual and quoted nodename in the label.
-printf '\t\t\t\t\t\r\t\rDq' >$pty_type
+printf '\t\t\t\t\t\r\t\rDq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/quoted-manual-in-target.sh b/macros/texinfo/texinfo/info/t/quoted-manual-in-target.sh
index 6ad4ba0656..97de7ef1e0 100644
--- a/macros/texinfo/texinfo/info/t/quoted-manual-in-target.sh
+++ b/macros/texinfo/texinfo/info/t/quoted-manual-in-target.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2015-2018 Free Software Foundation, Inc.
+# Copyright (C) 2015-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -f quoting
# Follow a cross-reference with a manual and quoted nodename in the target,
# after the colon.
-printf '\t\t\t\t\r\t\rDq' >$pty_type
+printf '\t\t\t\t\r\t\rDq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/quoted-target.sh b/macros/texinfo/texinfo/info/t/quoted-target.sh
index 25ce33649e..bf5bfa08b2 100644
--- a/macros/texinfo/texinfo/info/t/quoted-target.sh
+++ b/macros/texinfo/texinfo/info/t/quoted-target.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f quoting
# Follow a cross-reference to a node with colons and commas in its name
-printf '\t\t\r\t\r\Dq' >$pty_type
+printf '\t\t\r\t\r\Dq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/relative-path.sh b/macros/texinfo/texinfo/info/t/relative-path.sh
index 671835ea96..c9dea7c5f9 100644
--- a/macros/texinfo/texinfo/info/t/relative-path.sh
+++ b/macros/texinfo/texinfo/info/t/relative-path.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/relative-reference.sh b/macros/texinfo/texinfo/info/t/relative-reference.sh
index 3b2b793d07..2a62442395 100644
--- a/macros/texinfo/texinfo/info/t/relative-reference.sh
+++ b/macros/texinfo/texinfo/info/t/relative-reference.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@ srcdir=${srcdir:-.}
# Close window (so destination file will be forgotten), and do it again with
# the other window.
run_ginfo -f file-menu
-printf '\0302\t\t\t\r' >$pty_type
-printf '\030o\0301\t\t\t\rq' >$pty_type
+printf '\0302\t\t\t\r' >&7
+printf '\030o\0301\t\t\t\rq' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/replace-viewed.sh b/macros/texinfo/texinfo/info/t/replace-viewed.sh
index 12c841ec35..3dddbbc6ad 100644
--- a/macros/texinfo/texinfo/info/t/replace-viewed.sh
+++ b/macros/texinfo/texinfo/info/t/replace-viewed.sh
@@ -26,7 +26,7 @@ cp $t/infodir/sample.info t/replace-viewed.info
run_ginfo -f t/replace-viewed.info
# for debugging - show what node we got to
-printf 'D' >$pty_type
+printf 'D' >&7
# give ginfo time to load the node
sleep 1
@@ -37,8 +37,8 @@ rm -f t/replace-viewed.info
cp $t/infodir/sample.info t/replace-viewed.info
# Do a search. This triggers ginfo's internal garbage collection.
-printf '/what\r' >$pty_type
-printf q >$pty_type
+printf '/what\r' >&7
+printf q >&7
rm -f t/replace-viewed.info
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/resize-in-completions.sh b/macros/texinfo/texinfo/info/t/resize-in-completions.sh
index e827081f46..b16e2c6f26 100644
--- a/macros/texinfo/texinfo/info/t/resize-in-completions.sh
+++ b/macros/texinfo/texinfo/info/t/resize-in-completions.sh
@@ -21,12 +21,12 @@ srcdir=${srcdir:-.}
run_ginfo -f file-menu
-printf 'g\t' >$pty_type
+printf 'g\t' >&7
sleep 1 # Give ginfo time to process above keystrokes
kill -s WINCH $ginfo_pid
sleep 1 # Give ginfo time to process signal
# C-g to exit completions, q to quit
-printf '\007q' >$pty_type
+printf '\007q' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/search-after-tag.sh b/macros/texinfo/texinfo/info/t/search-after-tag.sh
index e48654fd0d..853446efd5 100644
--- a/macros/texinfo/texinfo/info/t/search-after-tag.sh
+++ b/macros/texinfo/texinfo/info/t/search-after-tag.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera -n Searching
# Search for text in a node that appears after an Info tag
-printf '/match\r\x06\x06\x06\x06\x06\x06\x06\x06\x06\x06\x06\rDq' >$pty_type
+printf '/match\r\x06\x06\x06\x06\x06\x06\x06\x06\x06\x06\x06\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/search-empty.sh b/macros/texinfo/texinfo/info/t/search-empty.sh
index e4e1b7b511..ccda3c6d26 100644
--- a/macros/texinfo/texinfo/info/t/search-empty.sh
+++ b/macros/texinfo/texinfo/info/t/search-empty.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera
# Search without specifying a search string, and check we don't crash.
-printf 's\rq' >$pty_type
+printf 's\rq' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/search-skip-screen.sh b/macros/texinfo/texinfo/info/t/search-skip-screen.sh
index e59d80c781..42ff1fcb7c 100644
--- a/macros/texinfo/texinfo/info/t/search-skip-screen.sh
+++ b/macros/texinfo/texinfo/info/t/search-skip-screen.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -v search-skip-screen=Off -f search
# Go back to previous match when search-skip-screen=On
-printf 'smatch\r}{Dq' >$pty_type
+printf 'smatch\r}{Dq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/search-split-after-index.sh b/macros/texinfo/texinfo/info/t/search-split-after-index.sh
index 569ddb664f..85f95cad28 100644
--- a/macros/texinfo/texinfo/info/t/search-split-after-index.sh
+++ b/macros/texinfo/texinfo/info/t/search-split-after-index.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2016-2018 Free Software Foundation, Inc.
+# Copyright (C) 2016-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
# Search for text in a split file after loading an index entry from the
# command-line.
run_ginfo -f split 'Link to node'
-printf '/node\r}}}}}q' >$pty_type
+printf '/node\r}}}}}q' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/spec-file-node.sh b/macros/texinfo/texinfo/info/t/spec-file-node.sh
index 70e121f9c3..b68f7787c0 100644
--- a/macros/texinfo/texinfo/info/t/spec-file-node.sh
+++ b/macros/texinfo/texinfo/info/t/spec-file-node.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/spec-menu.sh b/macros/texinfo/texinfo/info/t/spec-menu.sh
index f86300b78b..3787ca9f47 100644
--- a/macros/texinfo/texinfo/info/t/spec-menu.sh
+++ b/macros/texinfo/texinfo/info/t/spec-menu.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/spec-no-node.sh b/macros/texinfo/texinfo/info/t/spec-no-node.sh
index 49197c5c0b..0bca8cbac0 100644
--- a/macros/texinfo/texinfo/info/t/spec-no-node.sh
+++ b/macros/texinfo/texinfo/info/t/spec-no-node.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/split-file-menu.sh b/macros/texinfo/texinfo/info/t/split-file-menu.sh
index 03cdeaf552..a70da0ae6b 100644
--- a/macros/texinfo/texinfo/info/t/split-file-menu.sh
+++ b/macros/texinfo/texinfo/info/t/split-file-menu.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ run_ginfo -f split 'Second'
# Follow a menu entry in a split file to a node in a different subfile from
# the one containing "Top". Check that we arrived properly and remembered
# that we are in a split file by going back to "Top" with "t".
-printf tDq >$pty_type
+printf tDq >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/split-footnotes.sh b/macros/texinfo/texinfo/info/t/split-footnotes.sh
index 7edb75474b..a37b1ab2b2 100644
--- a/macros/texinfo/texinfo/info/t/split-footnotes.sh
+++ b/macros/texinfo/texinfo/info/t/split-footnotes.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera -n 'Node with footnotes' -v automatic-footnotes=On
# Move to automatic footnotes window and split it. Check we don't crash.
-printf '\030o\0302qqqq' >$pty_type
+printf '\030o\0302qqqq' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/split-index.sh b/macros/texinfo/texinfo/info/t/split-index.sh
index 6615c16093..b358f76b65 100644
--- a/macros/texinfo/texinfo/info/t/split-index.sh
+++ b/macros/texinfo/texinfo/info/t/split-index.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
# Follow an index entry in a split file
run_ginfo -f split
-printf 'ientry text\r\rDq' >$pty_type
+printf 'ientry text\r\rDq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/split.sh b/macros/texinfo/texinfo/info/t/split.sh
index 673c072609..ceb8c999e8 100644
--- a/macros/texinfo/texinfo/info/t/split.sh
+++ b/macros/texinfo/texinfo/info/t/split.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/star-note-non-whitespace.sh b/macros/texinfo/texinfo/info/t/star-note-non-whitespace.sh
index fbc68fe178..bb29fcc3f6 100644
--- a/macros/texinfo/texinfo/info/t/star-note-non-whitespace.sh
+++ b/macros/texinfo/texinfo/info/t/star-note-non-whitespace.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ run_ginfo -f intera -n 'Star note non-whitespace'
# Check that "*note" is not interpreted as a cross-reference marker if
# it is followed by a non-whitespace character.
-printf '\t\rDq' >$pty_type
+printf '\t\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/t/tab-argument.sh b/macros/texinfo/texinfo/info/t/tab-argument.sh
index e6c101f85f..03a43cabe3 100644
--- a/macros/texinfo/texinfo/info/t/tab-argument.sh
+++ b/macros/texinfo/texinfo/info/t/tab-argument.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera -n 'Argument to tab'
# C-u 2 TAB to go to second link
-printf '\0252\t\rDq' >$pty_type
+printf '\0252\t\rDq' >&7
timeout_test
diff $ginfo_output $t/node-target
diff --git a/macros/texinfo/texinfo/info/t/tab-no-xref.sh b/macros/texinfo/texinfo/info/t/tab-no-xref.sh
index fd8469624e..7646282bda 100644
--- a/macros/texinfo/texinfo/info/t/tab-no-xref.sh
+++ b/macros/texinfo/texinfo/info/t/tab-no-xref.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
run_ginfo -v scroll-last-node=Top -f no-xref.info
# Check that pressing tab in a file with no cross-references or menus
# doesn't cause an infinite loop
-printf '\tq' >$pty_type
+printf '\tq' >&7
timeout_test
cleanup
diff --git a/macros/texinfo/texinfo/info/t/tab-skip-node.sh b/macros/texinfo/texinfo/info/t/tab-skip-node.sh
index 1c61554d68..d69b1d92e2 100644
--- a/macros/texinfo/texinfo/info/t/tab-skip-node.sh
+++ b/macros/texinfo/texinfo/info/t/tab-skip-node.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ run_ginfo -f tab-skip-node
# when pressing tab, and then going back in the window history, goes
# back to the last node that was actually displayed, and not to the
# skipped node.
-printf '\t\t\tlDq' >$pty_type
+printf '\t\t\tlDq' >&7
timeout_test
grep 'Node: Top' $ginfo_output
diff --git a/macros/texinfo/texinfo/info/t/tab.sh b/macros/texinfo/texinfo/info/t/tab.sh
index e3c42b97cd..5f86fa463c 100644
--- a/macros/texinfo/texinfo/info/t/tab.sh
+++ b/macros/texinfo/texinfo/info/t/tab.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ srcdir=${srcdir:-.}
run_ginfo -f intera
# Tab to first link and follow it
-printf '\t\rDq' >$pty_type
+printf '\t\rDq' >&7
timeout_test
if test ! -f $ginfo_output; then
diff --git a/macros/texinfo/texinfo/info/t/where-dir-file.sh b/macros/texinfo/texinfo/info/t/where-dir-file.sh
index 8faa7d9ae9..b6fb510430 100644
--- a/macros/texinfo/texinfo/info/t/where-dir-file.sh
+++ b/macros/texinfo/texinfo/info/t/where-dir-file.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/macros/texinfo/texinfo/info/t/window-split-dir.sh b/macros/texinfo/texinfo/info/t/window-split-dir.sh
index 42f275e212..818ce2c67f 100644
--- a/macros/texinfo/texinfo/info/t/window-split-dir.sh
+++ b/macros/texinfo/texinfo/info/t/window-split-dir.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014-2018 Free Software Foundation, Inc.
+# Copyright (C) 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ srcdir=${srcdir:-.}
# Load dir node
run_ginfo
# Split it in two, go to the new window, and make it the only window.
-printf '\0302\030o\0301Dq' >$pty_type
+printf '\0302\030o\0301Dq' >&7
timeout_test
grep '^File: dir' $ginfo_output
diff --git a/macros/texinfo/texinfo/info/t/xref-across-lines-2.sh b/macros/texinfo/texinfo/info/t/xref-across-lines-2.sh
index 9fd0c5f02d..73a0b9b5d9 100644
--- a/macros/texinfo/texinfo/info/t/xref-across-lines-2.sh
+++ b/macros/texinfo/texinfo/info/t/xref-across-lines-2.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2017-2018 Free Software Foundation, Inc.
+# Copyright (C) 2017-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
run_ginfo -f intera -n "Xref target crosses lines 2"
-printf '\t\rDq' >$pty_type
+printf '\t\rDq' >&7
timeout_test
grep 'Node: target node two' $ginfo_output
diff --git a/macros/texinfo/texinfo/info/t/xref-across-lines.sh b/macros/texinfo/texinfo/info/t/xref-across-lines.sh
index 707247103b..24cf2d7ece 100644
--- a/macros/texinfo/texinfo/info/t/xref-across-lines.sh
+++ b/macros/texinfo/texinfo/info/t/xref-across-lines.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2015-2018 Free Software Foundation, Inc.
+# Copyright (C) 2015-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
run_ginfo -f intera -n 'Xref target crosses lines'
-printf '\t\rDq' >$pty_type
+printf '\t\rDq' >&7
timeout_test
diff $ginfo_output $t/node-target
diff --git a/macros/texinfo/texinfo/info/t/xref-to-anchor.sh b/macros/texinfo/texinfo/info/t/xref-to-anchor.sh
index 30394807c0..587b2b36ac 100644
--- a/macros/texinfo/texinfo/info/t/xref-to-anchor.sh
+++ b/macros/texinfo/texinfo/info/t/xref-to-anchor.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2015-2018 Free Software Foundation, Inc.
+# Copyright (C) 2015-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@ srcdir=${srcdir:-.}
run_ginfo -f xref_to_anchor
# Follow cross-reference to an anchor
-printf '\t\r' >$pty_type
+printf '\t\r' >&7
# Follow the cross-reference on the line after the anchor
-printf '\6\6\rDq' >$pty_type
+printf '\6\6\rDq' >&7
timeout_test
diff --git a/macros/texinfo/texinfo/info/termdep.h b/macros/texinfo/texinfo/info/termdep.h
index a73f36005c..94ecf8eda6 100644
--- a/macros/texinfo/texinfo/info/termdep.h
+++ b/macros/texinfo/texinfo/info/termdep.h
@@ -20,41 +20,14 @@
#ifndef INFO_TERMDEP_H
#define INFO_TERMDEP_H
-/* NeXT supplies <termios.h> but it is broken. Probably Autoconf should
- have a separate test, but anyway ... */
-#ifdef NeXT
-#undef HAVE_TERMIOS_H
-#endif
-
#ifdef HAVE_TERMIOS_H
# include <termios.h>
-#else
-# if defined (HAVE_TERMIO_H)
-# include <termio.h>
-# if defined (HAVE_SYS_PTEM_H)
-# if defined (M_UNIX) || !defined (M_XENIX)
-# include <sys/stream.h>
-# include <sys/ptem.h>
-# undef TIOCGETC
-# else /* M_XENIX */
-# define tchars tc
-# endif /* M_XENIX */
-# endif /* HAVE_SYS_PTEM_H */
-# else /* !HAVE_TERMIO_H */
-# ifndef __MINGW32__
-# include <sgtty.h>
-# endif
-# endif /* !HAVE_TERMIO_H */
-#endif /* !HAVE_TERMIOS_H */
+#endif
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
-#ifdef HAVE_SYS_TTOLD_H
-# include <sys/ttold.h>
-#endif /* HAVE_SYS_TTOLD_H */
-
#ifdef _WIN32
extern unsigned sleep (unsigned);
#endif
diff --git a/macros/texinfo/texinfo/info/terminal.c b/macros/texinfo/texinfo/info/terminal.c
index d3ef1640a2..e8b54497e1 100644
--- a/macros/texinfo/texinfo/info/terminal.c
+++ b/macros/texinfo/texinfo/info/terminal.c
@@ -170,7 +170,7 @@ output_character_function (int c)
static void
terminal_begin_using_terminal (void)
{
- RETSIGTYPE (*sigsave) (int signum);
+ void (*sigsave) (int signum);
/* Turn on mouse reporting. This is "normal tracking mode" supported by
xterm. The presence of the Km capability may not be a reliable way to
@@ -211,7 +211,7 @@ terminal_begin_using_terminal (void)
static void
terminal_end_using_terminal (void)
{
- RETSIGTYPE (*sigsave) (int signum);
+ void (*sigsave) (int signum);
/* Turn off mouse reporting ("normal tracking mode"). */
if (term_Km)
@@ -953,21 +953,6 @@ terminal_initialize_terminal (char *terminal_name)
else
ospeed = B9600;
}
-#else
-# if defined (TIOCGETP)
- {
- struct sgttyb sg;
-
- if (ioctl (fileno (stdout), TIOCGETP, &sg) != -1)
- ospeed = sg.sg_ospeed;
- else
- ospeed = B9600;
- }
-# else
-#ifndef __MINGW32__
- ospeed = B9600;
-#endif
-# endif /* !TIOCGETP */
#endif
term_cr = tgetstr ("cr", &buffer);
@@ -1069,39 +1054,8 @@ terminal_initialize_terminal (char *terminal_name)
#if defined (HAVE_TERMIOS_H)
struct termios original_termios, ttybuff;
-#else
-# if defined (HAVE_TERMIO_H)
-/* A buffer containing the terminal mode flags upon entry to info. */
-struct termio original_termio, ttybuff;
-# else /* !HAVE_TERMIO_H */
-/* Buffers containing the terminal mode flags upon entry to info. */
-int original_tty_flags = 0;
-int original_lmode;
-#ifndef __MINGW32__
-struct sgttyb ttybuff;
#endif
-# if defined(TIOCGETC) && defined(M_XENIX)
-/* SCO 3.2v5.0.2 defines but does not support TIOCGETC. Gak. Maybe
- better fix would be to use Posix termios in preference. --gildea,
- 1jul99. */
-# undef TIOCGETC
-# endif
-
-# if defined (TIOCGETC)
-/* A buffer containing the terminal interrupt characters upon entry
- to Info. */
-struct tchars original_tchars;
-# endif
-
-# if defined (TIOCGLTC)
-/* A buffer containing the local terminal mode characters upon entry
- to Info. */
-struct ltchars original_ltchars;
-# endif
-# endif /* !HAVE_TERMIO_H */
-#endif /* !HAVE_TERMIOS_H */
-
/* Prepare to start using the terminal to read characters singly. Return
0 if terminal is too dumb to run Info interactively. */
int
@@ -1125,14 +1079,7 @@ terminal_prep_terminal (void)
#if defined (HAVE_TERMIOS_H)
tcgetattr (tty, &original_termios);
tcgetattr (tty, &ttybuff);
-#else
-# if defined (HAVE_TERMIO_H)
- ioctl (tty, TCGETA, &original_termio);
- ioctl (tty, TCGETA, &ttybuff);
-# endif
-#endif
-#if defined (HAVE_TERMIOS_H) || defined (HAVE_TERMIO_H)
ttybuff.c_iflag &= (~ISTRIP & ~INLCR & ~IGNCR & ~ICRNL & ~IXON);
/* These output flags are not part of POSIX, so only use them if they
are defined. */
@@ -1157,10 +1104,7 @@ terminal_prep_terminal (void)
if (ttybuff.c_cc[VLNEXT] == '\026')
ttybuff.c_cc[VLNEXT] = -1;
#endif /* VLNEXT */
-#endif /* TERMIOS or TERMIO */
-/* cf. emacs/src/sysdep.c for being sure output is on. */
-#if defined (HAVE_TERMIOS_H)
/* linux kernel 2.2.x needs a TCOFF followed by a TCOON to turn output
back on if the user presses ^S at the very beginning; just a TCOON
doesn't work. --Kevin Ryde <user42@zip.com.au>, 16jun2000. */
@@ -1169,82 +1113,8 @@ terminal_prep_terminal (void)
tcflow (tty, TCOOFF);
tcflow (tty, TCOON);
# endif
-#else
-# if defined (HAVE_TERMIO_H)
- ioctl (tty, TCSETA, &ttybuff);
-# ifdef TCXONC
- ioctl (tty, TCXONC, 1);
-# endif
-# endif
#endif
-#if !defined (HAVE_TERMIOS_H) && !defined (HAVE_TERMIO_H) && !defined(__MINGW32__)
- ioctl (tty, TIOCGETP, &ttybuff);
-
- if (!original_tty_flags)
- original_tty_flags = ttybuff.sg_flags;
-
- /* Make this terminal pass 8 bits around while we are using it. */
-# if defined (PASS8)
- ttybuff.sg_flags |= PASS8;
-# endif /* PASS8 */
-
-# if defined (TIOCLGET) && defined (LPASS8)
- {
- int flags;
- ioctl (tty, TIOCLGET, &flags);
- original_lmode = flags;
- flags |= LPASS8;
- ioctl (tty, TIOCLSET, &flags);
- }
-# endif /* TIOCLGET && LPASS8 */
-
-# if defined (TIOCGETC)
- {
- struct tchars temp;
-
- ioctl (tty, TIOCGETC, &original_tchars);
- temp = original_tchars;
-
- /* C-s and C-q. */
- temp.t_startc = temp.t_stopc = -1;
-
- /* Often set to C-d. */
- temp.t_eofc = -1;
-
- /* If the a quit or interrupt character conflicts with one of our
- commands, then make it go away. */
- if (temp.t_intrc == '\177')
- temp.t_intrc = -1;
-
- if (temp.t_quitc == '\177')
- temp.t_quitc = -1;
-
- ioctl (tty, TIOCSETC, &temp);
- }
-# endif /* TIOCGETC */
-
-# if defined (TIOCGLTC)
- {
- struct ltchars temp;
-
- ioctl (tty, TIOCGLTC, &original_ltchars);
- temp = original_ltchars;
-
- /* Make the interrupt keys go away. Just enough to make people happy. */
- temp.t_lnextc = -1; /* C-v. */
- temp.t_dsuspc = -1; /* C-y. */
- temp.t_flushc = -1; /* C-o. */
- ioctl (tty, TIOCSLTC, &temp);
- }
-# endif /* TIOCGLTC */
-
-# ifndef __MINGW32__
- ttybuff.sg_flags &= ~ECHO;
- ttybuff.sg_flags |= CBREAK;
- ioctl (tty, TIOCSETN, &ttybuff);
-# endif
-#endif /* !HAVE_TERMIOS_H && !HAVE_TERMIO_H */
return 1;
}
@@ -1265,30 +1135,7 @@ terminal_unprep_terminal (void)
#if defined (HAVE_TERMIOS_H)
tcsetattr (tty, TCSANOW, &original_termios);
-#else
-# if defined (HAVE_TERMIO_H)
- ioctl (tty, TCSETA, &original_termio);
-# else /* !HAVE_TERMIO_H */
-# ifndef __MINGW32__
- ioctl (tty, TIOCGETP, &ttybuff);
- ttybuff.sg_flags = original_tty_flags;
- ioctl (tty, TIOCSETN, &ttybuff);
-# endif
-
-# if defined (TIOCGETC)
- ioctl (tty, TIOCSETC, &original_tchars);
-# endif /* TIOCGETC */
-
-# if defined (TIOCGLTC)
- ioctl (tty, TIOCSLTC, &original_ltchars);
-# endif /* TIOCGLTC */
-
-# if defined (TIOCLGET) && defined (LPASS8)
- ioctl (tty, TIOCLSET, &original_lmode);
-# endif /* TIOCLGET && LPASS8 */
-
-# endif /* !HAVE_TERMIO_H */
-#endif /* !HAVE_TERMIOS_H */
+#endif
terminal_end_using_terminal ();
}
diff --git a/macros/texinfo/texinfo/install-info/Makefile.in b/macros/texinfo/texinfo/install-info/Makefile.in
index c5fe31d223..c924509610 100644
--- a/macros/texinfo/texinfo/install-info/Makefile.in
+++ b/macros/texinfo/texinfo/install-info/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -410,6 +410,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -565,6 +566,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -632,11 +634,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -702,6 +706,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -722,6 +727,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -756,6 +762,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -770,6 +777,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -848,8 +856,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -865,14 +871,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -962,6 +967,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -995,6 +1001,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1007,6 +1014,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1025,6 +1033,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1128,6 +1137,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/install-info/install-info.c b/macros/texinfo/texinfo/install-info/install-info.c
index b1500e88cc..21f4fe3e5e 100644
--- a/macros/texinfo/texinfo/install-info/install-info.c
+++ b/macros/texinfo/texinfo/install-info/install-info.c
@@ -1434,12 +1434,12 @@ format_entry (char *name, size_t name_len, char *desc, size_t desc_len,
/* Name is too long to have description on the same line. */
if (desc_len > 1)
{
- strncat (outstr, "\n", 1);
+ strcat (outstr, "\n");
column = 0;
for (j = 0; j < calign - 1; j++)
{
column = adjust_column (column, ' ');
- strncat (outstr, " ", 1);
+ strcat (outstr, " ");
}
}
}
@@ -1449,7 +1449,7 @@ format_entry (char *name, size_t name_len, char *desc, size_t desc_len,
if (desc_len <= 2)
break;
column = adjust_column (column, ' ');
- strncat (outstr, " ", 1);
+ strcat (outstr, " ");
}
for (i = 0; i < desc_len; i++)
@@ -1505,11 +1505,11 @@ format_entry (char *name, size_t name_len, char *desc, size_t desc_len,
/* Found a blank. Don't output the part after it. */
logical_end++;
strncat (outstr, line_out, logical_end);
- strncat (outstr, "\n", 1);
+ strcat (outstr, "\n");
for (j = 0; j < align - 1; j++)
{
column = adjust_column (column, ' ');
- strncat (outstr, " ", 1);
+ strcat (outstr, " ");
}
/* Move the remainder to the beginning of the next
@@ -1538,7 +1538,7 @@ format_entry (char *name, size_t name_len, char *desc, size_t desc_len,
}
if (desc_len <= 2)
- strncat (outstr, "\n", 1);
+ strcat (outstr, "\n");
if (offset_out)
strncat (outstr, line_out, offset_out);
@@ -1621,9 +1621,9 @@ split_entry (const char *entry, char **name, size_t *name_len,
endptr--;
/* *ENDPTR is the 2nd last character */
if (*endptr == '.')
- strncat (*description, " ", 2);
+ strcat (*description, " ");
else if (!isspace (*endptr))
- strncat (*description, " ", 1);
+ strcat (*description, " ");
}
}
/* Or the description continues to the end of the string. */
@@ -1636,7 +1636,7 @@ split_entry (const char *entry, char **name, size_t *name_len,
}
}
/* Descriptions end in a new line. */
- strncat (*description, "\n", 1);
+ strcat (*description, "\n");
*description_len = strlen (*description);
}
diff --git a/macros/texinfo/texinfo/install-info/tests/Makefile.in b/macros/texinfo/texinfo/install-info/tests/Makefile.in
index 4a0509ba2f..e92f603108 100644
--- a/macros/texinfo/texinfo/install-info/tests/Makefile.in
+++ b/macros/texinfo/texinfo/install-info/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -495,6 +495,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -650,6 +651,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -717,11 +719,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -787,6 +791,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -807,6 +812,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -841,6 +847,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -855,6 +862,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -933,8 +941,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -950,14 +956,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1047,6 +1052,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1080,6 +1086,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1092,6 +1099,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1110,6 +1118,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1213,6 +1222,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/man/Makefile.in b/macros/texinfo/texinfo/man/Makefile.in
index 49398c27c4..d0d19a37f5 100644
--- a/macros/texinfo/texinfo/man/Makefile.in
+++ b/macros/texinfo/texinfo/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -324,6 +324,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -479,6 +480,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -546,11 +548,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -616,6 +620,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -636,6 +641,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -670,6 +676,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -684,6 +691,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -762,8 +770,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -779,14 +785,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = $(MAKEINFO_ENVIRIONMENT) $(PERL) "$(tpdir)"/texi2any.pl
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -876,6 +881,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -909,6 +915,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -921,6 +928,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -939,6 +947,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1042,6 +1051,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/man/info.1 b/macros/texinfo/texinfo/man/info.1
index 00906d9e0d..665cab64d3 100644
--- a/macros/texinfo/texinfo/man/info.1
+++ b/macros/texinfo/texinfo/man/info.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
-.TH INFO "1" "February 2019" "info 6.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
+.TH INFO "1" "September 2019" "info 6.7" "User Commands"
.SH NAME
info \- read Info documents
.SH SYNOPSIS
diff --git a/macros/texinfo/texinfo/man/install-info.1 b/macros/texinfo/texinfo/man/install-info.1
index d86aae3bf3..5ab6a96ee9 100644
--- a/macros/texinfo/texinfo/man/install-info.1
+++ b/macros/texinfo/texinfo/man/install-info.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
-.TH INSTALL-INFO "1" "February 2019" "install-info 6.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
+.TH INSTALL-INFO "1" "September 2019" "install-info 6.7" "User Commands"
.SH NAME
install-info \- update info/dir entries
.SH SYNOPSIS
diff --git a/macros/texinfo/texinfo/man/makeinfo.1 b/macros/texinfo/texinfo/man/makeinfo.1
index eb8c8fdd16..3b558a6664 100644
--- a/macros/texinfo/texinfo/man/makeinfo.1
+++ b/macros/texinfo/texinfo/man/makeinfo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
-.TH TEXI2ANY "1" "February 2019" "texi2any 6.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
+.TH TEXI2ANY "1" "September 2019" "texi2any 6.7" "User Commands"
.SH NAME
texi2any \- translate Texinfo documents
.SH SYNOPSIS
diff --git a/macros/texinfo/texinfo/man/texi2dvi.1 b/macros/texinfo/texinfo/man/texi2dvi.1
index fde8e58bba..96129015fe 100644
--- a/macros/texinfo/texinfo/man/texi2dvi.1
+++ b/macros/texinfo/texinfo/man/texi2dvi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
-.TH TEXI2DVI "1" "February 2019" "texi2dvi (GNU Texinfo 6.6)" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
+.TH TEXI2DVI "1" "September 2019" "texi2dvi (GNU Texinfo 6.7)" "User Commands"
.SH NAME
texi2dvi \- convert Texinfo documents to DVI or PDF
.SH SYNOPSIS
@@ -22,9 +22,6 @@ When invoked as `texi2pdf' or given the option \fB\-\-pdf\fR generate PDF output
Otherwise, generate DVI.
.SS "General options:"
.TP
-\fB\-b\fR, \fB\-\-batch\fR
-no interaction
-.TP
\fB\-D\fR, \fB\-\-debug\fR
turn on shell debugging (set \fB\-x\fR)
.TP
@@ -35,7 +32,7 @@ display this help and exit successfully
leave output in OFILE; only one input FILE is allowed
.TP
\fB\-q\fR, \fB\-\-quiet\fR
-no output unless errors (implies \fB\-\-batch\fR)
+no output unless errors
.TP
\fB\-v\fR, \fB\-\-version\fR
display version information and exit successfully
diff --git a/macros/texinfo/texinfo/man/texindex.1 b/macros/texinfo/texinfo/man/texindex.1
index f6d8c53330..291b75346c 100644
--- a/macros/texinfo/texinfo/man/texindex.1
+++ b/macros/texinfo/texinfo/man/texindex.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4.
-.TH TEXINDEX "1" "February 2019" "texindex 6.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
+.TH TEXINDEX "1" "September 2019" "texindex 6.7" "User Commands"
.SH NAME
texindex \- sort Texinfo index files
.SH SYNOPSIS
@@ -22,10 +22,10 @@ end option processing
Email bug reports to bug\-texinfo@gnu.org,
general questions and discussion to help\-texinfo@gnu.org.
.br
-Texinfo home page: http://www.gnu.org/software/texinfo/
+Texinfo home page: https://www.gnu.org/software/texinfo/
.SH COPYRIGHT
Copyright \(co 2019 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>
.br
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff --git a/macros/texinfo/texinfo/po/ChangeLog b/macros/texinfo/texinfo/po/ChangeLog
index 8340bc881c..8e8118d79e 100644
--- a/macros/texinfo/texinfo/po/ChangeLog
+++ b/macros/texinfo/texinfo/po/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-18 gettextize <bug-gnu-gettext@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.20.1.
+ * Rules-quot: Upgrade to gettext-0.20.1.
+ * en@boldquot.header: Upgrade to gettext-0.20.1.
+ * en@quot.header: Upgrade to gettext-0.20.1.
+ * insert-header.sin: Upgrade to gettext-0.20.1.
+ * remove-potcdate.sin: Upgrade to gettext-0.20.1.
+
2017-04-14 gettextize <bug-gnu-gettext@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.19.8.
diff --git a/macros/texinfo/texinfo/po/LINGUAS b/macros/texinfo/texinfo/po/LINGUAS
index a78ab0f16a..2102ea221f 100644
--- a/macros/texinfo/texinfo/po/LINGUAS
+++ b/macros/texinfo/texinfo/po/LINGUAS
@@ -2,7 +2,6 @@ ca
cs
da
de
-de_AT
el
eo
es
diff --git a/macros/texinfo/texinfo/po/Makefile.in.in b/macros/texinfo/texinfo/po/Makefile.in.in
index 38c293d2ed..fdb6ad3588 100644
--- a/macros/texinfo/texinfo/po/Makefile.in.in
+++ b/macros/texinfo/texinfo/po/Makefile.in.in
@@ -1,13 +1,14 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2000-2019 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved. This file is offered as-is,
# without any warranty.
#
-# Origin: gettext-0.19.8
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.20
+GETTEXT_MACRO_VERSION = 0.20
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -52,16 +53,13 @@ GMSGFMT_ = @GMSGFMT@
GMSGFMT_no = @GMSGFMT@
GMSGFMT_yes = @GMSGFMT_015@
GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
XGETTEXT_ = @XGETTEXT@
XGETTEXT_no = @XGETTEXT@
XGETTEXT_yes = @XGETTEXT_015@
XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
+MSGMERGE = @MSGMERGE@
MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
MSGINIT = msginit
MSGCONV = msgconv
MSGFILTER = msgfilter
@@ -93,17 +91,32 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
# Makevars gets inserted here. (Don't remove this line!)
.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
- @echo "$(MSGFMT) -c -o $@ $<"; \
- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
+.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
+
+# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs.
+# The GNU Coding Standards say in
+# <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>:
+# "GNU distributions usually contain some files which are not source files
+# ... . Since these files normally appear in the source directory, they
+# should always appear in the source directory, not in the build directory.
+# So Makefile rules to update them should put the updated files in the
+# source directory."
+# Therefore we put these files in the source directory, not the build directory.
+
+# During .po -> .gmo conversion, take into account the most recent changes to
+# the .pot file. This eliminates the need to update the .po files when the
+# .pot file has changed, which would be troublesome if the .po files are put
+# under version control.
+.po.gmo: $(srcdir)/$(DOMAIN).pot
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+ cd $(srcdir) && \
+ rm -f $${lang}.gmo && \
+ $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
+ $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+ mv t-$${lang}.gmo $${lang}.gmo && \
+ rm -f $${lang}.1po
.sin.sed:
sed -e '/^#/d' $< > t-$@
@@ -112,7 +125,7 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
all: all-@USE_NLS@
-all-yes: stamp-po
+all-yes: $(srcdir)/stamp-po
all-no:
# Ensure that the gettext macros and this Makefile.in.in are in sync.
@@ -126,24 +139,24 @@ CHECK_MACRO_VERSION = \
# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
# we don't want to bother translators with empty POT files). We assume that
# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
+# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target).
+
+# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS
+# have been loosely updated. Its purpose is that when a developer or translator
+# checks out the package from a version control system, and the $(DOMAIN).pot
+# file is not under version control, "make" will update the $(DOMAIN).pot and
+# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This
+# timestamp would not be necessary if updating the $(CATALOGS) would always
+# touch them; however, the rule for $(POFILES) has been designed to not touch
+# files that don't need to be changed.
+$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot
@$(CHECK_MACRO_VERSION)
test ! -f $(srcdir)/$(DOMAIN).pot || \
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
- echo "touch stamp-po" && \
- echo timestamp > stamp-poT && \
- mv stamp-poT stamp-po; \
+ echo "touch $(srcdir)/stamp-po" && \
+ echo timestamp > $(srcdir)/stamp-poT && \
+ mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \
}
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
@@ -159,11 +172,9 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
package_gnu="$(PACKAGE_GNU)"; \
test -n "$$package_gnu" || { \
if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
- LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
- -size -10000000c -exec grep 'GNU @PACKAGE@' \
- /dev/null '{}' ';' 2>/dev/null; \
+ LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
else \
- LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+ LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
fi; \
} | grep -v 'libtool:' >/dev/null; then \
package_gnu=yes; \
@@ -184,26 +195,29 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+ --add-comments=TRANSLATORS: \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
--msgid-bugs-address="$$msgid_bugs_address" \
+ $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
;; \
*) \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+ --add-comments=TRANSLATORS: \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
--package-name="$${package_prefix}@PACKAGE@" \
--package-version='@VERSION@' \
--msgid-bugs-address="$$msgid_bugs_address" \
+ $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
;; \
esac
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot-header; then \
sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
- cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
- rm -f $(DOMAIN).1po; \
+ cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \
+ rm -f $(DOMAIN).1po \
+ || exit 1; \
fi; \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -228,17 +242,19 @@ $(srcdir)/$(DOMAIN).pot:
# This target rebuilds a PO file if $(DOMAIN).pot has changed.
# Note that a PO file is not touched if it doesn't need to be changed.
$(POFILES): $(POFILESDEPS)
+ @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
if test -f "$(srcdir)/$${lang}.po"; then \
- test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
cd $(srcdir) \
- && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+ 0.1[6-7] | 0.1[6-7].*) \
+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
*) \
- $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
esac; \
}; \
else \
@@ -373,28 +389,30 @@ check: all
info dvi ps pdf html tags TAGS ctags CTAGS ID:
+install-dvi install-ps install-pdf install-html:
+
mostlyclean:
rm -f remove-potcdate.sed
- rm -f stamp-poT
+ rm -f $(srcdir)/stamp-poT
rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
rm -fr *.o
clean: mostlyclean
distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo
+ rm -f Makefile Makefile.in POTFILES
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
- rm -f stamp-po $(GMOFILES)
+ rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES)
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir:
test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
+dist2: $(srcdir)/stamp-po $(DISTFILES)
dists="$(DISTFILES)"; \
if test "$(PACKAGE)" = "gettext-tools"; then \
dists="$$dists Makevars.template"; \
@@ -439,13 +457,15 @@ update-po: Makefile
tmpdir=`pwd`; \
echo "$$lang:"; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
$(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+ 0.1[6-7] | 0.1[6-7].*) \
+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
*) \
- $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
esac; \
}; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
diff --git a/macros/texinfo/texinfo/po/Makevars b/macros/texinfo/texinfo/po/Makevars
index 927b92f581..c57675aa8f 100644
--- a/macros/texinfo/texinfo/po/Makevars
+++ b/macros/texinfo/texinfo/po/Makevars
@@ -21,6 +21,11 @@ XGETTEXT_OPTIONS = \
-k__nx:1,2\
-k__xn:1,2\
-kN__\
+ -kline_error:1 \
+ -kline_warn:1 \
+ -kcommand_error:2 \
+ -kcommand_warn:2 \
+ -kline_error_ext:3
--flag=error:1:c-format\
--flag=warning:1:c-format\
--flag=fatal:1:c-format\
diff --git a/macros/texinfo/texinfo/po/POTFILES.in b/macros/texinfo/texinfo/po/POTFILES.in
index 2bb9020dd3..9fbf9bbeb0 100644
--- a/macros/texinfo/texinfo/po/POTFILES.in
+++ b/macros/texinfo/texinfo/po/POTFILES.in
@@ -47,3 +47,27 @@ tp/init/chm.pm
tp/init/latex2html.pm
tp/init/tex4ht.pm
tp/texi2any.pl
+tp/Texinfo/XS/parsetexi/api.c
+tp/Texinfo/XS/parsetexi/close.c
+tp/Texinfo/XS/parsetexi/commands.c
+tp/Texinfo/XS/parsetexi/conf.c
+tp/Texinfo/XS/parsetexi/context_stack.c
+tp/Texinfo/XS/parsetexi/convert.c
+tp/Texinfo/XS/parsetexi/counter.c
+tp/Texinfo/XS/parsetexi/debug.c
+tp/Texinfo/XS/parsetexi/def.c
+tp/Texinfo/XS/parsetexi/element_types.c
+tp/Texinfo/XS/parsetexi/end_line.c
+tp/Texinfo/XS/parsetexi/errors.c
+tp/Texinfo/XS/parsetexi/extra.c
+tp/Texinfo/XS/parsetexi/handle_commands.c
+tp/Texinfo/XS/parsetexi/indices.c
+tp/Texinfo/XS/parsetexi/input.c
+tp/Texinfo/XS/parsetexi/labels.c
+tp/Texinfo/XS/parsetexi/macro.c
+tp/Texinfo/XS/parsetexi/menus.c
+tp/Texinfo/XS/parsetexi/multitable.c
+tp/Texinfo/XS/parsetexi/parser.c
+tp/Texinfo/XS/parsetexi/separator.c
+tp/Texinfo/XS/parsetexi/text.c
+tp/Texinfo/XS/parsetexi/tree.c
diff --git a/macros/texinfo/texinfo/po/Rules-quot b/macros/texinfo/texinfo/po/Rules-quot
index baf652858a..18c024bf45 100644
--- a/macros/texinfo/texinfo/po/Rules-quot
+++ b/macros/texinfo/texinfo/po/Rules-quot
@@ -1,5 +1,9 @@
-# This file, Rules-quot, can be copied and used freely without restrictions.
# Special Makefile rules for English message catalogs with quotation marks.
+#
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# This file, Rules-quot, and its auxiliary files (listed under
+# DISTFILES.common.extra1) are free software; the Free Software Foundation
+# gives unlimited permission to use, copy, distribute, and modify them.
DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
diff --git a/macros/texinfo/texinfo/po/ca.gmo b/macros/texinfo/texinfo/po/ca.gmo
index 887b0889a2..2bc90cbf6e 100644
--- a/macros/texinfo/texinfo/po/ca.gmo
+++ b/macros/texinfo/texinfo/po/ca.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/ca.po b/macros/texinfo/texinfo/po/ca.po
index 3c32bd3a24..88669736c3 100644
--- a/macros/texinfo/texinfo/po/ca.po
+++ b/macros/texinfo/texinfo/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 6.1.92\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2016-12-30 07:10+0100\n"
"Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -24,26 +24,31 @@ msgstr "Error desconegut de sistema"
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: l'opció '%s' és ambigua\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: l'opció '%s' és ambigua; possibilitats:"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: opció no reconeguda '%c%s'\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: l'opció '%c%s' no permet un argument\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: l'opció '--%s' requereix un argument\n"
@@ -241,7 +246,6 @@ msgid "Insert completion"
msgstr "Insereix el suggeriment per completar"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "S'estan construint les opcions de completar..."
@@ -265,7 +269,6 @@ msgid "found file %s"
msgstr "s'ha trobat el fitxer %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "No s'han pogut mostrar les notes a peu de pàgina"
@@ -280,7 +283,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Notes a peu de pàgina ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "S'estan buscant les entrades d'índex..."
@@ -289,7 +291,8 @@ msgid "Look up a string in the index for this file"
msgstr "Busca una cadena de caràcters a l'index per a aquest fitxer"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "No s'ha trobat cap índex"
@@ -298,7 +301,6 @@ msgid "Index entry: "
msgstr "Entrada d'índex: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "No s'ha trobat cap índex"
@@ -316,17 +318,20 @@ msgstr ""
"\\[index-search]'"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "No hi ha una cadena prèvia de caràcters de cerca d'índex"
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No more index entries containing '%s'."
msgid "No more index entries containing '%s'"
msgstr "No hi ha més entrades d'índex que continguin `%s'."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No index entries containing '%s'."
msgid "No index entries containing '%s'"
msgstr "No hi ha entrades d'índex que continguin `%s'."
@@ -375,27 +380,32 @@ msgstr "No hi ha entrades d'índex que continguin `%s'."
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have '%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "Cap dels fitxers info disponibles tenen `%s' als seus índexs."
#: info/info-utils.c:878
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Error converting file character encoding."
msgid "Error converting file character encoding"
msgstr ""
"S'ha produït un error en la conversió la codificació de caràcters del fitxer."
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item '%s' in node '%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "No hi ha un element de menú `%s' al node `%s'."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node '%s'."
msgid "Cannot find node '%s'"
msgstr "No es pot trobar el node `%s'."
#: info/info.c:437
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No program name given."
msgid "No program name given"
msgstr "No s'ha donat un nom de programa."
@@ -424,7 +434,7 @@ msgstr "el valor %s no és vàlid per a la variable %s"
msgid "Try --help for more information.\n"
msgstr "Proveu --help per a més informació.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -458,6 +468,14 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -a, --all use all matching manuals.\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILE remember user keystrokes in FILENAME.\n"
+#| " -f, --file=MANUAL specify Info manual to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -476,6 +494,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILE output selected nodes to FILE."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -495,12 +518,22 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr ""
" -b, --speech-friendly sigues amigable amb els sintetitzadors de veu."
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --strict-node-location (for debugging) use Info file pointers as-"
+#| "is.\n"
+#| " --subnodes recursively output menu items.\n"
+#| " -v, --variable VAR=VALUE assign VALUE to Info variable VAR.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file.\n"
+#| " -x, --debug=NUMBER set debugging level (-1 for all).\n"
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -547,6 +580,21 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers select buffers menu entry in emacs manual\n"
+#| " info emacs -n Files start at Files node within emacs manual\n"
+#| " info '(emacs)Files' alternative way to start at Files node\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -581,7 +629,7 @@ msgstr ""
"sencer a sortida.txt\n"
" info -f ./bla.info mostra el fitxer ./bla.info, sense buscar a dir"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -593,6 +641,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node '(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "No es pot trobar el node '(%s)%s'."
@@ -606,61 +655,73 @@ msgstr "El punt no apareix dins del node d'aquesta finestra!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "No es pot eliminar l'última finestra."
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "No hi ha un menú a aquest node."
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "No hi ha notes a peu de pàgina a aquest node."
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "No hi ha referències creuades a aquest node."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No '%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "No hi ha un punter '%s' per a aquest node."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command '%c'; try '?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "Ordre `%c' d'Info desconeguda; proveu `?' per a ajuda."
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type '%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "La terminal tipus `%s' no és prou intel·ligent per executar Info."
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "Ja esteu a l'última pàgina d'aquest node."
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "Ja esteu a la primera pàgina d'aquest node."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "Sols una finestra."
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "La finestra resultant seria massa petita."
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr ""
"No hi ha prou espai per a una finestra d'ajuda, si us plau elimineu una "
@@ -868,6 +929,7 @@ msgstr "Descriu la tecla: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s no està definit"
@@ -886,11 +948,13 @@ msgstr "'%s' no està en cap tecla"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s es pot invocar únicament via %s."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s es pot invocar via %s."
@@ -905,17 +969,14 @@ msgid "could not open init file %s"
msgstr "no s'ha pogut llegir el fitxer d'inicialització %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "seqüència de tecles massa llarga"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "seqüència de tecles absent"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "el caràcter NUL (\\000) no està permès"
@@ -925,12 +986,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "el caràcter NUL (^%c) no està permès"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "nom absent d'acció "
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "no es pot associar la seqüència de tecles al dígit de menú"
@@ -940,7 +999,6 @@ msgid "unknown action `%s'"
msgstr "acció desconeguda `%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nom d'acció massa llarg"
@@ -950,22 +1008,18 @@ msgid "extra characters following action `%s'"
msgstr "hi ha caràcters extra a continuació de l'acció `%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "nom absent de variable"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "`=' absent immediatament després del nom de la variable"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nom de la variable massa llarg"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "valor massa llarg"
@@ -987,7 +1041,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Llegeix un nom d'ordre a l'àrea d'eco i executa-la"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an 'echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "No es pot executar una ordre 'echo-area' aquí."
@@ -1072,7 +1127,6 @@ msgid "Show all matching files"
msgstr "Mostra tots els fitxers que concordin"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "No hi ha un índex de fitxer"
@@ -1225,6 +1279,8 @@ msgstr "Selecciona aquest element de menú"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There isn't %d item in this menu."
+#| msgid_plural "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "No hi ha l'element %d a aquest menú."
@@ -1254,6 +1310,7 @@ msgstr "Segueix xref: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "La referència ha desaparegut! (%s)."
@@ -1290,11 +1347,13 @@ msgstr ""
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node '%s'."
msgid "No menu in node '%s'"
msgstr "No hi ha un menú al node '%s'."
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by '%s' in '%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "No s'ha pogut trobar el node referenciat per '%s' a '%s'."
@@ -1332,11 +1391,13 @@ msgstr "Selecciona el primer node a aquest fitxer"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "No hi ha més nodes dins d'aquest document."
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No 'Prev' or 'Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "No hi ha `Previ' o `Amunt' per a aquest node dins d'aquest document."
@@ -1390,7 +1451,6 @@ msgid "Select the most recently selected node"
msgstr "Selecciona el node seleccionat més recentment"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "No hi ha un node anterior a la història"
@@ -1404,11 +1464,13 @@ msgstr "Troba el fitxer: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find '%s'."
msgid "Cannot find '%s'"
msgstr "No es pot trobar '%s'."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file '%s'."
msgid "Could not create output file '%s'"
msgstr "No s'ha pogut crear el fitxer de sortida '%s'."
@@ -1433,6 +1495,7 @@ msgstr "Passa els continguts d'aquest node a través d'INFO_PRINT_COMMAND"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to '%s'."
msgid "Cannot open pipe to '%s'"
msgstr "No es pot obrir el conducte a '%s'."
@@ -1451,22 +1514,26 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Commuta l'ús d'expressions regulars a les cerques"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Using regular expressions for searches"
msgstr "S'estan usant les expressions regular per a les cerques."
#: info/session.c:3909
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches."
msgid "Using literal strings for searches"
msgstr "S'estan usant cadenes literals de caràcters per a les cerques."
#: info/session.c:4112
#, fuzzy
+#| msgid "Search continued from the end of the document."
msgid "Search continued from the end of the document"
msgstr "Es continuarà la cerca des del final del document."
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the beginning of the document."
msgid "Search continued from the beginning of the document"
msgstr "Es continuarà la cerca des del principi del document."
@@ -1475,8 +1542,9 @@ msgstr "Es continuarà la cerca des del principi del document."
msgid "Searching subfile %s ..."
msgstr "S'està buscant el subfitxer %s..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "La cerca ha fallat."
@@ -1510,143 +1578,146 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "La cadena de caràcters de cerca és massa curta"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Es retornarà a l'última concordança des de %s"
-#: info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "No more matches."
msgid "No more matches"
msgstr "No hi ha més concordances"
-#: info/session.c:4578
+#: info/session.c:4581
#, fuzzy
+#| msgid "Search this node and subnodes for a string."
msgid "Search this node and subnodes for a string"
msgstr "Cerca aquest node i subnodes per una cadena de caràcters."
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "S'està buscant el subfitxer %s..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Ves a la concordança següent del subarbre Info"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "No hi ha cap cerca activa"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Ves a la concordança anterior al subarbre Info"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr ""
"Llegeix una cadena de caràcters i busca-la respectant majúscules i minúscules"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Llegeix una cadena de caràcters i busca-la"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Llegeix una cadena de caràcters i busca cap endarrere per ella"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Repeteix l'última cerca en la mateixa direcció"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "No hi ha una cadena de caràcters de cerca prèvia"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Repeteix l'última cerca en la direcció inversa"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Neteja les concordances mostrades de cerca"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr ""
"Cerca interactivament per una cadena de caràcters a mesura que l'escriviu"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "I-cerca l'expressió regular cap endarrere: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-cerca cap endarrere: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "I-cerca l'expressió regular: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-cerca: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Està fallant "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Cancel·la l'operació actual"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Surt"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Mostra la informació de versió de l'Info que s'està executant"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info versió %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Torna a dibuixar la pantalla"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Surt d'Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Executa l'ordre lligada a la variant minúscula d'aquesta tecla"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "Ordre desconeguda (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" no és vàlid"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "'%s' no és vàlid"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Afegeix aquest dígit a l'argument numèric actual"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Inicia (o multiplica per 4) l'argument numèric actual"
@@ -2016,12 +2087,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: no s'ha pogut llegir (%s) i no s'ha pogut crear (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY sense END-INFO-DIR-ENTRY concordant"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY sense START-INFO-DIR-ENTRY concordant"
@@ -2051,13 +2120,11 @@ msgid "excess command line argument `%s'"
msgstr "argument `%s' excessiu de línia d'ordres"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"No s'ha especificat fitxer d'entrada: proveu --help per a més informació."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "No s'ha especificat un fitxer dir: proveu --help per a més informació."
@@ -2076,25 +2143,25 @@ msgstr "no hi ha una entrada de directori info a `%s'"
msgid "no entries found for `%s'; nothing deleted"
msgstr "no s'han trobat entrades per a `%s'; no s'ha esborrat res"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "no s'ha pogut obrir %s per escriure: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"moveu la vostre ordre @contents si voleu els continguts després de la pàgina "
"de títol"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2102,283 +2169,240 @@ msgstr ""
"moveu les vostres ordres @shortcontents i @contents si voleu els continguts "
"després de la pàgina de títol"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s no és un codi vàlid"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s no es un codi vàlid de regió"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s no és una possibilitat vàlida de divisió"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "no s'ha pogut llegir %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "error en tancar fitxer @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: no s'ha pogut trobar %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "no hi ha un node a reanomenar"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "hi ha nodes sense un nom nou al final del fitxer"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "no s'ha pogut obrir %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "no s'ha pogut protegir el caràcter coixinet a @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "nom de node buit després d'expansió `%s'"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s `%s' definit prèviament"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "aquí està la definició prèvia de @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "argument buit a @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: la sortida és incompatible amb la divisió"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "error en tancar %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "no s'ha pogut crear els directoris `%s' o `%s': %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "no s'ha pogut crear el directory `%s': %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "no s'ha trobar el fitxer @image `%s', s'usarà `%s'"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "no s'ha especificat un argument per a @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "no s'ha trobat el fitxer @image `%s' (for HTML), s'usarà `%s'"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "el format en cru %s no es convertirà"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
"no s'ha pogut obrir el fitxer de configuració de referències html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "tipus que falta"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "tipus no reconegut: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "error en tancar el fitxer de configuració de referències html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "la cadena de caràcters no està tancada al fitxer css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include ha finalitzat en un comentari"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import no ha acabat a un fitxer css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "No s'ha trobat el fitxer CSS %s"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "no s'ha pogut obrir --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "error en tancar el fitxer CSS %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "no s'ha trobat una entrada htmlxref.cnf per a `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "error en tancar el fitxer marc %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "error en tancar el fitxer marc taula de continguts %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "ha fallat el gestor %s de l'etapa %s amb prioritat %s"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "heu d'especificar un títol amb una ordre de títol o @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "error en tancar el fitxer de node de redirecció %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "el nom antic per a `%s' és un node del document"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "el fitxer està buit per al node reanomenat `%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "el node destí (nou nom per a `%s') no està al document: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "error en tancar el fitxer reanomenat de node de redirecció %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "nom buit de node"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "sintaxi per a un node extern usat per a `%s'"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "document sense nodes"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "document sense node Amunt"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "reanomena %s ha fallat: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s sortida més d'un cop: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s fora de qualsevol node"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "el nom de @node no ha de contenir `,': %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "L'entrada d'índex a @%s amb : productio Info invàlid: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "l'entrada per a l'índex `%s' està fora de qualsevol node"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "error en tancar el fitxer de text d'imatge %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "fitxer @image `%s' no llegible: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
"no s'ha pogut trobar el fitxer @image `%s.txt' i tampoc un text alternatiu"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2386,302 +2410,328 @@ msgstr ""
"@strong{Note...} produeix una referencia creuada espúria a Info; reformula-"
"ho per evitar això"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "el nom @%s de referència creuada no hauria de contenir `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "el nom de node @%s no hauria de contenir `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "el nom de node @%s no hauria de contenir `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' o `,' ha de seguir a @xref, no %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "`.' or `,' ha de seguir a @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "el nom de node d'entrada de menú no hauria de contenir `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "el nom de node d'entrada de menú no hauria de contenir `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "el nom d'entrada de menú no hauria de contenir `:'"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "no s'ha pogut obrir %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "@%s múltiple"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "argument formal @%s incorrecte o buit: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "sintaxi incorrecta per a argument @%s: %s "
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s requereix un nom"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "nom incorrecte per a @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s vist abans @%s claudàtor de tancada"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s vist abans @%s claudàtor de tancada"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s claudàtor de tancada que falta"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s seqüència de delimitació de tancada que falta: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx no hauria de començar @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx ha de seguir @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s té text però no @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' esperava `%s', però ha vist `%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "s'ha vist @%s abans de @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "no hi ha `%cend %s' concordant"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "%c fora de lloc"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "`%c%s' no concordat"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "el macro `%s' s'ha cridat amb massa arguments"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s claudàtor de tancada que falta"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "el macro `%s' s'ha declarat sense un argument cridat amb un argument"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ a expansió @%s seguida de `%s' en comptes del nom de paràmetre o \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "nom que falta per a @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "categoria que falta per a @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "argument inesperat sobre @%s a la línia: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "multitaula buida"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "argument superflu a @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "argument incorrecte a @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s requereix un argument: el formatejador per a %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"l'ordre @%s que no està acceptant un argument en claudàtor no hauria de "
"estar a la línia @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "l'ordre d'accent `@%s' no està permesa com argument @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s argument que falta"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "@end desconegut %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "argument superflu a @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "argument incorrecte a @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: no s'ha pogut obrir %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "la codificació `%s' no és una codificació de texinfo canònica"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nom `%s' de codificació no reconegut"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s després del primer element"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s sols té sentit a una línia @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@%s should not be associated with @top"
+msgid "@part should not be associated with @top"
+msgstr "@%s no hauria d'estar associat amb @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
"@node precedeix @%s, però les parts no haurien d'estar associades amb nodes"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "sintaxi per a un node extern usat per a `%s'"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "nom buit d'entrada de menú a `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "nom buit de node a entrada de menú"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s no hauria d'aparèixer a @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s hauria d'aparèixer únicament a un principi de línia"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "el macro `%s' ha estat definit prèviament"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "aquí està la definició prèvia de `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "s'està redefinint l'ordre de llenguatge Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s sense un caràcter associat"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr "@%s definit amb zero o més d'un argument hauria de ser invocat amb {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2689,344 +2739,360 @@ msgstr ""
"la crida de macro està niuada massa profundament (establiu MAX_NESTED_MACROS "
"per anul·lar-ho: el valor actual és %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"no està permès la crida recursiva del macro %s; useu @rmacro si es necessita"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "l'ordre d'accent `@%s' no ha de ser seguida per espai en blanc"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "useu claudàtors per donar una ordre com argument per a @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s espera `i' o `j' com argument, no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "l'ordre d'accent `@%s' no ha de ser seguida per una línia nova"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s esperava claudàtors"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "ordre `%s' desconeguda"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "etiqueta no definida: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "sintaxi incorrecta per a @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s és obsolet."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s és obsolet; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s hauria d'aparèixer únicament a un començament de línia"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s hauria d'aparèixer únicament a la capçalera o al peu"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s no té sentit dins d'un bloc `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s a una multitaula buida"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab abans de @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "massa columnes a element multitaula (max %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "s'ignorarà @tab fora d'una multitaula"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s fora d'una taula o una llista"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s no està permès dins d'un bloc `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear in math context"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s no hauria d'aparèixer a un context de matemàtiques"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "ha d'estar a darrera de `@%s' per usar `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s no té sentit fora d'entorns `@titlepage' i `@quotation'"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory després del primer node"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "no es permet una regió %s dins d'una regió %s"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry després del primer node"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "s'ha vist @%s abans del primer @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"potser el vostre node @top hauria d'estar envoltat dins de @ifnottex and "
"comptes de @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s no hauria d'aparèixer a un context de matemàtiques"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s no hauria d'aparèixer a un context de matemàtiques"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "@ no esperat"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s no té sentit fora d'un entorn `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s hauria de estar just a sota de `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "s'ignoraran @%s múltiples"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "l'ordre @%s no accepta arguments"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "a l'ordre @%s li falta un node o un argument manual extern"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "a @%s nom buit de referència creuada després de l'expansió `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "a @%s títol buit de referència creuada després de l'expansió `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "argument de nom de fitxer que falta a @image"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "primer argument que falta a @%s"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "digits que no són hex a l'argument de @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "menys de quatre dígits hex a l'argument per a @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "l'argument per a @U excedeix al máxim d'Unicode 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "arguments superflus per a node"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "s'esperava @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s hauria d'acceptar únicament una ordre amb @ com argument, no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "argument restant a la línia @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "ordre d'entorn %s com argument per a @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "@%s buit"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "la fracció de columna no és un número: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "argument @sp ha de ser numèric, no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "nom d'índex reservat %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "índex desconegut de font a @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "índex desconegut de destinació a @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s porta a una fusió de %s en sí mateix, s'ignorarà"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "índex desconegut `%s' a @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, fuzzy, c-format, perl-format
+#| msgid "printing an index `%s' merged in another one `%s'"
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "s'està imprimint un índex `%s' fusionat en un altre `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex abans del principi del document: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "l'argument de @%s ha de ser `top' o `bottom', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Sols se suporta @%s 10 o 11, no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "l'argument de @%s ha de ser `separate' o `end', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "l'argument @%s ha de ser `on', `off' o `odd', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "l'argument @paragraphindent ha de ser numèric/`none'/`asis', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "l'argument @firstparagraphindent ha de ser `none' o `insert', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "l'argument @exampleindent ha de ser numèric/`asis', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "s'esperava @%s activat o desactivat, no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"l'argument de @kbdinputstyle ha de ser `code'/`example'/`distinct', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "l'argument de @allowcodebreaks ha de ser `true' o `false', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"l'argument de @urefbreakstyle ha de ser `after'/`before'/`none', no `%s'"
@@ -3058,7 +3124,7 @@ msgstr "no hi ha una ordre de secció associada amb @%s"
msgid "@%s not empty"
msgstr "@%s no buit"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "referència @%s a node no existent `%s'"
@@ -3068,110 +3134,110 @@ msgstr "referència @%s a node no existent `%s'"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s el nom de node d'entrada `%s' és diferent de %s amb nom `%s'"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "node sense referenciar `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
"el node `%s' és %s per a `%s' a la determinació de seccions però no al menú"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
"el node %s `%s' al menú `%s' i en el procediment de seccions `%s' difereixen"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "el node `%s' és %s per a `%s' al menú però no a les seccions"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s punter `%s' (per al node `%s') diferent de %s nom `%s'"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s referència per a `%s' inexistent"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"al node `%s' li falta l'element de menú per a `%s' malgrat que és el seu "
"destí Amunt"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "per a `%s', amunt al menú `%s' i amunt `%s' no concorden"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s a `%s', diferent de %s nom `%s'"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "clau buida d'índex a @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: no es pot obrir %s per a escripture: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: error en tancar %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: no s'ha pogut obrir el fitxer latex %s per a escriptura: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: el directori L2H_TMP conté un punt"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: el directori actual conté un punt"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: l'ordre no ha tingut èxit: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: la imatge té una extensió no vàlida: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: reanomenar %s com %s ha fallat: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: no s'ha pogut obrir %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
"latex2html.pm: no s'ha trobat el final de l'element @%s no s'ha trobat %d"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3180,12 +3246,12 @@ msgstr ""
"latex2html.pm: el processament va produir %d elements en HTML; s'esperava "
"%d, el nombre d'elements trobat al document"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: no s'ha pogut determinar el fragment %d per a @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3194,47 +3260,47 @@ msgstr ""
"l2h: no s'ha pogut extraure el fragment %d per a @%s amb comptador de "
"sortida %d de HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: no s'ha pogut carregar %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: no s'ha pogut obrir %s per a escriptura: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: no s'ha pogut obrir %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: ha fallat chdir %s: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: no s'ha pogut retornar al directori inicial: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: falta el fitxer de sortida: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: ha fallat l'ordre: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: no s'ha trobat el final de %s element %d"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3243,12 +3309,12 @@ msgstr ""
"tex4ht.pm: el processament va produir %d element en HTML; s'esperava %d, el "
"nombre d'element trobats al document per a @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: la sortida no té element HTML per a @%s: %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3257,37 +3323,37 @@ msgstr ""
"tex4ht.pm: el processament va recuperar %d elements en HTML; s'esperava %d, "
"el nombre d'elements trobats al document per @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "error en carregar %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: variable desconeguda %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: variable desconeguda %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "no s'ha pogut llegir el fitxer d'inicialització %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "s'ignorarà l'ordre no reconeguda TEXINFO_OUTPUT_FORMAT valor `%s'\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Ús: %s [OPCIÓ]... FITXER-TEXINFO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3303,7 +3369,7 @@ msgstr ""
"el comportament és idèntic, i no depèn del nom instal·lat.\n"
"\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3343,7 +3409,7 @@ msgstr ""
" -v, --verbose explica el que es fa.\n"
" --version mostra la informació de versió i surt.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3363,7 +3429,7 @@ msgstr ""
" després de verificar la validesa de FITXER-"
"TEXINFO.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3415,7 +3481,7 @@ msgstr ""
" En cas contrari, DEST anomena el fitxer de "
"sortida.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3457,7 +3523,7 @@ msgstr ""
" --split-size=NUM divideix els fitxers Info a la mida NUM "
"(predeterminat %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3484,7 +3550,7 @@ msgstr ""
" --node-files produeix fitxers de redirecció per a nodes i "
"àncores; de forma predeterminada està activat sols si hi ha divisió.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3492,7 +3558,7 @@ msgstr ""
"Opcions per a XML i Docbook:\n"
" --output-indent=VAL no fa res, es manté per compatibilitat.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3500,7 +3566,7 @@ msgstr ""
"Opcions per a DVI/PS/PDF:\n"
" --Xopt=OPT passa OPT a texi2dvi: es pot repetir.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3521,7 +3587,7 @@ msgstr ""
" -U VAR anul·la la definició de la variable VAR, "
"igual que amb @clear\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3560,7 +3626,7 @@ msgstr ""
" A més, per les opcions --noifFORMAT, processa igualment el text "
"@ifnotFORMAT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3584,7 +3650,7 @@ msgstr ""
" si s'està generant XML, --ifxml està activat i els altres estan "
"desactivats\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3615,66 +3681,66 @@ msgstr ""
" makeinfo --no-split foo.texi escriu un sol fitxer Info, no "
"importa la mida\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: l'argument --footnote-style ha de ser `separate' o `end', no `%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: l'argument --paragraph-indent arg ha de ser numeric/`none'/`asis', no `"
"%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: quan s'estigui generant %s, sols es pot especificar un FITXER amb -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "opció --Xopt sense sortida impresa"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "transformació d'arbre desconeguda %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "s'ignorarà la divisió per al format %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: falta l'argument de fitxer.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Proveu `%s --help' per a més informació.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"la transformació fill_gaps_in_sectioning no ha retornat cap resultat. No hi "
"ha cap secció?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "error en tancar el fitxer d'expansió de macros %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "no s'ha pogut obrir %s per a escriptura: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3682,33 +3748,308 @@ msgstr ""
"la transformació insert_nodes_for_sectioning_commands no ha retornat cap "
"resultat. No hi ha cap secció?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: error en tancar %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: error en tancar els fitxers d'enllaços interns %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: no s'ha pogut obrir %s per a escriptura: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "no hi ha `%cend %s' concordant"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "%c fora de lloc"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "`%c%s' no concordat"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s requereix un nom"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "nom incorrecte per a @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s requereix un nom"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "nom incorrecte per a @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s requereix un nom"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "nom incorrecte per a @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s hauria d'acceptar únicament una ordre amb @ com argument, no `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "ordre d'entorn %s com argument per a @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "argument incorrecte a @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "argument incorrecte a @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "argument buit a @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "argument incorrecte a @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Sols se suporta @%s 10 o 11, no `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: l'argument --footnote-style ha de ser `separate' o `end', no `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "l'argument @%s ha de ser `on', `off' o `odd', no `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "argument incorrecte a @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "l'argument @firstparagraphindent ha de ser `none' o `insert', no `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "argument incorrecte a @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s requereix un argument: el formatejador per a %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "`%c%s' no concordat"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "argument superflu a @%s %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "argument incorrecte a @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: no s'ha pogut trobar %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: no s'ha pogut obrir %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "@%s després del primer element"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s sols té sentit a una línia @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+"@node precedeix @%s, però les parts no haurien d'estar associades amb nodes"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s no té sentit dins d'un bloc `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s no està permès dins d'un bloc `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s no hauria d'aparèixer a un context de matemàtiques"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s no té sentit fora d'entorns `@titlepage' i `@quotation'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s requereix un nom"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "argument formal @%s incorrecte o buit: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s espera `i' o `j' com argument, no `%s'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "etiqueta no definida: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s és obsolet."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s és obsolet; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s no hauria d'aparèixer a un context de matemàtiques"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s sense un caràcter associat"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s espera `i' o `j' com argument, no `%s'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "%c fora de lloc"
+
+#, c-format
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
#~ msgstr "%s: l'opció '--%s' no permet un argument\n"
+#, c-format
#~ msgid "%s: unrecognized option '--%s'\n"
#~ msgstr "%s: opció no reconeguda '--%s'\n"
+#, c-format
#~ msgid "%s: option '-W %s' is ambiguous\n"
#~ msgstr "%s: l'opció '-W %s' és ambigua\n"
+#, c-format
#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
#~ msgstr "%s: l'opció '-W %s' no permet un argument\n"
+#, c-format
#~ msgid "%s: option '-W %s' requires an argument\n"
#~ msgstr "%s: l'opció '-W %s' requereix un argument\n"
@@ -3726,15 +4067,19 @@ msgstr "%s: no s'ha pogut obrir %s per a escriptura: %s\n"
#~ "des de FITXER.\n"
#~ " -O, --show-options, --usage ves al node d'opcions de línia d'ordres."
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "Ordre no definida: %s"
+#, c-format
#~ msgid "can't open %s: %s"
#~ msgstr "no es pot obrir %s: %s"
+#, c-format
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "la sortida de depuració s'he redirigit a \"%s\""
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: s'ha exhaurit la memòria virtual!\n"
@@ -3744,19 +4089,45 @@ msgstr "%s: no s'ha pogut obrir %s per a escriptura: %s\n"
#~ msgid "arguments are quoted by default"
#~ msgstr "els arguments estan entre cometes de forma predeterminada"
+#~ msgid "no node to be renamed"
+#~ msgstr "no hi ha un node a reanomenar"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "hi ha nodes sense un nom nou al final del fitxer"
+
+#, perl-format
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Variable obsoleta %s\n"
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "el nom antic per a `%s' és un node del document"
+
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "el fitxer està buit per al node reanomenat `%s'"
+
+#, perl-format
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "el node destí (nou nom per a `%s') no està al document: %s"
+
+#, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "error en tancar el fitxer reanomenat de node de redirecció %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "nom buit de node"
+
+#, perl-format
#~ msgid "@%s should only appear at beginning or end of document"
#~ msgstr ""
#~ "@%s hauria d'aparèixer únicament al principi o al final del document"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s no hauria d'estar associat amb @top"
-
+#, perl-format
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: variable obsoleta %s\n"
+#, perl-format
#~ msgid "obsolete variable %s\n"
#~ msgstr "variable obsoleta %s\n"
diff --git a/macros/texinfo/texinfo/po/cs.gmo b/macros/texinfo/texinfo/po/cs.gmo
index 83d82bb27c..168e10cb60 100644
--- a/macros/texinfo/texinfo/po/cs.gmo
+++ b/macros/texinfo/texinfo/po/cs.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/cs.po b/macros/texinfo/texinfo/po/cs.po
index ef12807936..491448e999 100644
--- a/macros/texinfo/texinfo/po/cs.po
+++ b/macros/texinfo/texinfo/po/cs.po
@@ -17,10 +17,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: texinfo 6.5.93\n"
+"Project-Id-Version: texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-12 21:44+01:00\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-20 20:35+02:00\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"Language: cs\n"
@@ -254,7 +254,6 @@ msgid "Insert completion"
msgstr "Vložení doplnění"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Sestavují se doplnění…"
@@ -278,7 +277,6 @@ msgid "found file %s"
msgstr "soubor %s nalezen"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Poznámky pod Äarou nebylo možné zobrazit"
@@ -292,7 +290,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Poznámky pod Äarou ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Hledají se položky rejstříku…"
@@ -301,7 +298,6 @@ msgid "Look up a string in the index for this file"
msgstr "Vyhledání řetězce v rejstříku tohoto souboru"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Nenalezen žádný rejstřík"
@@ -310,7 +306,6 @@ msgid "Index entry: "
msgstr "Položka rejstříku: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Žádný rejstřík nebyl nalezen."
@@ -327,7 +322,6 @@ msgstr ""
"„\\[index-search]“"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Žádný předchozí řetězec, který se měl vyhledávat v rejstříku"
@@ -392,7 +386,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Žádné dostupné info soubory nemají ve svých rejstřících „%s“"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Chyba při převodu kódování znaků souboru"
@@ -407,7 +400,6 @@ msgid "Cannot find node '%s'"
msgstr "Uzel „%s“ nelze nalézt"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Nezadán žádný název programu"
@@ -436,7 +428,7 @@ msgstr "hodnota %s není platná pro proměnnou %s"
msgid "Try --help for more information.\n"
msgstr "Více informací můžete získat pomocí pÅ™epínaÄe --help.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -572,7 +564,7 @@ msgstr ""
" info -f ./foo.info zobrazí soubor ./foo.info, adresář se\n"
" neprohledává"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -882,17 +874,14 @@ msgid "could not open init file %s"
msgstr "inicializaÄní soubor %s nebylo možné otevřít"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "posloupnost kláves je příliš dlouhá"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "chybí posloupnost kláves"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "znak NULL (\\000) není dovolen"
@@ -902,12 +891,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "znak NULL (^%c) není dovolen"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "chybí název úkonu"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "posloupnost kláves nelze navázat na Äíslici nabídky"
@@ -917,7 +904,6 @@ msgid "unknown action `%s'"
msgstr "neznámý úkon „%s“"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "název úkonu je příliš dlouhý"
@@ -927,22 +913,18 @@ msgid "extra characters following action `%s'"
msgstr "po úkonu „%s“ následují zbyteÄné znaky"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "chybí název proměnné"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "bezprostředně po názvu proměnné chybí „=“"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "název proměnné je příliš dlouhý"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "hodnota je příliš dlouhá"
@@ -964,7 +946,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Zadání jména příkazu v zobrazovacím poli a jeho vykonání"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Zde nelze vykonat příkaz zobrazovacího pole"
@@ -1047,7 +1028,6 @@ msgid "Show all matching files"
msgstr "Zobrazit všechny odpovídající soubory"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Žádný rejstřík souborů"
@@ -1358,7 +1338,6 @@ msgid "Select the most recently selected node"
msgstr "Zobrazení poslední dobou nejvíce navštěvovaných uzlů"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "V historii není dřívější uzel"
@@ -1419,12 +1398,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Změna použití regulárních výrazů v hledání"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Vyhledávání regulárním výrazem"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Vyhledávání doslovným řetězcem"
@@ -1441,8 +1418,7 @@ msgstr "Hledání pokraÄovalo od zaÄátku dokumentu"
msgid "Searching subfile %s ..."
msgstr "Probíhá hledání podsouboru %s…"
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Hledání selhalo"
@@ -1476,140 +1452,138 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Hledaný řetězec je příliš krátký"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Návrat zpět na poslední shodu %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Žádné další shody"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Prohledat tento uzel a poduzly na řetězec"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Hledání pod %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Přesun na další shodu v podstromě Infa"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Hledání není aktivní"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Přesun na předchozí shodu v podstromě Infa"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "PÅ™eÄtení Å™etÄ›zce a jeho vyhledání (záleží na velikosti písmen)"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "PÅ™eÄtení Å™etÄ›zce a jeho vyhledání"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "PÅ™eÄtení Å™etÄ›zce a jeho vyhledání (zpÄ›tné)"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Opakování posledního hledání tím samým směrem"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Není předchozí hledaný řetězec"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Opakování posledního hledání opaÄným smÄ›rem"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Odstraní zobrazené výsledky hledání"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Vyhledávání zadávaného řetězce hned při zadávání"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Zpětné interaktivní hledání regulárním výrazem: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Zpětné interaktivní hledání: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Interaktivní hledání regulárním výrazem: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Interaktivní hledání: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Bezvýsledné "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Zrušení aktuální operace"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "UkonÄení operace"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Zobrazí verzi spuštěného Infa"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info verze %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Překreslení obrazovky"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "UkonÄení Infa"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Spuštění příkazu navázaného na malý znak této klávesy"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Neznámý příkaz (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "„%s“ je neplatné"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "„%s“ je neplatné"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "PÅ™idání této Äíslice do aktuálního Äíselného argumentu"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "ZaÄátek (nebo dÄ›lení ÄtyÅ™mi) aktuálního Äíselného argumentu"
@@ -1965,12 +1939,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: nebylo možno pÅ™eÄíst (%s) a vytvoÅ™it (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY bez odpovídajícího END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY bez předchozího START-INFO-DIR-ENTRY"
@@ -2000,13 +1972,11 @@ msgid "excess command line argument `%s'"
msgstr "nadbyteÄný argument „%s“ v příkazovém řádku"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Vstupní soubor nezadán; použitím pÅ™epínaÄe --help získáte bližší informace."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Adresář nebyl zadán; použitím pÅ™epínaÄe „--help“ získáte bližší informace"
@@ -2026,23 +1996,23 @@ msgstr "v Info adresáři „%s“ není žádná položka"
msgid "no entries found for `%s'; nothing deleted"
msgstr "pro „%s“ nebyly nalezeny žádné položky"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "%s nebylo možno otevřít pro zápis: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr "přesune příkaz @contents, chcete-li obsah za stránkou s nadpisem"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2050,580 +2020,561 @@ msgstr ""
"přesune příkazy @shortcontents a @contents, chcete-li obsah za stránkou "
"s nadpisem"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s není platný kód jazyka"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s není platný kód oblasti"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s není platná možnost dělení"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "%s nebylo možné pÅ™eÄíst: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "chyba při zavírání @verbatiminclude souboru %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: nebylo možné nalézt %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "žádný uzel nemá být přejmenován"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "uzly bez nového názvu na konci souboru"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "%s nebylo možné otevřít: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "používání souborů s přejmenovanými uzly („%s“) je zastaralé"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "v @%s nebylo možno ochránit znak křížku"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "prázdný název uzly po expanzi „%s“"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s „%s“ již bylo definováno"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "zde je předchozí definice jako @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "špatný argument v @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: výstup není kompatibilní s dělením"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "chyba při zavírání %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "adresáře „%s“ nebo „%s„ nebylo možné vytvořit: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "adresář „%s“ nebylo možno vytvořit: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image soubor „%s“ nenalezen, použije se „%s“"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "pro @U nebyl zadán žádný argument"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image soubor „%s“ (pro HTML) nenalezen, použije se „%s“"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "syrový formát %s není převeden"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "nebylo možné otevřít konfiguraÄní soubor s HTML odkazy %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "chybí typ"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "nerozpoznaný typ: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "chyba pÅ™i zavírání konfiguraÄního souboru s HTML odkazy %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "řetězec nebí uzavřen v souboru CSS"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include konÄil v komentáři"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import nebyl dokonÄen v souboru CSS"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS soubor %s nenalezen"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "nebylo možné otevřít --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "chyba při zavírání CSS souboru %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "pro „%s“ nenalezena žádná položka htmlxref.cnf"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "chyba při zavírání rámcového souboru %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "chyba při zavírání rámcového souboru s obsahem %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "deskriptor %s úrovně %s priority %s selhal"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "je tÅ™eba urÄit název pomocí příkazu title nebo @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "chyba při zavírání souboru s uzly přesměrování %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "starý název pro „%s“ je uzel dokumentu"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "soubor pro přejmenovaný uzel „%s“ je prázdný"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "cílový uzel (nový název pro „%s“ není v dokumentu: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "chyba při zavírání souboru %s s přejmenovanými uzly přesměrování: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "prázdný název uzlu"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "syntaxe pro vnější uzel použitý pro „%s“"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "dokument bez uzlů"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "dokument bez vrcholového uzlu"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "přejmenování %s selhalo: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s výstup více než jednou: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s mimo jakýkoliv uzel"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "název @node by neměl obsahovat „,“: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Položka rejstříku v @%s s : vytváří neplatné Info: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "položka pro rejstřík „%s“ je mimo všechny uzly"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "chyba při zavírání textového souboru obrazu %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "soubor „%s“ v příkazu @image je neÄitelný: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "nebylo možné najít ani @image soubor „%s.txt“, ani náhradní text"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr ""
"@strong{Note…} vytváří nepatÅ™iÄné křížové odkazy do Infa; pÅ™eformulujte text"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "název křížového odkazu @%s by neměl obsahovat „:“"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "název uzlu @%s by neměl obsahovat „%s“"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "název uzlu @%s by neměl obsahovat „:“"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "„.“ nebo „,“ musí následovat za @xref, ne za %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "„.“ nebo „,“ musí následovat za @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "název uzlu položky nabídky by neměl obsahovat „%s“"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "název uzlu položky nabídky by neměl obsahovat „:“"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "název položky nabídky by neměl obsahovat „:“"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "%s nebylo možné otevřít: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "násobný @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "chybný nebo prázdný formální argument @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "chybná syntaxe v argumentu @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s požaduje jméno"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "chybný název pro @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s se vyskytuje přes uzavírací závorkou @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s se vyskytuje před uzavírací závorkou @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s chybějící uzavírací závorka"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s chybějící uzavírací oddělovací posloupnost: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx by nemÄ›lo zaÄínat příkazem @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx musí následovat příkaz @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s má text ale nemá @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "„@end“ vyžadoval „%s“, ale viděl „%s“"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s viděn před @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "chybí odpovídající „%cend %s“"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "špatně umístěný znak %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "nepárový „%c%s“"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "makro „%s“ volané s příliš mnoha argumenty"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s chybějící uzavírací závorka"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "makro „%s“ deklarované bez argumentu volané s argumentem"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ při expanzi @%s následováno „%s“ místo názvu parametru nebo \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "chybí název pro @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "chybí kategorie pro @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "neoÄekávaný argument na řádku @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "prázdná multitabulka"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "přebývající argument u @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "špatný argument u @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s vyžaduje argument : formátovaÄ pro %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr "příkaz @%s nepřijímající argument v závorce by neměl být na řádku @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "zdůrazňovací příkaz „@%s“ není dovolen jako argument @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s postrádá argument"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "neznámý @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "přebývající argument u @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "špatný argument u @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: nebylo možné otevřít %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "kódování „%s“ není kanonické kódování texinfa"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nerozpoznaný název kódování „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s po prvním elementu"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s má smysl jen na řádku @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part by neměl být spojen s @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node pÅ™edchází @%s, ale Äásti nesmí být spojeny s uzly"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "syntaxe pro vnější uzel použitý pro „%s“"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "prázdný název položky nabídky v „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "prázdný název uzlu v položce nabídky"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s by se neměl objevit v @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s by se mÄ›l objevit pouze na zaÄátku řádku"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro „%s“ již bylo definováno"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "zde je předchozí definice „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "předefinovává se příkaz jazyka Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s bez spojeného znaku"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s definováno s nula nebo více jak jedním argumentem by se mělo volat s {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2631,343 +2582,356 @@ msgstr ""
"volání makra je příliš zanořené (lze přebít nastavením MAX_NESTED_MACROS, "
"souÄasná hodnota %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"rekurzivní volání makra %s není dovoleno; je-li třeba, použijte @rmacro"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "zdůrazňovací příkaz „@%s“ nesmí být následován bílým místem"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "použijte závorky k zadání příkazu jako argumentu @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
-msgstr "%c%s vyžaduje „i“ nebo „j“ jako argument, ne „%s“"
+msgstr "%c%s vyžaduje jako argument „i“ nebo „j“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "zdůrazňovací příkaz „@%s“ nesmí být následován novým řádkem"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s oÄekávalo závorky"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "neznámý příkaz „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "nedefinovaný příznak: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "chybná skladba ve @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s je zastaralé."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s je zastaralé; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s by se mÄ›lo pouze objevit na zaÄátku řádku"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s by se měl objevit pouze záhlaví nebo zápatí"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s není myslitelné uvnitř bloku „@%s“"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s v prázdné multitabulce"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab před @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "příliš mnoho sloupců v multitabulkové položce (max. %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "příkaz @tab ignorován, je mimo multitabulku"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s mimo tabulku nebo seznam"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s není dovoleno uvnitř bloku „@%s“"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s by se mělo objevit jen v položce rejstříku"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "není dovoleno více než dvě úrovně podpoložek rejstříku"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "musí následovat po „@%s“, aby šlo použít „@%s“"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s nemá smysl mimo prostředí „@titlepage“ a „@quotation“"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory po prvním uzlu"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "oblast %s uvnitř oblasti %s není dovolena"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry po prvním uzlu"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu v neplatném kontextu"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s spatřeno před prvním @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"protože váš uzel @top by měl být uzavřen v @ifnottex spíše než v @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s by se mělo objevit jen v položce rejstříku"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s by se mělo objevit jen v matematickém kontextu"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "neoÄekávaný @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s nemá smysl mimo prostředí „@float“"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s by mělo být právě pod „@float"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "ignoruje se násobný @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "příkaz @%s nepřijímá argumenty"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "příkaz @%s postrádá uzel nebo argument externího manuálu"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "v @%s prázdný název křížového odkazu po expanzi „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "v @%s prázdný nadpis křížkového odkazu po expanzi „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "příkaz @image postrádá jméno souboru"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s postrádá první argument"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "argument u @U nemá žádné Å¡estnáctkové Äíslice: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "argument u @U má ménÄ› než ÄtyÅ™i Å¡estnáctkové Äíslice: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "argument u @U přesahuje maximám Unicodu 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "nadbyteÄné argumenty uzlu"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "oÄekáváno @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s by pouze mělo přijímat příkaz @ jako argument, nikoliv „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "zbývající argumenty na řádku @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "příkaz prostředí %s jako argument @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "prázdné @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "podíl sloupce není Äíslo: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp argument musí být Äíslo, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "vyhrazený název rejstříku %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "neznámý rejstřík zdrojů v @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "neznámý rejstřík cílů v @%s: %s "
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s vede ke spojení %s do sebe, ignoruje se"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "neznámý rejstřík „%s“ v @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "vypisuje se rejstřík „%s“ spojený do jiného „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex pÅ™ed zaÄátkem dokumentu: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "@%s argument musí být „top“ nebo „bottom“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Je podporováno pouze @%s 10 nebo 11, ne %s“"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "@%s argument musí být „separate“ nebo „end“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s argument musí být „on“, „off“ nebo „odd“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "argument @paragraphindent musí být Äíslo, „none“ nebo „asis“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "argument @firstparagraphindent musí být „none“ nebo „insert“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "argument @exampleindent musí být Äíslo nebo „asis“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "oÄekáváno @%s on nebo off, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"argument @kbdinputstyle musí být „code“, „example“ nebo „distinct“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "argument @allowcodebreaks musí být „true“ nebo „false“, ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"argument @urefbreakstyle musí být „after“, „before“ nebo „none“, ne „%s“"
@@ -2997,7 +2961,7 @@ msgstr "s @%s se nepojí žádný příkaz oddílu"
msgid "@%s not empty"
msgstr "@%s není prázdný"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s odkazuje na neexistující uzel „%s“"
@@ -3007,107 +2971,107 @@ msgstr "@%s odkazuje na neexistující uzel „%s“"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "název uzlu položky @%s „%s“ se liší od %s názvu „%s“"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "na uzel „%s“ nesměřuje žádný odkaz"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "uzel „%s“ je %s pro „%s“ v oddílech, ale ne v nabídce"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "uzel %s „%s“ v nabídce „%s“ se liší od toho v oddílech „%s“"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "uzel „%s“ je %s pro „%s“ v nabídce ale ne v oddílech"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s ukazatel „%s“ (pro uzel „%s“) se liší od %s názvu „%s“"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s se odkazuje na neexistující „%s“"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"uzel „%s“ postrádá položku nabídky pro „%s“ navzdory tomu, že je jeho "
"nadřazeným uzlem"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "u „%s“ nahoru v menu „%s“ a nahoru „%s“ se neshodují"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s do „%s“ se liší od %s názvu „%s“"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "prázdný klÃ­Ä rejstříku v @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: %s nebylo možné otevřít pro zápis: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: chyba při zavírání %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: latexový soubor %s nebylo možné otevřít pro zápis: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: adresář L2H_TMP obsahuje teÄku"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: souÄasný adresář obsahuje teÄku"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: příkaz neuspěl: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: obrázek má neplatnou příponu: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: přejmenování %s na %s selhalo: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: %s nebylo možné otevřít: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: konec @%s položky %d nebyl nalezen"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3116,12 +3080,12 @@ msgstr ""
"latex2html.pm: zpracování vyrobilo %d položek v HTML; oÄekáváno %d, poÄet "
"položek nalezených v dokumentu"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: nebylo možné urÄit fragment %d pro @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3129,47 +3093,47 @@ msgid ""
msgstr ""
"l2h: z HTML nebylo možné získat fragment %d pro @%s s výstupním poÄítadlem %d"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: %s nebylo možné zavést: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: %s nebylo možné otevřít pro zápis: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: %s nebylo možné otevřít: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: změna pracovního adresáře do %s selhala: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: nelze se vrátit do původního adresáře: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: výstupní soubor chybí: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: příkaz selhal: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: konec @%s položky %d nenalezen"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3178,12 +3142,12 @@ msgstr ""
"tex4ht.pm: zpracování vyrobilo %d položek v HTML; oÄekáváno %d, poÄet "
"položek nalezených v dokumentu pro @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: výstup nemá žádnou HTML položku pro @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3192,37 +3156,37 @@ msgstr ""
"tex4ht.pm: zpracování získalo %d položek v HTML; oÄekáváno %d, poÄet položek "
"nalezených v dokumentu pro @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "chyba při zavádění %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: neznámá proměnná %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: neznámá proměnná %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "inicializaÄní soubor %s nebylo možné pÅ™eÄíst"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "nerozpoznaná hodnota TEXINFO_OUTPUT_FORMAT „%s“ se ignoruje\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Použití: %s [PŘEPÃNAÄŒ]… SOUBOR_TEXINFA…\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3238,7 +3202,7 @@ msgstr ""
"Tento program je obvykle nainstalován i pod názvy „makeinfo“ a „texi2any“.\n"
"Jejich chování je shodné a nezávisí na názvu.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3272,7 +3236,7 @@ msgstr ""
" -v, --verbose vysvětlí, co právě provádí.\n"
" --version zobrazí údaje o verzi a skonÄí.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3292,7 +3256,7 @@ msgstr ""
" po té, co zkontroluje platnost "
"SOUBORU_TEXINFA.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3340,7 +3304,7 @@ msgstr ""
"tam.\n"
" Jinak CÃL urÄuje název výstupního souboru.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3381,7 +3345,7 @@ msgstr ""
" --split-size=ÄŒÃSLO rozdÄ›lí Info soubory na velikosti POÄŒET\n"
" (výchozí %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3409,7 +3373,7 @@ msgstr ""
"kotvy;\n"
" standardně je zapnuto jen při dělení.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3417,7 +3381,7 @@ msgstr ""
"PÅ™epínaÄe pro XML a DocBook:\n"
" --output-indent=HODNOTA nic nedělá, zachováno pro kompatibilitu.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3426,7 +3390,7 @@ msgstr ""
" --Xopt=PŘEPÃNAÄŒ pÅ™edá PŘEPÃNAÄŒ programu texi2dvi; lze "
"opakovat.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3450,7 +3414,7 @@ msgstr ""
" -U PROMĚNNà zruší proměnnou PROMĚNNà jako příkaz "
"@clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3486,7 +3450,7 @@ msgstr ""
"\n"
" Rovněž pÅ™epínaÄe --no-ifFORMÃT zpracují text podmínÄ›ný @ifnotFORMÃT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3502,7 +3466,7 @@ msgstr ""
" vytváří-li se prostý text, --ifplaintext se zapne a ostatní se vypnou;\n"
" vytváří-li se XML, --ifxml se zapne a ostatní se vypnou.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3533,64 +3497,64 @@ msgstr ""
" makeinfo --number-sections foo.texi zapíše Info Äíslovanými oddíly\n"
" makeinfo --no-split foo.texi zapíše jeden velký soubor Info\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: argument k --footnote-style musí být „separate“ nebo „end“, ne „%s“.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: argument pro --paragraph-indent musí být Äíslo, „none“ nebo „asis“, ne "
"„%s“.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr "%s: při vytváření %s lze pomocí -o zadat pouze jeden vstupní SOUBOR\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "pÅ™epínaÄ --Xopt bez tisknutelného výstupu"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "neznámá transformace stromu %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "dělení u formátu %s se ignoruje"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: chybí argument jména souboru.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Více informací získáte příkazem „%s --help“.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"Transformace fill_gaps_in_sectioning nevrátila žádný výsledek. Nechybí oddíl?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "chyba při zavírání makrem expandovaného souboru %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "%s nebylo možné otevřít pro zápis: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3598,21 +3562,251 @@ msgstr ""
"Transformace insert_nodes_for_sectioning_commands nevrátila žádný výsledek. "
"Nechybí oddíl?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: chyba při zavírání %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: chyba při zavírání souboru %s s vnitřními odkazy: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: %s nebylo možné otevřít pro zápis: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "chybí odpovídající „@end %s“"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "špatně umístěný znak {"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "nepárový „@end %s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set vyžaduje název"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "chybný název pro @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear vyžaduje název"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "chybný název pro @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro vyžaduje název"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "chybný název pro @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+"@clickstyle by pouze mělo přijímat příkaz @ jako argument, nikoliv „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "příkaz prostředí %s jako argument u @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "špatný argument u @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "špatný argument u @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "prázdný @columnfractions"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "špatný argument u @printindex: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Je podporován pouze @fonttextsize 10 nebo 11, ne %s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "argument u @footnotestyle musí být „separate“ nebo „end“, ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "argument u @setchapternewpage musí být „on“, „off“ nebo „odd“, ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "špatný argument u @need: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "argument u @firstparagraph musí být „none“ nebo „insert“, ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "špatný argument u @headings: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s vyžaduje argument: formátovaÄ pro @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "nepárový „@end“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "pÅ™ebyteÄný argument u @end %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "špatný argument u @end: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: nebylo možné nalézt %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: nebylo možné otevřít %s:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename po prvním elementu"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions má smysl jen na řádku s @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node pÅ™edchází @part, ale Äásti nesmí být spojeny s uzly"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s nemá smysl uvnitř bloku @%s"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s není dovoleno uvnitř bloku „@copying“"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry by se mělo objevit jen v položce rejstříku"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@author nemá smysl mimo prostředí „@titlepage“ a „@quotation“"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s vyžaduje název"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "chybný nebo prázdný formální argument u @%s: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless vyžaduje „i“ nebo „j“ jako argument, ne „%c“"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "nedefinovaný příznak: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s je zastaralý."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s je zastaralý; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ by se mělo objevit jen v matematickém kontextu"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb bez spojeného znaku"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless vyžaduje jako argument „i“ nebo „j“, ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "špatně umístěný znak }"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "žádný uzel nemá být přejmenován"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "uzly bez nového názvu na konci souboru"
+
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr "používání souborů s přejmenovanými uzly („%s“) je zastaralé"
+
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "starý název pro „%s“ je uzel dokumentu"
+
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "soubor pro přejmenovaný uzel „%s“ je prázdný"
+
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "cílový uzel (nový název pro „%s“ není v dokumentu: %s"
+
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "chyba při zavírání souboru %s s přejmenovanými uzly přesměrování: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "prázdný název uzlu"
+
#~ msgid "can't open %s: %s"
#~ msgstr "%s nelze otevřít: %s"
@@ -3628,9 +3822,6 @@ msgstr "%s: %s nebylo možné otevřít pro zápis: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Zastaralá proměnná %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s by neměl být spojen s @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: zastaralá proměnná %s\n"
diff --git a/macros/texinfo/texinfo/po/da.gmo b/macros/texinfo/texinfo/po/da.gmo
index dabf10f02a..83807b980c 100644
--- a/macros/texinfo/texinfo/po/da.gmo
+++ b/macros/texinfo/texinfo/po/da.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/da.po b/macros/texinfo/texinfo/po/da.po
index 81be642106..ddf4b6a446 100644
--- a/macros/texinfo/texinfo/po/da.po
+++ b/macros/texinfo/texinfo/po/da.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 6.5.93\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2019-02-14 10:09+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -254,7 +254,6 @@ msgid "Insert completion"
msgstr "Indsæt færdiggørelse"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Bygger færdiggørelser ..."
@@ -278,7 +277,6 @@ msgid "found file %s"
msgstr "fandt filen %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Fodnoter kunne ikke vises"
@@ -291,7 +289,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Fodnoter -----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Finder indekspunkter ..."
@@ -300,7 +297,6 @@ msgid "Look up a string in the index for this file"
msgstr "Slå en tekst op i denne fils indeks"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Ingen indeks fundet"
@@ -309,7 +305,6 @@ msgid "Index entry: "
msgstr "Indekspost: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Ingen indeks fundet."
@@ -324,7 +319,6 @@ msgid ""
msgstr "Gå til næste fundne indekspunkt fra sidste »\\[index-search]«-kommando"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Ingen tidligere indekssøgestreng"
@@ -393,7 +387,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Ingen tilgængelige info-filer har »%s« i deres indeks"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Der opstod en fejl under konvertering af filtegnkodning"
@@ -408,7 +401,6 @@ msgid "Cannot find node '%s'"
msgstr "Kan ikke finde emnet »%s«"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Intet programnavn angivet"
@@ -437,7 +429,7 @@ msgstr "værdien %s er ikke gyldig for variabel %s"
msgid "Try --help for more information.\n"
msgstr "Prøv --help for yderligere information.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -574,7 +566,7 @@ msgstr ""
" skriv hele manualen til ud.txt\n"
" info -f ./foo.info vis filen ./foo.info, uden at søge i mapper"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -877,17 +869,14 @@ msgid "could not open init file %s"
msgstr "kunne ikke åbne init-fil %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "tastesekvens er for lang"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "manglende tastesekvens"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "Nultegn (\\000) er ikke tilladt"
@@ -897,12 +886,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "Nultegn (^%c) er ikke tilladt"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "manglende handlingsnavn"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "kan ikke binde tastesekvens til menu-digit"
@@ -912,7 +899,6 @@ msgid "unknown action `%s'"
msgstr "ukendt handling »%s«"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "handlingsnavn er for langt"
@@ -922,22 +908,18 @@ msgid "extra characters following action `%s'"
msgstr "ekstra tegn følger handlingen »%s«"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "manglende variabelnavn"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "manglende »=« umiddelbart efter variabelnavn"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "variabelnavn er for langt"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "værdien er for lang"
@@ -959,7 +941,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Indlæs et kommandonavn i ekko-området og udfør den"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Kan ikke udføre en »ekko-område«-kommando her"
@@ -1041,7 +1022,6 @@ msgid "Show all matching files"
msgstr "Vis alle matchende filer"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Intet filindeks"
@@ -1347,7 +1327,6 @@ msgid "Select the most recently selected node"
msgstr "Vælg det sidst valgt emne"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Intet tidligere emne i historikken"
@@ -1409,12 +1388,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Skift brugen af regulære udtryk i søgninger"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Brug af regulære udtryk for søgninger"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Brug af bogstavelige strenge for søgninger"
@@ -1431,8 +1408,7 @@ msgstr "Søgning fortsat fra begyndelsen af dokumentet"
msgid "Searching subfile %s ..."
msgstr "Søger i underfilen %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Søgning mislykkedes"
@@ -1466,141 +1442,139 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Søgestreng er for kort"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "GÃ¥r tilbage til sidste match fra %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Ikke flere match"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Søg i dette emne og underemner efter en streng"
# Uklart om det skal være Søg, Søger eller Søgning.
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Søgning under %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Gå til næste match i informationsundertræet"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Ingen aktiv søgning"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Gå til forrige match i informationsundertræet"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Indlæs en tekst og søg efter den uden versalfølsomhed"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Indlæs en tekst og søg for den"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Indlæs en tekst og søg baglæns efter den"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Gentag sidste søgning i samme retning"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Ingen tidligere søgestreng"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Gentag sidste søgning i modsat retning"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Ryd viste søgeresultater"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Søg interaktivt efter en tekst, mens du skriver den"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Regulært udtryk I-søgning baglæns: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-søgning baglæns: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Regulært udtryk I-søgning"
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-søgning: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Fejler "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Afbryd nuværende handling"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Afslut"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Vis version for Info der køres"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info-version %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Gentegn skærmen"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Afslut Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Kør kommandoen, der er bundet til denne tasts småbogstavsvariant"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Ukendt kommando (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "»%s« er ikke gyldig"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "»%s« er ugyldig"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Tilføj dette tegn til det nuværende numeriske parameter"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Start (eller gang med 4) det nuværende numeriske parameter"
@@ -1946,12 +1920,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kunne ikke læse (%s) og kunne ikke oprette (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY uden tilhørende END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY uden tilhørende START-INFO-DIR-ENTRY"
@@ -1981,12 +1953,10 @@ msgid "excess command line argument `%s'"
msgstr "overskydende kommandolinjeparameter »%s«"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Ingen inddatafil angivet; prøv --help for yderligere information."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Ingen mappefil angivet; prøv --help for yderligere information."
@@ -2005,23 +1975,23 @@ msgstr "ingen info-mappepost i »%s«"
msgid "no entries found for `%s'; nothing deleted"
msgstr "ingen poster fundet for »%s«; intet slettet"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "kunne ikke åbne %s for skrivning: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr "flyt din @contents-kommando hvis du ønsker indholdet efter titelsiden"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2029,287 +1999,243 @@ msgstr ""
"flyt dine @shortcontents- og @contents-kommandoer hvis du ønsker indholdet "
"efter titelsiden"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s er ikke en gyldig sprogkode"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s er ikke en gyldig regionskode"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s er ikke en gyldig opdelingsmulighed"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "kunne ikke læse %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "fejl under lukning af @verbatiminclude-filen %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: kunne ikke finde: %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "intet navn at omdøbe"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "emner uden et navn i slutningen af filen"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "kunne ikke åbne %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "brug af en omdøbt emnefil (»%s«) er forældet"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "kunne ikke beskytte hash-tegn i @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "tomt emnenavn efter udfoldning »%s«"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s »%s« er allerede defineret"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "her er den tidligere definition som @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "tom parameter i @%s"
# split er nok programmet split
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: uddata er ikke kompatible med split"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "der opstod en fejl under lukning af %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "kunne ikke oprette mapper »%s« eller »%s«: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "kunne ikke oprette mappe »%s«: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image-filen »%s« blev ikke fundet, anvender »%s«"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "Ingen parameter angivet for @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-filen »%s« (for HTML) blev ikke fundet, anvender »%s«"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "rå format %s er ikke konverteret"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "kunne ikke åbne html-referencekonfigurationsfilen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "manglende type"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "typen blev ikke genkendt: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr ""
"der opstod en fejl under lukning af html-referencekonfigurationsfilen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "streng ikke lukket i css-fil"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include afsluttet i kommentar"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import er ikke færdig i css-fil"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS-filen %s blev ikke fundet"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "kunne ikke åbne --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "der opstod en fejl under lukning af CSS-filen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "ingen htmlxref.cnf-poster blev fundet for »%s«"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "der opstod en fejl under lukning af frame-filen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr ""
"der opstod en fejl under lukning af indholdsfortegnelsens frame-fil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "håndtering %s for trin %s prioritet %s mislykkedes"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "skal angive en titel med en titelkommando eller @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "der opstod en fejl under lukning af videresendelsesemnefilen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "gammelt navn for »%s« er et emne for dokumentet"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "fil tom for omdøbt emne »%s«"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "målemne (nyt navn for »%s«) er ikke i dokument: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"der opstod en fejl under lukning af omdøbt emnevideresendelsesfil %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "tomt emnenavn"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "syntaks for et eksternt emne anvendt for »%s«"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "dokument uden emner"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "dokument uden Top-emne"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "omdøbning af %s mislykkedes: %s"
# hær er det spørg om skrivning til en fil (første argument er t.ex
# DVI, LATEX, MIDI, TEX)
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s-uddata mere end en gang: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s udenfor et emne"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "@node-navn må ikke indeholde »,«: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Indekspost i @%s med : fremstiller ugyldig Info: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "post for indeks »%s« udenfor et emne"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "der opstod en fejl under lukning af billedtekstfilen %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-filen »%s« er ikke læsbar: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "kunne ikke finde @image-filen »%s.txt« eller alternativ tekst"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2317,300 +2243,326 @@ msgstr ""
"@strong{Note...} laver en uægte krydsreference i Info; ændr for at undgå "
"dette"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "@%s-krydsreferencenavn må ikke indeholde »:«"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "@%s-emnenavn må ikke indeholde »%s«"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "@%s-emnenavn må ikke indeholde »:«"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "en @xref skal efterfølges af ».« eller »,«, ikke %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "en @xref skal efterfølges af ».« eller »,«"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "emnenavn for menupunkt må ikke indeholde »%s«"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "menupostens emnenavn må ikke indeholde »:«"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "menupostens navn må ikke indeholde »:«"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "kunne ikke åbne %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "flere @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "ugyldig eller tom formel @%s-parameter: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "ugyldig syntaks for @%s-parameter: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s kræver et navn"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "ugyldigt navn for @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s set før @%s-afsluttende tuborgklamme"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s set før @%s-afsluttende tuborgklamme"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s mangler afsluttende tuborgklamme"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s mangler afsluttende afgrænsningssekvens: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx må ikke begynde @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx skal følge @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s har tekst men intet @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "»@end« forventede »%s«, men fandt »%s«"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s set før @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "ingen matchende »%cend %s«"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "fejlplaceret %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "uparret »%c%s«"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "makro »%s« kaldt med for mange parametre"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s mangler afsluttende tuborgklamme"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "makro »%s« erklæret uden parameter kaldt med en parameter"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ i @%s-udfoldning fulgt af »%s« i stedet for parameternavn eller \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "mangler navn for @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "mangler kategori for @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "uventet parameter på @%s-linje: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "tom multitable"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "overflødig parameter til @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "ugyldig parameter til @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s kræver en parameter: formateringsprogrammet for %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"kommandoen @%s der ikke accepterer parametre i tuborgklamme bør ikke være på "
"@%s linje"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "accent-kommandoen »@%s« er ikke tilladt som parameter for @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s mangler parameter"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "ukendt @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "overflødig parameter for @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "ugyldig parameter for @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: kunne ikke åbne %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "kodningen »%s« er ikke en kanonisk texinfo-kodning"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "ukendt kodningsnavn »%s«"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s efter det første element"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s er kun meningsfuldt på en @multitable-linje"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@%s should not be associated with @top"
+msgid "@part should not be associated with @top"
+msgstr "@%s bør ikke associeres med @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node går forud for @%s, men dele er måske ikke tilknyttet emner"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "syntaks for et eksternt emne anvendt for »%s«"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "tomt menupunktnavn i »%s«"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "tomt emnenavn i menupunkt"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s bør ikke fremgå i @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s bør kun fremgå i begyndelsen af en linje"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makroen »%s« er allerede defineret"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "her er den tidligere definition af »%s«"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "ændrer definition på Texinfo-sprogkommando: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s uden associeret tegn"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr "@%s defineret med nul eller mere end en parameter skal startes med {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2618,342 +2570,355 @@ msgstr ""
"makrokald indlejret for dybt (indstil MAX_NESTED_MACROS for at tilsidesætte; "
"nuværende værdi %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr "rekursivt kald af makro %s er ikke tilladt; brug @rmacro hvis krævet"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "accent-kommandoen »@%s« må ikke efterfølges af mellemrum"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "benyt tuborgklammer til at angive en kommando som parameter til @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s kræver »i« eller »j« som parameter, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "accent-kommandoen »@%s« skal efterfølges af en ny linje"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s forventede tuborgklammer"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "ukendt kommando »%s«"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "flag er ikke defineret: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "ugyldig syntaks for @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s er forældet."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s er forældet; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s bør kun fremgå ved en linjes begyndelse"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s bør ikke fremgå i teksthoved eller tekstfod"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s giver ingen mening i en »@%s«-blok"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s i tom multitable"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab før @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "for mange kolonner i »multitable«-element (maks %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignorerer @tab udenfor »multitable«"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s uden for tabel eller liste"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s er ikke tilladt i en »@%s«-blok"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s bør kun fremgå i et indekselement"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "skal være efter »@%s« for at bruge »@%s«"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s giver ikke mening uden for miljøerne »@titlepage« og »@quotation«"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory efter første emne"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "regionen %s inden i region %s er ikke tilladt"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry efter første emne"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu i ugyldig kontekst"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s fundet før første @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "måske skulle dit @top emne indsættes i @ifnottex i stedet for @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s bør kun fremgå i et indekselement"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s bør kun fremgå i matematisk kontekst"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "uventet @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s giver ingen mening uden for »@float«-miljøet"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s skal være lige under »@float«"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "ignorerer flere @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "kommandoen @%s tillader ikke parametre"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "kommandoen @%s mangler et emne eller en ekstern manuel parameter"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "i @%s tomt krydsreferencenavn efter udfoldning »%s«"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "i @%s tom krydsreferencetitel efter udfoldning »%s«"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image mangler filnavnparameter"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s mangler første parameter"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "ikke-hex cifre i parameter for @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "færre end fire hex-cifre i parameter for @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "parameter for @U overgår Unicodemaksimum 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "overflødige parametre for emne"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "forventede @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s bør kun acceptere en @-kommando som parameter, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "tilbageværende parameter på @%s linje: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "miljøkommandoen %s som parameter til @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "tom @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "kolonnefraktion er ikke et tal: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp-parameter skal være numerisk, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "reserveret indeksnavn %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "ukendt kildeindeks i @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "ukendt destinatinsindeks i @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s fører til en sammenføjning af %s i sig selv; ignorerer"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "ukendt indeks »%s« i @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "udskriver et indeks »%s« flettet i et andet, »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex før dokumentbegyndelse: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "@%s-parameter skal være »top« eller »bottom«, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Kun @%s 10 eller 11 er understøttet, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "@%s-parameter skal være »separate« eller »end«, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s-parameter skal være »on«, »off« eller »odd«, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "@paragraphindent-parameter skal være numerisk/»none«/»asis«, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"@firstparagraphindent-parameter skal være »none« eller »insert«, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "@exampleindent-parameter skal være numeric/»asis«, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "forventede @%s aktiveret eller deaktiveret, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"@kbdinputstyle-parameter skal være »code«/»example«/»distinct«, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "@allowcodebreaks-parameter skal være »true« eller »false«, ikke »%s«"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "@urefbreakstyle-parameter skal være »after«/»before«/»none«, ikke »%s«"
@@ -2983,7 +2948,7 @@ msgstr "ingen afsnitsopdeling associeret med @%s"
msgid "@%s not empty"
msgstr "@%s er ikke tom"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s-reference til ikkeeksisterende emne »%s«"
@@ -2993,106 +2958,106 @@ msgstr "@%s-reference til ikkeeksisterende emne »%s«"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s-postemnenavn »%s« er forskellig fra %s-navn »%s«"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "ikkerefereret emne »%s«"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "emne »%s« er %s for »%s« i afsnitsopdeling men ikke i menu"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "emne %s »%s« i menu »%s« og i afsnitsopdeling »%s« er forskellige"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "emne »%s« er %s for »%s« i menu men ikke i afsnitsopdeling"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s-peger »%s« (for emne »%s«) er forskellig fra %s-navn »%s«"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s-reference til ikkeeksisterende »%s«"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"emnet »%s« mangler menupunkt for »%s« på trods af at det er dens »Op«-mål"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "for »%s«, op i menu »%s« og op »%s« matcher ikke"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s til »%s«, forskellig fra %s-navn »%s«"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "tomt indeksnøgle i @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: kunne ikke åbne %s for skrivning: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: der opstod en fejl under lukning af %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: kunne ikke åbne latex-filen %s for skrivning: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: L2H_TMP-mappe indeholder et punktum"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: nuværende mappe indeholder et punktum"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: kommando lykkedes ikke: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: billede har ugyldig filendelse: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: omdøb %s som %s mislykkedes: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: kunne ikke åbne %s; %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: slutningen på @%s post %d ikke fundet"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3101,12 +3066,12 @@ msgstr ""
"latex2html.pm: behandling fremstillede %d elementer i HTML; forventede %d, "
"antallet af elementer fundet i dokumentet"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: kunne ikke bestemme fragmentet %d for @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3114,47 +3079,47 @@ msgid ""
msgstr ""
"l2h: kunne ikke udtrække fragmentet %d for @%s med uddatatælleren %d fra HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: kunne ikke indlæse %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: kunne ikke åbne %s for skrivning: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: kunne ikke åbne %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: chdir %s mislykkedes: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: kunne ikke returnere til oprindelig mappe: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: uddatafil mangler: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: kommando mislykkedes: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: slutningen på @%s-elementet %d blev ikke fundet"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3163,12 +3128,12 @@ msgstr ""
"tex4ht.pm: behandling fremstillede %d elementer i HTML; forventede %d, "
"antallet af elementer fundet i dokumentet for @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: uddata har intet HTML-element for @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3177,37 +3142,37 @@ msgstr ""
"tex4ht.pm: behandling hentede %d elementer i HTML; forventede %d, antallet "
"af elementer fundet i dokumentet for @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "fejl under indlæsning af %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: ukendt variabel %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: ukendt variabel %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "kunne ikke læse init-filen %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "ignorerer ej genkendt TEXINFO_OUTPUT_FORMAT-værdi »%s«\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Brug: %s [TILVALG] ... TEXINFO-FIL ...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3223,7 +3188,7 @@ msgstr ""
"Programmet installeres ofte som både »makeinfo« og »texi2any«;\n"
"opførslen er identisk, og afhænger ikke af det installerede navn.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3258,7 +3223,7 @@ msgstr ""
" -v, --verbose forklar, hvad der sker.\n"
" --version vis versionsoplysninger og afslut.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3277,7 +3242,7 @@ msgstr ""
" format, efter kontrol af validitet for\n"
" TEXINFO-FIL.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3324,7 +3289,7 @@ msgstr ""
" så placer uddatafilen der.\n"
" Ellers navngiver DEST uddatafilen.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3366,7 +3331,7 @@ msgstr ""
" --split-size=ANTAL opdel Info-filer ved størrelsen ANTAL "
"(standard %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3393,7 +3358,7 @@ msgstr ""
" ankre; som standard indstilles kun hvis "
"opdelt.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3401,7 +3366,7 @@ msgstr ""
"Tilvalg for XML og Docbook:\n"
" --output-indent=VÆRDI gør intet, bevaret for kompatibilitet.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3409,7 +3374,7 @@ msgstr ""
"Tilvalg for DVI/PS/PDF:\n"
" --Xopt=OPT send OPT til texi2dvi; kan gentages.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3428,7 +3393,7 @@ msgstr ""
" -U VAR fjern definitionen af variablen VAR, som\n"
" med @clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3462,7 +3427,7 @@ msgstr ""
" --no-iftex behandl ikke @iftex og @tex-tekst.\n"
" --no-ifxml behandl ikke @ifxml og @xml-tekst.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3481,7 +3446,7 @@ msgstr ""
"deaktiverede.\n"
" hvis der laves XML, er --ifxml aktiveret, mens de andre er deaktiverede.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3512,63 +3477,63 @@ msgstr ""
" makeinfo --no-split xxx.texi skriv en Info-fil, uanset "
"størrelsen\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent parameter skal være tal/»none«/»asis«, ikke »%s«.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr "%s: under oprettelse af %s, kan kun en inddata-FIL angivet med -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "tilvalget --Xopt uden udskrevne uddata"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "ukendt trætransformation %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "ignorerer opdeling for format %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: mangler filparameter.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv »%s --help« for yderligere information.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"fill_gaps_in_sectioning-transformering gav intet resultat. Ingen sektion?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "der opstod en fejl under lukning af makro udvid-filen %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "kunne ikke åbne %s for skrivning: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3576,21 +3541,321 @@ msgstr ""
"insert_nodes_for_sectioning_commands-transformation returnerer intet "
"resultat. Manglende afsnit?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: der opstod en fejl under lukning af %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: der opstod en fejl under lukning af intern henvisningsfil %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: kunne ikke åbne %s for skrivning: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "ingen matchende »%cend %s«"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "fejlplaceret %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "uparret »%c%s«"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s kræver et navn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "ugyldigt navn for @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s kræver et navn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "ugyldigt navn for @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s kræver et navn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "ugyldigt navn for @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept an @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s bør kun acceptere en @-kommando som parameter, ikke »%s«"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "miljøkommandoen %s som parameter til @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "ugyldig parameter til @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "ugyldig parameter til @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "tom parameter i @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "ugyldig parameter for @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Kun @%s 10 eller 11 er understøttet, ikke »%s«"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "@%s-parameter skal være »on«, »off« eller »odd«, ikke »%s«"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "ugyldig parameter for @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"@firstparagraphindent-parameter skal være »none« eller »insert«, ikke »%s«"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "ugyldig parameter for @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s kræver en parameter: formateringsprogrammet for %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "uparret »%c%s«"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "overflødig parameter for @%s %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "ugyldig parameter for @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: kunne ikke finde: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: kunne ikke åbne %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "@%s efter det første element"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s er kun meningsfuldt på en @multitable-linje"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node går forud for @%s, men dele er måske ikke tilknyttet emner"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s giver ingen mening i en »@%s«-blok"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s er ikke tilladt i en »@%s«-blok"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in an index entry"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s bør kun fremgå i et indekselement"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s giver ikke mening uden for miljøerne »@titlepage« og »@quotation«"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s kræver et navn"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "ugyldig eller tom formel @%s-parameter: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s kræver »i« eller »j« som parameter, ikke »%s«"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "flag er ikke defineret: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s er forældet."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s er forældet; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s bør kun fremgå i matematisk kontekst"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s uden associeret tegn"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s kræver »i« eller »j« som parameter, ikke »%s«"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "fejlplaceret %c"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "intet navn at omdøbe"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "emner uden et navn i slutningen af filen"
+
+#, perl-format
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr "brug af en omdøbt emnefil (»%s«) er forældet"
+
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "gammelt navn for »%s« er et emne for dokumentet"
+
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "fil tom for omdøbt emne »%s«"
+
+#, perl-format
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "målemne (nyt navn for »%s«) er ikke i dokument: %s"
+
+#, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "der opstod en fejl under lukning af omdøbt emnevideresendelsesfil %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "tomt emnenavn"
+
#~ msgid "can't open %s: %s"
#~ msgstr "kan ikke åbne %s: %s"
@@ -3606,9 +3871,6 @@ msgstr "%s: kunne ikke åbne %s for skrivning: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Forældet variabel %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s bør ikke associeres med @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: forældet variabel %s\n"
diff --git a/macros/texinfo/texinfo/po/de.gmo b/macros/texinfo/texinfo/po/de.gmo
index 6f107071d7..80bdb4be04 100644
--- a/macros/texinfo/texinfo/po/de.gmo
+++ b/macros/texinfo/texinfo/po/de.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/de.po b/macros/texinfo/texinfo/po/de.po
index 6371b518f0..1f36af0c8b 100644
--- a/macros/texinfo/texinfo/po/de.po
+++ b/macros/texinfo/texinfo/po/de.po
@@ -35,7 +35,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 5.9.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2015-03-02 13:41+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -53,26 +53,31 @@ msgstr "Unbekannter Systemfehler"
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: Option „%s“ ist mehrdeutig\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: Option „%s“ ist nicht eindeutig; Möglichkeiten:"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: nicht erkannte Option „%c%s“\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: Option „%c%s“ erlaubt kein Argument\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: Option „%s“ benötigt ein Argument\n"
@@ -116,6 +121,7 @@ msgstr "Ungültiger Rückverweis"
#: gnulib/lib/regcomp.c:156
#, fuzzy
+#| msgid "Unmatched [ or [^"
msgid "Unmatched [, [^, [:, [., or [="
msgstr "Nicht übereinstimmende [ oder [^"
@@ -272,7 +278,6 @@ msgid "Insert completion"
msgstr "Vervollständigung einfügen"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Vervollständigungen werden erstellt …"
@@ -296,7 +301,6 @@ msgid "found file %s"
msgstr "Datei %s gefunden"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Fußnoten können nicht angezeigt werden"
@@ -310,7 +314,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Fußnoten ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Index-Einträge werden gesucht …"
@@ -319,7 +322,8 @@ msgid "Look up a string in the index for this file"
msgstr "Eine Zeichenkette im Index dieser Datei suchen"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "Keine Indizes gefunden."
@@ -328,7 +332,6 @@ msgid "Index entry: "
msgstr "Index-Eintrag: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Keine Indizes gefunden."
@@ -345,17 +348,20 @@ msgstr ""
"Eintrag gehen"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "Keine vorherige zu suchende Index-Zeichenkette."
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No more index entries containing '%s'."
msgid "No more index entries containing '%s'"
msgstr "Keine weiteren Index-Einträge, die „%s“ enthalten."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No index entries containing '%s'."
msgid "No index entries containing '%s'"
msgstr "Keine Index-Einträge, die „%s“ enthalten."
@@ -403,26 +409,31 @@ msgstr "Keine Index-Einträge, die „%s“ enthalten."
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have '%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "Keine der verfügbaren Info-Dateien hat „%s“ in ihren Indizes."
#: info/info-utils.c:878
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Error converting file character encoding."
msgid "Error converting file character encoding"
msgstr "Fehler bei der Umwandlung der Zeichenkodierung der Datei"
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item '%s' in node '%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "Kein Menüeintrag „%s“ im Knoten „%s“."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node '%s'."
msgid "Cannot find node '%s'"
msgstr "Knoten „%s“ wurde nicht gefunden."
#: info/info.c:437
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No program name given."
msgid "No program name given"
msgstr "Es wurde kein Programmname angegeben."
@@ -451,7 +462,7 @@ msgstr "Wert %s ist nicht gültig für Variable %s"
msgid "Try --help for more information.\n"
msgstr "„--help“ gibt weitere Informationen.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -484,6 +495,14 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -a, --all use all matching manuals.\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILE remember user keystrokes in FILENAME.\n"
+#| " -f, --file=MANUAL specify Info manual to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -500,6 +519,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILE output selected nodes to FILE."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -519,11 +543,21 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr " -b, --speech-friendly nett zu Sprachsynthesizern sein"
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --strict-node-location (for debugging) use Info file pointers as-"
+#| "is.\n"
+#| " --subnodes recursively output menu items.\n"
+#| " -v, --variable VAR=VALUE assign VALUE to Info variable VAR.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file.\n"
+#| " -x, --debug=NUMBER set debugging level (-1 for all).\n"
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -567,6 +601,21 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers select buffers menu entry in emacs manual\n"
+#| " info emacs -n Files start at Files node within emacs manual\n"
+#| " info '(emacs)Files' alternative way to start at Files node\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -603,7 +652,7 @@ msgstr ""
"schreiben\n"
" info -f ./foo.info datei ./foo.info anzeigen"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -618,6 +667,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node '(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "Knoten „(%s)%s“ kann nicht gefunden werden."
@@ -631,61 +681,73 @@ msgstr "Momentane Position erscheint nicht in dem Knoten dieses Fensters!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "Das letzte Fenster kann nicht gelöscht werden."
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "Kein Menü in diesem Knoten."
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "Keine Fußnoten in diesem Knoten."
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "Keine Querverweise in diesem Knoten."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No '%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "Kein „%s“-Verweis für diesen Knoten."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command '%c'; try '?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "Unbekannter Info-Befehl „%c“. Geben Sie „?“ ein, um Hilfe zu bekommen."
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type '%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "Der Terminaltyp „%s“ ist nicht fähig genug, um Info auszuführen."
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "Sie sind bereits auf der letzten Seite dieses Knotens."
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "Sie sind bereits auf der ersten Seite dieses Knotens."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "Nur ein Fenster."
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "Das entstehende Fenster wäre zu klein."
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr "Nicht genügend Platz für ein Hilfefenster. Bitte ein Fenster löschen."
@@ -890,6 +952,7 @@ msgstr "Taste beschreiben: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s ist nicht definiert."
@@ -908,11 +971,13 @@ msgstr "Keine Taste ist mit „%s“ belegt"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s kann nur durch %s aufgerufen werden."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s kann durch %s aufgerufen werden."
@@ -923,21 +988,19 @@ msgstr "Es gibt keine Funktion mit Namen „%s“"
#: info/infomap.c:585
#, fuzzy, c-format
+#| msgid "could not read init file %s"
msgid "could not open init file %s"
msgstr "Initialisierungsdatei %s konnte nicht gelesen werden."
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "Tastenkombination zu lang."
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "Fehlende Tastenkombination."
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-Zeichen (\\000) nicht erlaubt."
@@ -947,12 +1010,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "NUL-Zeichen (^%c) nicht erlaubt."
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "Fehlender Befehlsname."
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "Tastenkombination zu lang."
@@ -962,7 +1023,6 @@ msgid "unknown action `%s'"
msgstr "Unbekannter Befehl „%s“."
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "Befehlsname zu lang."
@@ -972,22 +1032,18 @@ msgid "extra characters following action `%s'"
msgstr "Extrazeichen folgen Befehl „%s“."
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "Variablenname fehlt."
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "Fehlendes „=“ direkt hinter Variablenname."
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "Variablenname zu lang"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "Wert zu lang"
@@ -1009,7 +1065,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Einen Befehlsnamen im Echo-Bereich lesen und ausführen"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an 'echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "Der Befehl für Echo-Bereich ist hier nicht ausführbar."
@@ -1094,7 +1151,6 @@ msgid "Show all matching files"
msgstr "Alle passenden Dateien anzeigen"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Kein Datei-Index"
@@ -1103,6 +1159,9 @@ msgstr "Kein Datei-Index"
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item, \\[get-info-help-node] for tutorial."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1246,6 +1305,8 @@ msgstr "Diesen Menüeintrag auswählen"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There isn't %d item in this menu."
+#| msgid_plural "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "Es gibt keinen Eintrag in diesem Menü."
@@ -1275,6 +1336,7 @@ msgstr "xref folgen: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "Der Verweis ist verschwunden! (%s)."
@@ -1308,11 +1370,13 @@ msgstr "Verweis oder Menüeintrag auswählen, der auf dieser Zeile erscheint"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node '%s'."
msgid "No menu in node '%s'"
msgstr "Kein Menü im Knoten „%s“."
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by '%s' in '%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr ""
"Es kann kein Knoten gefunden werden, der von „%s“ in „%s“ referenziert wird."
@@ -1351,11 +1415,13 @@ msgstr "Den ersten Knoten dieser Datei auswählen"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "Keine weiteren Knoten in diesem Dokument."
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No 'Prev' or 'Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr ""
"Kein „vorige“ (Prev) oder „aufwärts“ (Up) für diesen Knoten innerhalb dieses "
@@ -1411,7 +1477,6 @@ msgid "Select the most recently selected node"
msgstr "Den zuletzt gewählten Knoten auswählen"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Kein weiter zurückliegender Knoten in der Historie"
@@ -1425,11 +1490,13 @@ msgstr "Datei finden: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find '%s'."
msgid "Cannot find '%s'"
msgstr "„%s“ kann nicht gefunden werden."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file '%s'."
msgid "Could not create output file '%s'"
msgstr "Ausgabedatei „%s“ kann nicht angelegt werden."
@@ -1456,6 +1523,7 @@ msgstr ""
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to '%s'."
msgid "Cannot open pipe to '%s'"
msgstr "Daten können nicht an „%s“ weitergereicht werden (mittels einer Pipe)."
@@ -1474,22 +1542,26 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Die Verwendung regulärer Ausdrücke in Suchen umschalten"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Using regular expressions for searches"
msgstr "Für Suchen werden reguläre Ausdrücke benutzt"
#: info/session.c:3909
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches."
msgid "Using literal strings for searches"
msgstr "Für Suchen werden wortwörtliche Zeichenketten benutzt"
#: info/session.c:4112
#, fuzzy
+#| msgid "Search continued from the end of the document."
msgid "Search continued from the end of the document"
msgstr "Suche vom Ende des Dokuments fortgesetzt."
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the beginning of the document."
msgid "Search continued from the beginning of the document"
msgstr "Suche vom Anfang des Dokuments fortgesetzt."
@@ -1498,8 +1570,9 @@ msgstr "Suche vom Anfang des Dokuments fortgesetzt."
msgid "Searching subfile %s ..."
msgstr "Unterdatei „%s“ wird durchsucht …"
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "Suche fehlgeschlagen."
@@ -1533,143 +1606,145 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Suchzeichenkette zu kurz"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "No match"
msgid "No more matches"
msgstr "Keine Ãœbereinstimmung"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "Unterdatei „%s“ wird durchsucht …"
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr ""
"Eine Zeichenkette einlesen und danach gemäß Groß-/Kleinschreibung suchen"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Eine Zeichenkette einlesen und danach suchen"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Eine Zeichenkette einlesen und danach in Rückwärtsrichtung suchen"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Letzte Suche in der gleichen Richtung wiederholen"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Keine vorherige Such-Zeichenkette."
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Letzte Suche in der entgegengesetzten Richtung wiederholen"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Die angezeigten Suchtreffer nicht mehr anzeigen"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Interaktiv eine Zeichenkette während der Eingabe suchen"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Interaktive Suche mit regulärem Ausdruck in Rückwärtsrichtung: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Interaktive Suche in Rückwärtsrichtung: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Interaktive Suche mit regulärem Ausdruck: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Interaktive Suche: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Fehlschlagende "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Momentane Operation abbrechen"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Beenden"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Programmversion anzeigen"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info Version %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Anzeige erneut darstellen"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Info beenden"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr ""
"Befehl ausführen, der an die kleingeschriebene Variante dieser\n"
" Taste gebunden ist"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "Unbekannter Befehl (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "„%s“ ist ungültig"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "„%s“ ist ungültig"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufügen"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Das aktuelle numerische Argument beginnen (oder mit 4 multiplizieren)"
@@ -1759,6 +1834,7 @@ msgstr "Methode, die verwendet wird, um Mausbewegungen zu verfolgen"
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "Zum nächsten Querverweis bewegen"
@@ -1776,6 +1852,7 @@ msgstr ""
#: info/variables.c:156
#, fuzzy
+#| msgid "Clear displayed search matches"
msgid "Styles for search matches"
msgstr "Die angezeigten Suchtreffer nicht mehr anzeigen"
@@ -1993,6 +2070,23 @@ msgstr ""
#: install-info/install-info.c:639
#, fuzzy, c-format
+#| msgid ""
+#| "This is the file .../info/dir, which contains the\n"
+#| "topmost node of the Info hierarchy, called (dir)Top.\n"
+#| "The first time you invoke Info you start off looking at this node.\n"
+#| "%c\n"
+#| "%s\tThis is the top of the INFO tree\n"
+#| "\n"
+#| " This (the Directory node) gives a menu of major topics.\n"
+#| " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+#| " \"h\" gives a primer for first-timers,\n"
+#| " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+#| "\n"
+#| " In Emacs, you can click mouse button 2 on a menu item or cross "
+#| "reference\n"
+#| " to select it.\n"
+#| "\n"
+#| "%s\n"
msgid ""
"This is the file .../info/dir, which contains the\n"
"topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -2032,12 +2126,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kann nicht gelesen (%s) und nicht angelegt werden (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY ohne END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY ohne START-INFO-DIR-ENTRY"
@@ -2067,12 +2159,10 @@ msgid "excess command line argument `%s'"
msgstr "überflüssiges Befehlszeilen-Argument „%s“ wird übergangen"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Keine Eingabe-Datei angegeben; „--help“ gibt weitere Informationen."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Keine dir-Datei angegeben; „--help“ gibt weitere Informationen."
@@ -2091,305 +2181,261 @@ msgstr "Kein Info-Verzeichnis-Eintrag in „%s“"
msgid "no entries found for `%s'; nothing deleted"
msgstr "keine Einträge für „%s“ gefunden; nichts entfernt"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "%s konnte nicht zum Schreiben geöffnet werden: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s ist kein gültiges Sprachkürzel"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s ist kein gültiges Regionskürzel"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s is keine gültige Aufspaltmöglichkeit"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "%s konnte nicht gelesen werden: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "Fehler beim Schließen von @verbatiminclude-Datei %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: %s konnte nicht gefunden werden"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "kein Knoten zum Umbenennen"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "Knoten ohne einen neuen Namen am Ende der Datei"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "%s konnte nicht geöffnet werden: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "Hash-Zeichen in @%s konnte nicht geschützt werden"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "Leerer Knotenname nach der Erweiterung „%s“"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s „%s“ früher definiert"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "hier ist die frühere Definition als @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "leeres Argument in @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: die Ausgabe ist ungeeignet für Split"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "Fehler beim Schließen von %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "Verzeichnisse „%s“ oder „%s“ konnten nicht angelegt werden: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "Verzeichnis „%s“ konnte nicht angelegt werden: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image-Datei „%s“ nicht gefunden, „%s“ wird benutzt"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "es wurde kein Argument für @U angegeben"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-Datei „%s“ (für HTML) nicht gefunden, „%s“ wird benutzt"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "rohes Format %s wird nicht konvertiert"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "HTML-Refs-Konfigurationsdatei %s konnte nicht gefunden werden: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "fehlender Typ"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "nicht erkannter Typ: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "Fehler beim Schließen derHTML-Refs-Konfigurationsdatei %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "Zeichenkette in CSS-Datei nicht geschlossen"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include endete inmitten eines Kommentars"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import in CSS-Datei nicht abgeschlossen"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS-Datei %s nicht gefunden"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "--include-file %s konnte nicht geöffnet werden: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "Fehler beim Schließen der CSS-Datei %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "kein Eintrag htmlxref.cnf für „%s“ gefunden"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "Fehler beim Schließen der Rahmendatei %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "Fehler beim Schließen der Inhaltsverzeichnis-Rahmendatei %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "Verarbeitung %s der Stufe %s %s-Pritorität ist fehlgeschlagen"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "Titel muss mit dem Titelbefehl oder @top angegeben werden"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "Fehler beim Schließen der umbenannten Knotendatei %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "alter Name für „%s“ ist ein Knoten dieses Dokuments."
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "Datei leer für umbenannten Knoten „%s“"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "Zielknoten (neuer Name für „%s“) ist nicht im Dokument: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"Fehler beim Schließen der umbenannten Knoten-Weiterleitungsdatei %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "leerer Knotenname"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "Syntax für einen externen Knoten für „%s“ benutzt"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "Dokument ohne Knoten."
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "Dokument ohne obersten Knoten."
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "Umbenennen von %s fehlgeschlagen: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s mehr als einmal ausgegeben: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s (außerhalb jeglichen Knotens)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "@node-Name sollte nicht „,“ enthalten: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Der Indexeintrag in @%s mit „:“ erzeugt ungültigen Info-Code: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "Eintrag für Index „%s“ außerhalb jeglichen Knotens"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "Fehler beim Schließen der Textdatei %s für das Bild: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-Datei „%s“ nicht lesbar: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
"Weder @image-Datei „%s.txt“ noch alternativer Text konnten gefunden werden"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2397,306 +2443,335 @@ msgstr ""
"@strong{Bemerkung...} erzeugt einen Pseudo-Querverweis in Info; "
"umformulieren, um das zu vermeiden"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "@%s Querverweis-Name sollte keinen „:“ enthalten"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "@%s Knotenname sollte kein „%s“ enthalten"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "@%s Knotenname sollte keinen „:“ enthalten"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "„.“ oder „,“ muss @xref folgen, nicht %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "„.“ oder „,“ muss @xref folgen"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "Menüeintrag-Knotenname sollte kein „%s“ enthalten"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "Menüeintrag-Knotenname sollte keinen „:“ enthalten"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "Menüeintrag-Name sollte keinen „:“ enthalten"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "%s konnte nicht geöffnet werden: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "mehrfache @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "Fehlerhaftes oder leeres formales Argument @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "Fehlerhafte Syntax für Argument @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s erfordert einen Namen"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "fehlerhafter Name für @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s gesehen vor @%s schließender Klammer"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s gesehen vor schließender Klammer von @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s fehlende schließende Klammer"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s fehlende schließende Trennsequenz: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx sollte nicht @%s beginnen"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx muss nach @item kommen"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s hat Text aber kein @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "„@end“ erwartete „%s“, jedoch „%s“ erhalten"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s gesehen vor @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "kein übereinstimmendes „%cend %s“"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "fehlplatziertes %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "nicht übereinstimmendes „%c%s“"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "Makro „%s“ mit zu vielen Argumenten aufgerufen"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
+#| msgid "@%s missing close brace"
msgid "@%s missing closing brace"
msgstr "@%s fehlende schließende Klammer"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "Makro „%s“ deklariert ohne Argument, aber mit Argument aufgerufen"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"Dem \\ in der @%s-Erweiterung folgt „%s“ anstelle eines Parameternamens oder "
"\\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "fehlender Name für @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "fehlende Kategorie für @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "unerwartetes Argument auf @%s-Zeile: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "leere Mehrfachtabelle"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "überflüssiges Argument für @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "fehlerhaftes Argument für @%s"
# %citem ist ein Texinfo-Befehl
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s benötigt ein Argument: den Formatierer für %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"Befehl @%s, der kein Argument in Klammern akzeptiert, sollte nicht in einer @"
"%s-Zeile sein"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "Akzent-Befehl „@%s“ ist als @%s-Argument nicht erlaubt"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s fehlendes Argument"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "unbekanntes @end %s“"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "überflüssiges Argument für @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "fehlerhaftes Argument für @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: %s konnte nicht geöffnet werden: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "Kodierung „%s“ ist keine kanonische texinfo-Zeichenkodierung"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nicht erkannter Kodierungsname „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s nach dem ersten Element"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s nur sinnvoll auf einer „@multitable“-Zeile"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@%s should not be associated with @top"
+msgid "@part should not be associated with @top"
+msgstr "@%s sollte nicht mit @top assoziiert sein"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
"@node ist @%s vorangestellt, aber Teile dürfen nicht Knoten zugeordnet werden"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "Syntax für einen externen Knoten für „%s“ benutzt"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "Leerer Menüeintrag-Name in „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "leerer Knotenname im Menüeintrag"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s sollte nicht in @%s erscheinen"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "@end %s should only appear at a line beginning"
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s sollte nur an einem Zeilenanfang erscheinen"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "Makro „%s“ früher definiert"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "hier ist die frühere Definition von „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "Texinfo-Sprachbefehl erneut definiert: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s ohne zugehöriges Zeichen"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s definiert mit keinem oder mehr als einem Argument, sollte mit {} "
"aufgerufen werden"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2704,353 +2779,370 @@ msgstr ""
"Makroaufruf ist zu tief verschachtelt (setzen Sie MAX_NESTED_MACROS, um dies "
"außer Kraft zu setzen; aktueller Wert ist %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"rekursiver Aufruf des Makros %s ist nicht erlaubt; verwenden Sie @rmacro, "
"falls nötig"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "Auf den Akzent-Befehl „@%s“ muss ein Leerzeichen folgen"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "Klammern verwenden, um einen Befehl als Argument an „@%s“ zu übergeben"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s erwartet „i“ oder „j“ als Argument, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "Auf den Akzent-Befehl „@%s“ darf kein Zeilenumbruch folgen"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s erwartete geschweifte Klammern"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "unbekannter Befehl „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "undefiniertes Flag: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "Fehlerhafte Syntax für @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s ist obsolet."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s ist obsolet; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear at a line beginning"
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s sollte nur am Zeilenanfang erscheinen"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s sollte nur in Kopf- oder Fußzeilen erscheinen"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s nicht sinnvoll innerhalb eines „@%s“-Blocks"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s in leerer Multitabelle"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab vor @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "zu viele Spalten im „@multitable“-Eintrag (maximal %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "@tab außerhalb einer „multitable“ wird ignoriert"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s außerhalb der Tabelle oder Liste"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s nicht erlaubt innerhalb eines „@%s“-Blocks"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear in math context"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s sollte nur in mathematischem Kontext erscheinen"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "Muss hinter „@%s“ sein, um „@%s“ zu benutzen"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
"@%s nicht sinnvoll außerhalb von „@titlepage“- und „@quotation“-Umgebungen"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory nach dem ersten Knoten"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "Region %s innerhalb Region %s ist nicht erlaubt"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry nach dem ersten Knoten"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s vor erstem @node gefunden"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"vielleicht sollte der @top-Knoten eher von @ifnottex als von @ifinfo "
"umschlossen werden?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s sollte nur in mathematischem Kontext erscheinen"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s sollte nur in mathematischem Kontext erscheinen"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "unerwartetes @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s nicht sinnvoll außerhalb einer „@float“-Umgebung"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s sollte sich genau vor „@float“ befinden"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "mehrfache @%s werden ignoriert"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "Befehl @%s akzeptiert keine Argumente"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "Befehl @%s ohne Knoten oder Argument für ein externes Handbuch"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "in @%s leerer Querverweis-Name nach der Erweiterung von „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "in @%s leerer Querverweis-Titel nach der Erweiterung von „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image fehlt als Argument ein Dateiname"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s erstes Argument fehlt"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "nicht-hexadezimale Ziffern im Argument für @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "weniger als vier hexadezimale Ziffern im Argument für @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
"das Argument für @U übersteigt das Maximum für Unicode von 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "überflüssige Argumente für Knoten"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "@end %s wurde erwartet"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s sollte nur einen @-Befehl als Argument akzeptieren, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "Verbleibendes Argument in Zeile @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "Umgebungsbefehl %s als Argument zu @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "leeres @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "Spaltenteilung keine Zahl: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "Argument für @sp muss numerisch sein, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "reservierte Index-Name %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "Unbekannter Quell-Index @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "Unbekannter Ziel-Index @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s ergibt eine Zusammenführung von %s mit sich selbst, wird ignoriert"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "Unbekannter Index „%s“ in @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, fuzzy, c-format, perl-format
+#| msgid "printing an index `%s' merged in another one `%s'"
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "Ausgabe eines Index „%s“ wurde in einen anderen „%s“ zusammengeführt"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex vor dem Anfang des Dokuments: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "Argument für @%s muss „top“oder „bottom“ sein, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Nur @%s 10 oder 11 unterstützt, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "Argument für @%s muss „separate“ oder „end“ sein, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "Argument für @%s muss „on“, „off“ oder „odd“ sein, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"Argument für @paragraphindent muss „numeric“, „none“ oder „asis“ sein, nicht "
"„%s“"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"Argument für @firstparagraphindent muss „none“ oder „insert“ sein, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"Argument für @exampleindent muss „numeric“ oder „asis“ sein, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "@%s „on“ oder „off“ wurde erwartet, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"Argument für @kbdinputstyle muss „code“, „example“ oder „distinct“ sein, "
"nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"Argument für @allowcodebreaks muss „true“ oder „false“ sein, nicht „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"Argument für @urefbreakstyle muss „after“, „before“ oder „none“ sein, nicht "
@@ -3085,7 +3177,7 @@ msgstr "kein Abschnittsbefehl mit @%s verknüpft"
msgid "@%s not empty"
msgstr "@%s ist nicht leer"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s-Referenz auf nicht existierenden Knoten „%s“"
@@ -3095,108 +3187,108 @@ msgstr "@%s-Referenz auf nicht existierenden Knoten „%s“"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s Name des Eintragsknotens „%s“ unterscheidet sich vom %s-Namen „%s“"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "Nicht referenzierter Knoten „%s“"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "Knoten „%s“ ist %s für „%s“ im Abschnitt, aber nicht im Menü"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "%s-Knoten „%s“ im Menü „%s“ und im Abschnitt „%s“ sind unterschiedlich"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "„%s“-Knoten ist %s für „%s“ im Menü, aber nicht im Abschnitt"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s-Zeiger „%s„ (für Knoten „%s“) unterscheidet sich vom %s-Namen „%s“"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s-Referenz zu nicht existierendem „%s“"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Dem Knoten „%s“ fehlt ein Menüeintrag für „%s“, obwohl er dessen Ziel für "
"„aufwärts“ (Up) ist"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
"für „%s“, nach oben im Menü „%s“ und nach oben zu „%s“ sind unterschiedlich"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s zu „%s“, unterscheidet sich vom %s-Namen „%s“"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "Leerer Index-Schlüssel in @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: %s konnte nicht zum Schreiben geöffnet werden: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: Fehler beim Schließen von %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: Latex-Datei %s konnte nicht zum Schreiben geöffnet werden: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: L2H_TMP-Verzeichnis enthält einen Punkt"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: aktuelles Verzeichnis enthält einen Punkt"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: Befehl war nicht erfolgreich: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: Bild hat eine ungültige Erweiterung: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: Umbenennen von %s in %s fehlgeschlagen: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: %s konnte nicht geöffnet werden: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: Ende des @%s-Eintrags %d nicht gefunden"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3205,12 +3297,12 @@ msgstr ""
"latex2html.pm: erzeugte %d Einträge in HTML werden verarbeitet; %d wurden "
"erwartet, die Anzahl der im Dokument gefundenen Einträge"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: Fragment %d für @%s konnte nicht ermittelt werden"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3219,47 +3311,47 @@ msgstr ""
"l2h: Fragment %d für @%s mit Ausgabezähler %d von HTML konnte nicht "
"extrahiert werden"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: %s konnte nicht geladen werden: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: %s konnte nicht zum Schreiben geöffnet werden: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: %s konnte nicht geöffnet werden: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: chdir %s fehlgeschlagen: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: Rückkehr zum ursprünglichen Verzeichnis nicht möglich: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: Ausgabedatei fehlt: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: Befehl fehlgeschlagen: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: Ende des @%s-Eintrags %d nicht gefunden"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3268,12 +3360,12 @@ msgstr ""
"tex4ht.pm: erzeugte %d Einträge in HTML werden verarbeitet; %d wurden "
"erwartet, die Anzahl der im Dokument für @%s gefundenen Einträge"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: Ausgabe hat keinen HTML-Eintrag für @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3282,37 +3374,37 @@ msgstr ""
"tex4ht.pm: erzeugte %d Einträge in HTML werden verarbeitet; %d wurden "
"erwartet, die Anzahl der im Dokument für @%s gefundenen Einträge"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "Fehler beim Laden von %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: unbekannte Variable %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: unbekannte Variable %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "Initialisierungsdatei %s konnte nicht gelesen werden."
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "nicht erkannter Wert „%s“ für TEXINFO_OUTPUT_FORMAT wird ignoriert\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3324,7 +3416,7 @@ msgstr ""
"standardmäßig in Info-Dateien, die online mit einem Info-Leser wie\n"
"GNU Info (oder auch Emacs, TkInfo, etc.) gelesen werden können.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3360,7 +3452,7 @@ msgstr ""
" -v, --verbose ausführlich die Bearbeitungschritte anzeigen\n"
" --version Programmversion anzeigen und beenden\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3378,7 +3470,7 @@ msgstr ""
" --dvi, --dvipdf, --ps, --pdf texi2dvi für entsprechende Ausgabe "
"nutzen.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3430,7 +3522,7 @@ msgstr ""
" Ausgabedatei dort platzieren.\n"
" Anderenfalls ist ZIEL die Ausgabedatei.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3474,7 +3566,7 @@ msgstr ""
" --split-size=GRÖSSE in GRÖSSE große Dateien splitten (Standard "
"%d)\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3500,7 +3592,7 @@ msgstr ""
"erstellen\n"
" (ist Standard bei Aufteilung)\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3509,7 +3601,7 @@ msgstr ""
" --output-indent=WERT macht nichts, wird zwecks Kompatibilität "
"erhalten.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3518,7 +3610,7 @@ msgstr ""
" --Xopt=OPTION gibt OPTION an texi2dvi weiter; kann widerholt "
"werden.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3538,7 +3630,7 @@ msgstr ""
" -P VERZ VERZ dem Suchpfad für @include voranstellen\n"
" -U VAR eine Variable aufheben (wie mit @clear)\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3578,7 +3670,7 @@ msgstr ""
" Außerdem werden bei den --no-ifFORMAT-Optionen auch die entsprechenden\n"
" @ifnoFORMAT-Abschnitte bearbeitet.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3595,7 +3687,7 @@ msgstr ""
" wird reiner Text erzeugt, ist --ifplaintext an und die anderen sind aus;\n"
" wird XML erzeugt, ist --ifxml an und die anderen sind aus.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3628,66 +3720,66 @@ msgstr ""
" makeinfo --no-split foo.texi nur eine Info-Datei (kann groß "
"sein)\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: Argument für --footnote-style muss „separate“ oder „end“ sein, nicht "
"„%s“.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: Argument für --paragraph-indent muss numerisch, „none“ oder „asis“ sein, "
"nicht „%s“.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: beim Erzeugen von %s kann nur eine Ausgabedatei mit -o angegeben werden\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "Option --Xopt ohne gedruckte Ausgabe"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "unbekannte Baumumformung %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "Splitten für Format %s wird ignoriert"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: Datei-Angabe fehlt.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "„%s --help“ gibt weitere Informationen.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"fill_gaps_in_sectioning-Umwandlung liefert kein Ergebnis. Kein Abschnitt?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "Fehler beim Schließen der Makro-Erweiterungsdatei %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "%s konnte nicht zum Schreiben geöffnet werden: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3695,36 +3787,316 @@ msgstr ""
"insert_nodes_for_sectioning_commands-Umwandlung liefert kein Ergebnis. Kein "
"Abschnitt?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: Fehler beim Schließen von %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: Fehler beim Schließen der internen Verknüpfungsdatei %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: %s konnte nicht zum Schreiben geöffnet werden: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "kein übereinstimmendes „%cend %s“"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "fehlplatziertes %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "nicht übereinstimmendes „%c%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s erfordert einen Namen"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "fehlerhafter Name für @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s erfordert einen Namen"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "fehlerhafter Name für @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s erfordert einen Namen"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "fehlerhafter Name für @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s sollte nur einen @-Befehl als Argument akzeptieren, nicht „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "Umgebungsbefehl %s als Argument zu @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "fehlerhaftes Argument für @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "fehlerhaftes Argument für @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "leeres Argument in @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "fehlerhaftes Argument für @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Nur @%s 10 oder 11 unterstützt, nicht „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: Argument für --footnote-style muss „separate“ oder „end“ sein, nicht "
+"„%s“.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "Argument für @%s muss „on“, „off“ oder „odd“ sein, nicht „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "fehlerhaftes Argument für @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"Argument für @firstparagraphindent muss „none“ oder „insert“ sein, nicht „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "fehlerhaftes Argument für @%s: %s"
+
+# %citem ist ein Texinfo-Befehl
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s benötigt ein Argument: den Formatierer für %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "nicht übereinstimmendes „%c%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "überflüssiges Argument für @%s %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "fehlerhaftes Argument für @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: %s konnte nicht gefunden werden"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: %s konnte nicht geöffnet werden: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "@%s nach dem ersten Element"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s nur sinnvoll auf einer „@multitable“-Zeile"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+"@node ist @%s vorangestellt, aber Teile dürfen nicht Knoten zugeordnet werden"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s nicht sinnvoll innerhalb eines „@%s“-Blocks"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s nicht erlaubt innerhalb eines „@%s“-Blocks"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s sollte nur in mathematischem Kontext erscheinen"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@%s nicht sinnvoll außerhalb von „@titlepage“- und „@quotation“-Umgebungen"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s erfordert einen Namen"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "Fehlerhaftes oder leeres formales Argument @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s erwartet „i“ oder „j“ als Argument, nicht „%s“"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "undefiniertes Flag: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s ist obsolet."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s ist obsolet; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s sollte nur in mathematischem Kontext erscheinen"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s ohne zugehöriges Zeichen"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s erwartet „i“ oder „j“ als Argument, nicht „%s“"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "fehlplatziertes %c"
+
+#, c-format
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
#~ msgstr "%s: Option „--%s“ erlaubt kein Argument\n"
+#, c-format
#~ msgid "%s: unrecognized option '--%s'\n"
#~ msgstr "%s: nicht erkannte Option „--%s“\n"
+#, c-format
#~ msgid "%s: option '-W %s' is ambiguous\n"
#~ msgstr "%s: Option „-W %s“ ist nicht eindeutig\n"
+#, c-format
#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
#~ msgstr "%s: Option „-W %s“ erlaubt kein Argument\n"
+#, c-format
#~ msgid "%s: option '-W %s' requires an argument\n"
#~ msgstr "%s: Option „-W %s“ benötigt ein Argument\n"
+#, c-format
#~ msgid "No file given for node '%s'."
#~ msgstr "Keine Datei angegeben für Knoten „%s“."
@@ -3757,27 +4129,34 @@ msgstr "%s: %s konnte nicht zum Schreiben geöffnet werden: %s\n"
#~ "Fehler in der Ãœbersetzung bitte melden an:\n"
#~ "<translation-team-de@lists.sourceforge.net>"
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "Undefinierter Befehl: %s"
+#, c-format
#~ msgid "can't open %s: %s"
#~ msgstr "%s kann nicht geöffnet werden: %s"
+#, c-format
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "Debugging-Ausgabe umgeleitet zu „%s“"
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: Kein Speicher mehr!\n"
#~ msgid "--*** Tags out of Date ***"
#~ msgstr "--*** Veraltete Tags ***"
+#, c-format
#~ msgid "-%s---Info: %s, %ld lines --%s--"
#~ msgstr "-%s---Info: %s, %ld Zeilen --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %ld lines --%s--"
#~ msgstr "-%s%s-Info: (%s)%s, %ld Zeilen --%s--"
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr " Unterdatei: %s"
@@ -3787,20 +4166,48 @@ msgstr "%s: %s konnte nicht zum Schreiben geöffnet werden: %s\n"
#~ msgid "arguments are quoted by default"
#~ msgstr "Argumente werden standardmäßig in Anführungszeichen eingeschlossen"
+#~ msgid "no node to be renamed"
+#~ msgstr "kein Knoten zum Umbenennen"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "Knoten ohne einen neuen Namen am Ende der Datei"
+
+#, perl-format
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Veraltete Variable %s\n"
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "alter Name für „%s“ ist ein Knoten dieses Dokuments."
+
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "Datei leer für umbenannten Knoten „%s“"
+
+#, perl-format
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "Zielknoten (neuer Name für „%s“) ist nicht im Dokument: %s"
+
+#, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "Fehler beim Schließen der umbenannten Knoten-Weiterleitungsdatei %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "leerer Knotenname"
+
+#, perl-format
#~ msgid "@%s should only appear at beginning or end of document"
#~ msgstr "@%s sollte nur am Anfang oder Ende eines Dokuments erscheinen"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s sollte nicht mit @top assoziiert sein"
-
+#, perl-format
#~ msgid "argument for @U exceeds size of integer: %s"
#~ msgstr "das Argument für @U übersteigt die Grenze einer Ganzzahl: %s"
+#, perl-format
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: veraltete Variable %s\n"
+#, perl-format
#~ msgid "obsolete variable %s\n"
#~ msgstr "veraltete Variable %s\n"
diff --git a/macros/texinfo/texinfo/po/de_AT.gmo b/macros/texinfo/texinfo/po/de_AT.gmo
deleted file mode 100644
index 4fe27f8bf4..0000000000
--- a/macros/texinfo/texinfo/po/de_AT.gmo
+++ /dev/null
Binary files differ
diff --git a/macros/texinfo/texinfo/po/de_AT.po b/macros/texinfo/texinfo/po/de_AT.po
deleted file mode 100644
index b8bcc81e3d..0000000000
--- a/macros/texinfo/texinfo/po/de_AT.po
+++ /dev/null
@@ -1,3261 +0,0 @@
-# German/autrian messages for GNU Texinfo
-# Copyright © 1999 Free Software Foundation, Inc.
-# Karl Eichwalder <ke@suse.de>, 1999.
-#
-# 1999-02-16 21:11:38 MET
-# Vorgeschlagen von Guido Flohr <gufl0000@stud.uni-sb.de>.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: texinfo 3.12d\n"
-"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 1999-02-16 21:14+01:00\n"
-"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
-"Language-Team: German <de@li.org>\n"
-"Language: de_AT\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: gnulib/lib/error.c:195
-msgid "Unknown system error"
-msgstr ""
-
-#: gnulib/lib/getopt.c:278
-#, c-format
-msgid "%s: option '%s%s' is ambiguous\n"
-msgstr ""
-
-#: gnulib/lib/getopt.c:284
-#, c-format
-msgid "%s: option '%s%s' is ambiguous; possibilities:"
-msgstr ""
-
-#: gnulib/lib/getopt.c:319
-#, c-format
-msgid "%s: unrecognized option '%s%s'\n"
-msgstr ""
-
-#: gnulib/lib/getopt.c:345
-#, c-format
-msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr ""
-
-#: gnulib/lib/getopt.c:360
-#, c-format
-msgid "%s: option '%s%s' requires an argument\n"
-msgstr ""
-
-#: gnulib/lib/getopt.c:621
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr ""
-
-#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:682
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:135
-msgid "Success"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:138
-msgid "No match"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:141
-msgid "Invalid regular expression"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:144
-msgid "Invalid collation character"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:147
-msgid "Invalid character class name"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:150
-msgid "Trailing backslash"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:153
-msgid "Invalid back reference"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:156
-msgid "Unmatched [, [^, [:, [., or [="
-msgstr ""
-
-#: gnulib/lib/regcomp.c:159
-msgid "Unmatched ( or \\("
-msgstr ""
-
-#: gnulib/lib/regcomp.c:162
-msgid "Unmatched \\{"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:165
-msgid "Invalid content of \\{\\}"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:168
-msgid "Invalid range end"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:171
-msgid "Memory exhausted"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:174
-msgid "Invalid preceding regular expression"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:177
-msgid "Premature end of regular expression"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:180
-msgid "Regular expression too big"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:183
-msgid "Unmatched ) or \\)"
-msgstr ""
-
-#: gnulib/lib/regcomp.c:676
-msgid "No previous regular expression"
-msgstr ""
-
-#: gnulib/lib/xalloc-die.c:34
-msgid "memory exhausted"
-msgstr ""
-
-#: info/echo-area.c:289 info/session.c:1367
-msgid "Move forward a character"
-msgstr ""
-
-#: info/echo-area.c:308 info/session.c:1380
-msgid "Move backward a character"
-msgstr ""
-
-#: info/echo-area.c:334
-msgid "Move to the start of this line"
-msgstr ""
-
-#: info/echo-area.c:339
-msgid "Move to the end of this line"
-msgstr ""
-
-#: info/echo-area.c:347 info/session.c:1395
-msgid "Move forward a word"
-msgstr ""
-
-#: info/echo-area.c:387 info/session.c:1409
-msgid "Move backward a word"
-msgstr ""
-
-#: info/echo-area.c:427
-msgid "Delete the character under the cursor"
-msgstr ""
-
-#: info/echo-area.c:447
-msgid "Delete the character behind the cursor"
-msgstr ""
-
-#: info/echo-area.c:474
-msgid "Cancel or quit operation"
-msgstr ""
-
-#: info/echo-area.c:489
-msgid "Accept (or force completion of) this line"
-msgstr ""
-
-#: info/echo-area.c:494
-msgid "Insert next character verbatim"
-msgstr ""
-
-#: info/echo-area.c:526
-msgid "Insert a TAB character"
-msgstr ""
-
-#: info/echo-area.c:578
-msgid "Transpose characters at point"
-msgstr ""
-
-#: info/echo-area.c:647
-msgid "Yank back the contents of the last kill"
-msgstr ""
-
-#: info/echo-area.c:654
-msgid "Kill ring is empty"
-msgstr ""
-
-#: info/echo-area.c:667
-msgid "Yank back a previous kill"
-msgstr ""
-
-#: info/echo-area.c:700
-msgid "Kill to the end of the line"
-msgstr ""
-
-#: info/echo-area.c:713
-msgid "Kill to the beginning of the line"
-msgstr ""
-
-#: info/echo-area.c:725
-msgid "Kill the word following the cursor"
-msgstr ""
-
-#: info/echo-area.c:745
-msgid "Kill the word preceding the cursor"
-msgstr ""
-
-#: info/echo-area.c:977 info/echo-area.c:1036
-msgid "No completions"
-msgstr ""
-
-#: info/echo-area.c:979
-msgid "Not complete"
-msgstr ""
-
-#: info/echo-area.c:1029
-msgid "List possible completions"
-msgstr ""
-
-#: info/echo-area.c:1040
-msgid "Sole completion"
-msgstr ""
-
-#: info/echo-area.c:1049
-#, c-format
-msgid "%d completion:\n"
-msgid_plural "%d completions:\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: info/echo-area.c:1166
-msgid "Insert completion"
-msgstr ""
-
-#: info/echo-area.c:1268
-#, c-format
-msgid "Building completions..."
-msgstr ""
-
-#: info/echo-area.c:1387
-msgid "Scroll the completions window"
-msgstr ""
-
-#: info/filesys.c:88
-#, c-format
-msgid "looking for file \"%s\""
-msgstr ""
-
-#: info/filesys.c:150
-#, c-format
-msgid "looking for file %s in %s"
-msgstr ""
-
-#: info/filesys.c:236 info/filesys.c:250 info/filesys.c:271
-#, c-format
-msgid "found file %s"
-msgstr ""
-
-#: info/footnotes.c:229
-#, c-format
-msgid "Footnotes could not be displayed"
-msgstr ""
-
-#: info/footnotes.c:249
-msgid "Show the footnotes associated with this node in another window"
-msgstr ""
-
-#: info/footnotes.h:24
-msgid "---------- Footnotes ----------"
-msgstr ""
-
-#: info/indices.c:121 info/indices.c:877
-#, c-format
-msgid "Finding index entries..."
-msgstr ""
-
-#: info/indices.c:201
-msgid "Look up a string in the index for this file"
-msgstr ""
-
-#: info/indices.c:213
-#, c-format
-msgid "No indices found"
-msgstr ""
-
-#: info/indices.c:217
-msgid "Index entry: "
-msgstr ""
-
-#: info/indices.c:320 info/indices.c:883
-#, c-format
-msgid "No indices found."
-msgstr ""
-
-#: info/indices.c:436
-#, c-format
-msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
-msgstr ""
-
-#: info/indices.c:446
-msgid ""
-"Go to the next matching index item from the last '\\[index-search]' command"
-msgstr ""
-
-#: info/indices.c:457
-#, c-format
-msgid "No previous index search string"
-msgstr ""
-
-#: info/indices.c:475
-#, c-format
-msgid "No more index entries containing '%s'"
-msgstr ""
-
-#: info/indices.c:476
-#, c-format
-msgid "No index entries containing '%s'"
-msgstr ""
-
-#: info/indices.c:586
-#, c-format
-msgid "Scanning indices of '%s'..."
-msgstr ""
-
-#: info/indices.c:646
-msgid "Grovel all known info file's indices for a string and build a menu"
-msgstr ""
-
-#: info/indices.c:654 info/indices.c:656
-msgid "Index apropos"
-msgstr ""
-
-#: info/indices.c:698
-#, c-format
-msgid "Index entries containing '%s':\n"
-msgstr ""
-
-#: info/indices.c:818
-#, c-format
-msgid ""
-"Virtual Index\n"
-"*************\n"
-"\n"
-"Index entries that match '%s':\n"
-msgstr ""
-
-#: info/indices.c:865
-msgid "List all matches of a string in the index"
-msgstr ""
-
-#: info/indices.c:889 info/indices.c:891
-msgid "Index topic"
-msgstr ""
-
-#: info/indices.c:916
-#, c-format
-msgid "No index entries containing '%s'."
-msgstr ""
-
-#: info/indices.h:40
-#, c-format
-msgid "No available info files have '%s' in their indices"
-msgstr ""
-
-#: info/info-utils.c:878
-#, c-format
-msgid "Error converting file character encoding"
-msgstr ""
-
-#: info/info.c:277 info/session.c:2786
-#, c-format
-msgid "No menu item '%s' in node '%s'"
-msgstr ""
-
-#: info/info.c:415 info/info.c:1181
-#, c-format
-msgid "Cannot find node '%s'"
-msgstr ""
-
-#: info/info.c:437
-#, c-format
-msgid "No program name given"
-msgstr ""
-
-#: info/info.c:635
-#, c-format
-msgid "invalid number: %s\n"
-msgstr ""
-
-#: info/info.c:815
-#, c-format
-msgid "malformed variable assignment: %s"
-msgstr ""
-
-#: info/info.c:822 info/infokey.c:558
-#, c-format
-msgid "%s: no such variable"
-msgstr ""
-
-#: info/info.c:828 info/infokey.c:560
-#, c-format
-msgid "value %s is not valid for variable %s"
-msgstr ""
-
-#: info/info.c:840
-#, c-format
-msgid "Try --help for more information.\n"
-msgstr ""
-
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
-#, c-format, perl-format
-msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-"html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-
-#: info/info.c:1035
-#, c-format
-msgid "no index entries found for '%s'\n"
-msgstr ""
-
-#: info/info.c:1089
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [MENU-ITEM...]\n"
-"\n"
-"Read documentation in Info format.\n"
-msgstr ""
-
-#: info/info.c:1095
-msgid ""
-"Frequently-used options:\n"
-" -a, --all use all matching manuals\n"
-" -k, --apropos=STRING look up STRING in all indices of all manuals\n"
-" -d, --directory=DIR add DIR to INFOPATH\n"
-" -f, --file=MANUAL specify Info manual to visit"
-msgstr ""
-
-#: info/info.c:1102
-msgid ""
-" -h, --help display this help and exit\n"
-" --index-search=STRING go to node pointed by index entry STRING\n"
-" -n, --node=NODENAME specify nodes in first visited Info file\n"
-" -o, --output=FILE output selected nodes to FILE"
-msgstr ""
-
-#: info/info.c:1108
-msgid " -O, --show-options, --usage go to command-line options node"
-msgstr ""
-
-#: info/info.c:1112
-msgid " -b, --speech-friendly be friendly to speech synthesizers"
-msgstr ""
-
-#: info/info.c:1116
-msgid ""
-" --subnodes recursively output menu items\n"
-" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
-" --version display version information and exit\n"
-" -w, --where, --location print physical location of Info file"
-msgstr ""
-
-#: info/info.c:1122
-msgid ""
-"\n"
-"The first non-option argument, if present, is the menu entry to start from;\n"
-"it is searched for in all 'dir' files along INFOPATH.\n"
-"If it is not present, info merges all 'dir' files and shows the result.\n"
-"Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited."
-msgstr ""
-
-#: info/info.c:1129
-msgid ""
-"\n"
-"For a summary of key bindings, type H within Info."
-msgstr ""
-
-#: info/info.c:1132
-msgid ""
-"\n"
-"Examples:\n"
-" info show top-level dir menu\n"
-" info info-stnd show the manual for this Info program\n"
-" info emacs start at emacs node from top-level dir\n"
-" info emacs buffers select buffers menu entry in emacs manual\n"
-" info emacs -n Files start at Files node within emacs manual\n"
-" info '(emacs)Files' alternative way to start at Files node\n"
-" info --show-options emacs start at node with emacs' command line "
-"options\n"
-" info --subnodes -o out.txt emacs\n"
-" dump entire emacs manual to out.txt\n"
-" info -f ./foo.info show file ./foo.info, not searching dir"
-msgstr ""
-
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
-msgid ""
-"Email bug reports to bug-texinfo@gnu.org,\n"
-"general questions and discussion to help-texinfo@gnu.org.\n"
-"Texinfo home page: http://www.gnu.org/software/texinfo/"
-msgstr ""
-
-#: info/info.c:1182
-#, c-format
-msgid "Cannot find node '(%s)%s'"
-msgstr ""
-
-#: info/info.c:1183
-msgid "Cannot find a window!"
-msgstr ""
-
-#: info/info.c:1184
-msgid "Point doesn't appear within this window's node!"
-msgstr ""
-
-#: info/info.c:1185
-msgid "Cannot delete the last window"
-msgstr ""
-
-#: info/info.c:1186
-msgid "No menu in this node"
-msgstr ""
-
-#: info/info.c:1187
-msgid "No footnotes in this node"
-msgstr ""
-
-#: info/info.c:1188
-msgid "No cross references in this node"
-msgstr ""
-
-#: info/info.c:1189
-#, c-format
-msgid "No '%s' pointer for this node"
-msgstr ""
-
-#: info/info.c:1190
-#, c-format
-msgid "Unknown Info command '%c'; try '?' for help"
-msgstr ""
-
-#: info/info.c:1191
-#, c-format
-msgid "Terminal type '%s' is not smart enough to run Info"
-msgstr ""
-
-#: info/info.c:1192
-msgid "You are already at the last page of this node"
-msgstr ""
-
-#: info/info.c:1193
-msgid "You are already at the first page of this node"
-msgstr ""
-
-#: info/info.c:1194
-msgid "Only one window"
-msgstr ""
-
-#: info/info.c:1195
-msgid "Resulting window would be too small"
-msgstr ""
-
-#: info/info.c:1196
-msgid "Not enough room for a help window, please delete a window"
-msgstr ""
-
-#: info/infodoc.c:38
-msgid "Basic Info command keys\n"
-msgstr ""
-
-#: info/infodoc.c:40
-msgid "\\%-10[quit-help] Close this help window.\n"
-msgstr ""
-
-#: info/infodoc.c:41
-msgid "\\%-10[quit] Quit Info altogether.\n"
-msgstr ""
-
-#: info/infodoc.c:42
-msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n"
-msgstr ""
-
-#: info/infodoc.c:44
-msgid "\\%-10[prev-line] Move up one line.\n"
-msgstr ""
-
-#: info/infodoc.c:45
-msgid "\\%-10[next-line] Move down one line.\n"
-msgstr ""
-
-#: info/infodoc.c:46
-msgid "\\%-10[scroll-backward] Scroll backward one screenful.\n"
-msgstr ""
-
-#: info/infodoc.c:47
-msgid "\\%-10[scroll-forward] Scroll forward one screenful.\n"
-msgstr ""
-
-#: info/infodoc.c:48
-msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n"
-msgstr ""
-
-#: info/infodoc.c:49
-msgid "\\%-10[end-of-node] Go to the end of this node.\n"
-msgstr ""
-
-#: info/infodoc.c:51
-msgid "\\%-10[move-to-next-xref] Skip to the next hypertext link.\n"
-msgstr ""
-
-#: info/infodoc.c:52
-msgid ""
-"\\%-10[select-reference-this-line] Follow the hypertext link under the "
-"cursor.\n"
-msgstr ""
-
-#: info/infodoc.c:53
-msgid "\\%-10[history-node] Go back to the last node seen in this window.\n"
-msgstr ""
-
-#: info/infodoc.c:55
-msgid "\\%-10[global-prev-node] Go to the previous node in the document.\n"
-msgstr ""
-
-#: info/infodoc.c:56
-msgid "\\%-10[global-next-node] Go to the next node in the document.\n"
-msgstr ""
-
-#: info/infodoc.c:57
-msgid "\\%-10[prev-node] Go to the previous node on this level.\n"
-msgstr ""
-
-#: info/infodoc.c:58
-msgid "\\%-10[next-node] Go to the next node on this level.\n"
-msgstr ""
-
-#: info/infodoc.c:59
-msgid "\\%-10[up-node] Go up one level.\n"
-msgstr ""
-
-#: info/infodoc.c:60
-msgid "\\%-10[top-node] Go to the top node of this document.\n"
-msgstr ""
-
-#: info/infodoc.c:61
-msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
-msgstr ""
-
-#: info/infodoc.c:63
-msgid "1...9 Pick the first...ninth item in this node's menu.\n"
-msgstr ""
-
-#: info/infodoc.c:64
-msgid "\\%-10[last-menu-item] Pick the last item in this node's menu.\n"
-msgstr ""
-
-#: info/infodoc.c:65
-msgid "\\%-10[menu-item] Pick a menu item specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:66
-msgid "\\%-10[xref-item] Follow a cross reference specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:67
-msgid "\\%-10[goto-node] Go to a node specified by name.\n"
-msgstr ""
-
-#: info/infodoc.c:69
-msgid "\\%-10[search] Search forward for a specified string.\n"
-msgstr ""
-
-#: info/infodoc.c:70
-msgid "\\%-10[search-previous] Search for previous occurrence.\n"
-msgstr ""
-
-#: info/infodoc.c:71
-msgid "\\%-10[search-next] Search for next occurrence.\n"
-msgstr ""
-
-#: info/infodoc.c:72
-msgid ""
-"\\%-10[index-search] Search for a specified string in the index, and\n"
-" select the node referenced by the first entry found.\n"
-msgstr ""
-
-#: info/infodoc.c:74
-msgid "\\%-10[virtual-index] Synthesize menu of matching index entries.\n"
-msgstr ""
-
-#: info/infodoc.c:76
-msgid "\\%-10[abort-key] Cancel the current operation.\n"
-msgstr ""
-
-#: info/infodoc.c:195
-#, c-format
-msgid "This is GNU Info version %s. "
-msgstr ""
-
-#: info/infodoc.c:196
-msgid "The current search path is:\n"
-msgstr ""
-
-#: info/infodoc.c:201
-msgid ""
-"Commands available in Info windows:\n"
-"\n"
-msgstr ""
-
-#: info/infodoc.c:204
-msgid ""
-"Commands available in the echo area:\n"
-"\n"
-msgstr ""
-
-#: info/infodoc.c:224
-#, c-format
-msgid ""
-"The following commands can only be invoked via %s:\n"
-"\n"
-msgstr ""
-
-#: info/infodoc.c:229
-msgid ""
-"The following commands cannot be invoked at all:\n"
-"\n"
-msgstr ""
-
-#: info/infodoc.c:333
-msgid "Display help message"
-msgstr ""
-
-#: info/infodoc.c:346
-msgid "Visit Info node '(info)Help'"
-msgstr ""
-
-#: info/infodoc.c:450
-msgid "Print documentation for KEY"
-msgstr ""
-
-#: info/infodoc.c:461
-#, c-format
-msgid "Describe key: %s"
-msgstr ""
-
-#: info/infodoc.c:471 info/infodoc.c:507
-#, c-format
-msgid "%s is undefined"
-msgstr ""
-
-#: info/infodoc.c:795
-msgid "Show what to type to execute a given command"
-msgstr ""
-
-#: info/infodoc.c:799
-msgid "Where is command: "
-msgstr ""
-
-#: info/infodoc.c:821
-#, c-format
-msgid "'%s' is not on any keys"
-msgstr ""
-
-#: info/infodoc.c:827
-#, c-format
-msgid "%s can only be invoked via %s"
-msgstr ""
-
-#: info/infodoc.c:831
-#, c-format
-msgid "%s can be invoked via %s"
-msgstr ""
-
-#: info/infodoc.c:836
-#, c-format
-msgid "There is no function named '%s'"
-msgstr ""
-
-#: info/infomap.c:585
-#, c-format
-msgid "could not open init file %s"
-msgstr ""
-
-#: info/infokey.c:227
-#, c-format
-msgid "key sequence too long"
-msgstr ""
-
-#: info/infokey.c:304
-#, c-format
-msgid "missing key sequence"
-msgstr ""
-
-#: info/infokey.c:384
-#, c-format
-msgid "NUL character (\\000) not permitted"
-msgstr ""
-
-#: info/infokey.c:413
-#, c-format
-msgid "NUL character (^%c) not permitted"
-msgstr ""
-
-#: info/infokey.c:436
-#, c-format
-msgid "missing action name"
-msgstr ""
-
-#: info/infokey.c:454
-#, c-format
-msgid "cannot bind key sequence to menu-digit"
-msgstr ""
-
-#: info/infokey.c:478
-#, c-format
-msgid "unknown action `%s'"
-msgstr ""
-
-#: info/infokey.c:503
-#, c-format
-msgid "action name too long"
-msgstr ""
-
-#: info/infokey.c:516
-#, c-format
-msgid "extra characters following action `%s'"
-msgstr ""
-
-#: info/infokey.c:527
-#, c-format
-msgid "missing variable name"
-msgstr ""
-
-#: info/infokey.c:536
-#, c-format
-msgid "missing `=' immediately after variable name"
-msgstr ""
-
-#: info/infokey.c:543
-#, c-format
-msgid "variable name too long"
-msgstr ""
-
-#: info/infokey.c:567
-#, c-format
-msgid "value too long"
-msgstr ""
-
-#: info/infokey.c:613
-#, c-format
-msgid "\"%s\", line %u: "
-msgstr ""
-
-#: info/m-x.c:64
-msgid "Read the name of an Info command and describe it"
-msgstr ""
-
-#: info/m-x.c:68
-msgid "Describe command: "
-msgstr ""
-
-#: info/m-x.c:91
-msgid "Read a command name in the echo area and execute it"
-msgstr ""
-
-#: info/m-x.c:134
-#, c-format
-msgid "Cannot execute an 'echo-area' command here"
-msgstr ""
-
-#: info/m-x.c:148
-msgid "Set the height of the displayed window"
-msgstr ""
-
-#: info/m-x.c:161
-#, c-format
-msgid "Set screen height to (%d): "
-msgstr ""
-
-#: info/makedoc.c:139
-#, c-format
-msgid ""
-" Source files groveled to make this file include:\n"
-"\n"
-msgstr ""
-
-#: info/makedoc.c:464
-#, c-format
-msgid "Couldn't manipulate the file %s.\n"
-msgstr ""
-
-#. TRANSLATORS: The "\n* Menu:\n\n" part of this should not be translated, as
-#. it is part of the Info syntax.
-#: info/nodemenu.c:33
-msgid ""
-"\n"
-"* Menu:\n"
-"\n"
-" (File)Node Lines Size Containing File\n"
-" ---------- ----- ---- ---------------"
-msgstr ""
-
-#: info/nodemenu.c:185
-msgid ""
-"Here is the menu of nodes you have recently visited.\n"
-"Select one from this menu, or use '\\[history-node]' in another window.\n"
-msgstr ""
-
-#: info/nodemenu.c:206
-msgid "Make a window containing a menu of all of the currently visited nodes"
-msgstr ""
-
-#: info/nodemenu.c:251
-msgid "Select a node which has been previously visited in a visible window"
-msgstr ""
-
-#: info/nodemenu.c:258
-msgid "Select visited node: "
-msgstr ""
-
-#: info/nodemenu.c:276
-#, c-format
-msgid "The reference disappeared! (%s)."
-msgstr ""
-
-#: info/pcterm.c:223
-#, c-format
-msgid "Terminal cannot be initialized: %s\n"
-msgstr ""
-
-#: info/search.c:201
-#, c-format
-msgid "regexp error: %s"
-msgstr ""
-
-#: info/session.c:59
-msgid "Show all matching files"
-msgstr ""
-
-#: info/session.c:63
-#, c-format
-msgid "No file index"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this message (when "expanded") at most 79
-#. characters; anything after the 79th character will not actually be
-#. displayed on an 80-column terminal.
-#: info/session.c:189
-#, c-format
-msgid ""
-"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
-"help-node] for tutorial."
-msgstr ""
-
-#: info/session.c:1254
-msgid "Move down to the next line"
-msgstr ""
-
-#: info/session.c:1269
-msgid "Move up to the previous line"
-msgstr ""
-
-#: info/session.c:1285
-msgid "Move the cursor to a specific line of the window"
-msgstr ""
-
-#: info/session.c:1317
-msgid "Move to the end of the line"
-msgstr ""
-
-#: info/session.c:1342
-msgid "Move to the start of the line"
-msgstr ""
-
-#: info/session.c:1424
-msgid "Move to the start of this node"
-msgstr ""
-
-#: info/session.c:1431
-msgid "Move to the end of this node"
-msgstr ""
-
-#: info/session.c:1522
-msgid "Scroll forward in this window"
-msgstr ""
-
-#: info/session.c:1536
-msgid "Scroll backward in this window"
-msgstr ""
-
-#: info/session.c:1544
-msgid "Scroll forward in this window and set default window size"
-msgstr ""
-
-#: info/session.c:1559
-msgid "Scroll backward in this window and set default window size"
-msgstr ""
-
-#: info/session.c:1565
-msgid "Scroll forward in this window staying within node"
-msgstr ""
-
-#: info/session.c:1580
-msgid "Scroll backward in this window staying within node"
-msgstr ""
-
-#: info/session.c:1588
-msgid ""
-"Scroll forward in this window staying within node and set default window size"
-msgstr ""
-
-#: info/session.c:1615
-msgid ""
-"Scroll backward in this window staying within node and set default window "
-"size"
-msgstr ""
-
-#: info/session.c:1621
-msgid "Scroll down by lines"
-msgstr ""
-
-#: info/session.c:1627
-msgid "Scroll up by lines"
-msgstr ""
-
-#: info/session.c:1639
-msgid "Scroll down by half screen size"
-msgstr ""
-
-#: info/session.c:1666
-msgid "Scroll up by half screen size"
-msgstr ""
-
-#: info/session.c:1672
-msgid "Scroll the other window"
-msgstr ""
-
-#: info/session.c:1693
-msgid "Scroll the other window backward"
-msgstr ""
-
-#: info/session.c:1807
-msgid "Select the next window"
-msgstr ""
-
-#: info/session.c:1844
-msgid "Select the previous window"
-msgstr ""
-
-#: info/session.c:1888
-msgid "Split the current window"
-msgstr ""
-
-#: info/session.c:1933
-msgid "Delete the current window"
-msgstr ""
-
-#: info/session.c:1938
-msgid "Cannot delete a permanent window"
-msgstr ""
-
-#: info/session.c:1969
-msgid "Delete all other windows"
-msgstr ""
-
-#: info/session.c:2015
-msgid "Grow (or shrink) this window"
-msgstr ""
-
-#: info/session.c:2026
-msgid "Divide the available screen space among the visible windows"
-msgstr ""
-
-#: info/session.c:2033
-msgid "Toggle the state of line wrapping in the current window"
-msgstr ""
-
-#: info/session.c:2187
-msgid "Select this menu item"
-msgstr ""
-
-#: info/session.c:2217
-#, c-format
-msgid "There isn't %d item in this menu"
-msgid_plural "There aren't %d items in this menu"
-msgstr[0] ""
-msgstr[1] ""
-
-#: info/session.c:2226
-msgid "Select the last item in this node's menu"
-msgstr ""
-
-#: info/session.c:2332 info/session.c:2333
-#, c-format
-msgid "Menu item (%s): "
-msgstr ""
-
-#: info/session.c:2336
-msgid "Menu item: "
-msgstr ""
-
-#: info/session.c:2343 info/session.c:2344
-#, c-format
-msgid "Follow xref (%s): "
-msgstr ""
-
-#: info/session.c:2347
-msgid "Follow xref: "
-msgstr ""
-
-#: info/session.c:2424
-#, c-format
-msgid "The reference disappeared! (%s)"
-msgstr ""
-
-#: info/session.c:2436
-msgid "Read a menu item and select its node"
-msgstr ""
-
-#: info/session.c:2461
-msgid "Read a footnote or cross reference and select its node"
-msgstr ""
-
-#: info/session.c:2484
-msgid "Move to the start of this node's menu"
-msgstr ""
-
-#: info/session.c:2506
-msgid "Visit as many menu items at once as possible"
-msgstr ""
-
-#: info/session.c:2606
-msgid "Move to the previous cross reference"
-msgstr ""
-
-#: info/session.c:2669
-msgid "Move to the next cross reference"
-msgstr ""
-
-#: info/session.c:2730
-msgid "Select reference or menu item appearing on this line"
-msgstr ""
-
-#: info/session.c:2764
-#, c-format
-msgid "No menu in node '%s'"
-msgstr ""
-
-#: info/session.c:2811
-#, c-format
-msgid "Unable to find node referenced by '%s' in '%s'"
-msgstr ""
-
-#: info/session.c:2867
-msgid "Read a list of menus starting from dir and follow them"
-msgstr ""
-
-#: info/session.c:2869
-msgid "Follow menus: "
-msgstr ""
-
-#: info/session.c:2974
-msgid "Select the Next node"
-msgstr ""
-
-#: info/session.c:2981
-msgid "Select the Prev node"
-msgstr ""
-
-#: info/session.c:2988
-msgid "Select the Up node"
-msgstr ""
-
-#: info/session.c:2994
-msgid "Select the last node in this file"
-msgstr ""
-
-#: info/session.c:3021 info/session.c:3054
-msgid "This window has no additional nodes"
-msgstr ""
-
-#: info/session.c:3027
-msgid "Select the first node in this file"
-msgstr ""
-
-#: info/session.c:3161
-msgid "No more nodes within this document"
-msgstr ""
-
-#: info/session.c:3205 info/session.c:3244
-msgid "No 'Prev' or 'Up' for this node within this document"
-msgstr ""
-
-#: info/session.c:3257
-msgid "Move forwards or down through node structure"
-msgstr ""
-
-#: info/session.c:3274
-msgid "Move backwards or up through node structure"
-msgstr ""
-
-#: info/session.c:3297
-msgid "Read a node name and select it"
-msgstr ""
-
-#: info/session.c:3351 info/session.c:3355
-msgid "Goto node: "
-msgstr ""
-
-#: info/session.c:3534
-msgid "Find the node describing program invocation"
-msgstr ""
-
-#: info/session.c:3536
-#, c-format
-msgid "Find Invocation node of [%s]: "
-msgstr ""
-
-#: info/session.c:3581
-msgid "Read a manpage reference and select it"
-msgstr ""
-
-#: info/session.c:3585
-msgid "Get Manpage: "
-msgstr ""
-
-#: info/session.c:3606
-msgid "Select the node 'Top' in this file"
-msgstr ""
-
-#: info/session.c:3612
-msgid "Select the node '(dir)'"
-msgstr ""
-
-#: info/session.c:3618
-msgid "Show full file name of node being displayed"
-msgstr ""
-
-#: info/session.c:3635
-msgid "Select the most recently selected node"
-msgstr ""
-
-#: info/session.c:3640
-#, c-format
-msgid "No earlier node in history"
-msgstr ""
-
-#: info/session.c:3644
-msgid "Read the name of a file and select it"
-msgstr ""
-
-#: info/session.c:3648
-msgid "Find file: "
-msgstr ""
-
-#: info/session.c:3665
-#, c-format
-msgid "Cannot find '%s'"
-msgstr ""
-
-#: info/session.c:3713
-#, c-format
-msgid "Could not create output file '%s'"
-msgstr ""
-
-#: info/session.c:3727
-#, c-format
-msgid "error writing to %s: %s"
-msgstr ""
-
-#: info/session.c:3736
-#, c-format
-msgid "closing %s"
-msgstr ""
-
-#: info/session.c:3785
-#, c-format
-msgid "writing node %s..."
-msgstr ""
-
-#: info/session.c:3831
-msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-msgstr ""
-
-#: info/session.c:3859
-#, c-format
-msgid "Cannot open pipe to '%s'"
-msgstr ""
-
-#: info/session.c:3864
-#, c-format
-msgid "printing node %s..."
-msgstr ""
-
-#: info/session.c:3872
-#, c-format
-msgid "finished printing node %s"
-msgstr ""
-
-#: info/session.c:3904
-msgid "Toggle the usage of regular expressions in searches"
-msgstr ""
-
-#: info/session.c:3908
-#, c-format
-msgid "Using regular expressions for searches"
-msgstr ""
-
-#: info/session.c:3909
-#, c-format
-msgid "Using literal strings for searches"
-msgstr ""
-
-#: info/session.c:4112
-msgid "Search continued from the end of the document"
-msgstr ""
-
-#: info/session.c:4117
-msgid "Search continued from the beginning of the document"
-msgstr ""
-
-#: info/session.c:4134
-#, c-format
-msgid "Searching subfile %s ..."
-msgstr ""
-
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
-msgid "Search failed"
-msgstr ""
-
-#: info/session.c:4192
-#, c-format
-msgid "%s%s%s [%s]: "
-msgstr ""
-
-#: info/session.c:4193 info/session.c:4199
-msgid "Regexp search"
-msgstr ""
-
-#: info/session.c:4193 info/session.c:4199
-msgid "Search"
-msgstr ""
-
-#: info/session.c:4194 info/session.c:4200
-msgid " case-sensitively"
-msgstr ""
-
-#: info/session.c:4195 info/session.c:4201
-msgid " backward"
-msgstr ""
-
-#: info/session.c:4198
-#, c-format
-msgid "%s%s%s: "
-msgstr ""
-
-#: info/session.c:4218
-msgid "Search string too short"
-msgstr ""
-
-#: info/session.c:4409
-#, c-format
-msgid "Going back to last match from %s"
-msgstr ""
-
-#: info/session.c:4438 info/session.c:4551
-#, c-format
-msgid "No more matches"
-msgstr ""
-
-#: info/session.c:4578
-msgid "Search this node and subnodes for a string"
-msgstr ""
-
-#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
-#, c-format
-msgid "Search under %s: "
-msgstr ""
-
-#: info/session.c:4600
-msgid "Go to next match in Info sub-tree"
-msgstr ""
-
-#: info/session.c:4604 info/session.c:4616
-#, c-format
-msgid "No active search"
-msgstr ""
-
-#: info/session.c:4612
-msgid "Go to previous match in Info sub-tree"
-msgstr ""
-
-#: info/session.c:4625
-msgid "Read a string and search for it case-sensitively"
-msgstr ""
-
-#: info/session.c:4630
-msgid "Read a string and search for it"
-msgstr ""
-
-#: info/session.c:4636
-msgid "Read a string and search backward for it"
-msgstr ""
-
-#: info/session.c:4644
-msgid "Repeat last search in the same direction"
-msgstr ""
-
-#: info/session.c:4652 info/session.c:4697
-msgid "No previous search string"
-msgstr ""
-
-#: info/session.c:4689
-msgid "Repeat last search in the reverse direction"
-msgstr ""
-
-#: info/session.c:4736
-msgid "Clear displayed search matches"
-msgstr ""
-
-#: info/session.c:4752 info/session.c:4758
-msgid "Search interactively for a string as you type it"
-msgstr ""
-
-#: info/session.c:4878
-msgid "Regexp I-search backward: "
-msgstr ""
-
-#: info/session.c:4879
-msgid "I-search backward: "
-msgstr ""
-
-#: info/session.c:4881
-msgid "Regexp I-search: "
-msgstr ""
-
-#: info/session.c:4882
-msgid "I-search: "
-msgstr ""
-
-#: info/session.c:4907 info/session.c:4910
-msgid "Failing "
-msgstr ""
-
-#: info/session.c:5275
-msgid "Cancel current operation"
-msgstr ""
-
-#: info/session.c:5282
-msgid "Quit"
-msgstr ""
-
-#: info/session.c:5287
-msgid "Display version of Info being run"
-msgstr ""
-
-#: info/session.c:5289
-#, c-format
-msgid "GNU Info version %s"
-msgstr ""
-
-#: info/session.c:5294
-msgid "Redraw the display"
-msgstr ""
-
-#: info/session.c:5331
-msgid "Quit using Info"
-msgstr ""
-
-#: info/session.c:5347
-msgid "Run command bound to this key's lowercase variant"
-msgstr ""
-
-#: info/session.c:5358
-#, c-format
-msgid "Unknown command (%s)"
-msgstr ""
-
-#: info/session.c:5361
-#, c-format
-msgid "\"%s\" is invalid"
-msgstr ""
-
-#: info/session.c:5362
-#, c-format
-msgid "'%s' is invalid"
-msgstr ""
-
-#: info/session.c:5680
-msgid "Add this digit to the current numeric argument"
-msgstr ""
-
-#: info/session.c:5687
-msgid "Start (or multiply by 4) the current numeric argument"
-msgstr ""
-
-#: info/variables.c:67
-msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr ""
-
-#: info/variables.c:71
-msgid "When \"On\", creating or deleting a window resizes other windows"
-msgstr ""
-
-#: info/variables.c:75
-msgid "When \"On\", flash the screen instead of ringing the bell"
-msgstr ""
-
-#: info/variables.c:79
-msgid "When \"On\", errors cause the bell to ring"
-msgstr ""
-
-#: info/variables.c:83
-msgid "When \"On\", Info garbage collects files which had to be uncompressed"
-msgstr ""
-
-#: info/variables.c:86
-msgid "When \"On\", the portion of the matched search string is highlighted"
-msgstr ""
-
-#: info/variables.c:90
-msgid "Controls what happens when scrolling is requested at the end of a node"
-msgstr ""
-
-#: info/variables.c:95
-msgid "Same as scroll-behaviour"
-msgstr ""
-
-#: info/variables.c:99
-msgid "The number lines to scroll when the cursor moves out of the window"
-msgstr ""
-
-#: info/variables.c:103
-msgid "Controls whether scroll-behavior affects cursor movement commands"
-msgstr ""
-
-#: info/variables.c:107
-msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr ""
-
-#: info/variables.c:111
-msgid ""
-"What to do when a scrolling command is issued at the end of the last node"
-msgstr ""
-
-#: info/variables.c:116
-msgid "Minimal length of a search string"
-msgstr ""
-
-#: info/variables.c:120
-msgid "Skip current window when searching"
-msgstr ""
-
-#: info/variables.c:124
-msgid "Exclude default directories from file search path"
-msgstr ""
-
-#: info/variables.c:128
-msgid "Hide some Info file syntax in the text of nodes"
-msgstr ""
-
-#: info/variables.c:132
-msgid ""
-"Length of time in milliseconds to wait for the next byte in a sequence "
-"indicating that a key has been pressed"
-msgstr ""
-
-#: info/variables.c:136
-msgid "Method to use to track mouse events"
-msgstr ""
-
-#: info/variables.c:140
-msgid "How to follow a cross-reference"
-msgstr ""
-
-#: info/variables.c:144
-msgid "Highlight search matches"
-msgstr ""
-
-#: info/variables.c:148
-msgid "Styles for links"
-msgstr ""
-
-#: info/variables.c:152
-msgid "Styles for active links"
-msgstr ""
-
-#: info/variables.c:156
-msgid "Styles for search matches"
-msgstr ""
-
-#: info/variables.c:160
-msgid "How to print the information line at the start of a node"
-msgstr ""
-
-#: info/variables.c:221
-msgid "Explain the use of a variable"
-msgstr ""
-
-#: info/variables.c:227
-msgid "Describe variable: "
-msgstr ""
-
-#: info/variables.c:247
-msgid "Set the value of an Info variable"
-msgstr ""
-
-#: info/variables.c:254
-msgid "Set variable: "
-msgstr ""
-
-#: info/variables.c:270
-#, c-format
-msgid "Set %s to value (%d): "
-msgstr ""
-
-#: info/variables.c:304
-#, c-format
-msgid "Set %s to value (%s): "
-msgstr ""
-
-#: info/window.c:907
-msgid "-----Info: (), lines ----, "
-msgstr ""
-
-#: install-info/install-info.c:289
-#, c-format
-msgid "%s: empty file"
-msgstr ""
-
-#: install-info/install-info.c:291
-#, c-format
-msgid "%s for %s"
-msgstr ""
-
-#: install-info/install-info.c:530
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr ""
-
-#: install-info/install-info.c:538
-#, c-format
-msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-msgstr ""
-
-#: install-info/install-info.c:540
-msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
-msgstr ""
-
-#: install-info/install-info.c:541
-msgid ""
-"INFO-FILE and DIR-FILE are required unless the --info-file\n"
-"or --dir-file (or --info-dir) options are given, respectively."
-msgstr ""
-
-#: install-info/install-info.c:545
-msgid ""
-"Options:\n"
-" --add-once add only to first matching section, not all.\n"
-" --align=COL start description of new entries at column COL.\n"
-" --calign=COL format second and subsequent description lines to\n"
-" start at column COL."
-msgstr ""
-
-#: install-info/install-info.c:552
-msgid ""
-" --debug report what is being done.\n"
-" --delete delete existing entries for INFO-FILE from DIR-FILE;\n"
-" don't insert any new entries.\n"
-" --defsection=TEXT like --section, but only use TEXT if no sections\n"
-" are present in INFO-FILE (replacing \"Miscellaneous"
-"\").\n"
-" --description=TEXT the description of the entry is TEXT; used with\n"
-" the --name option to become synonymous with the\n"
-" --entry option.\n"
-" --dir-file=NAME specify file name of Info directory file;\n"
-" equivalent to using the DIR-FILE argument.\n"
-" --dry-run same as --test."
-msgstr ""
-
-#: install-info/install-info.c:565
-msgid ""
-" --entry=TEXT insert TEXT as an Info directory entry,\n"
-" overriding any corresponding entry from DIR-FILE.\n"
-" TEXT is written as an Info menu item line followed\n"
-" by zero or more extra lines starting with "
-"whitespace.\n"
-" If you specify more than one entry, all are added.\n"
-" If you don't specify any entries, they are determined\n"
-" from information in the Info file itself."
-msgstr ""
-
-#: install-info/install-info.c:574
-msgid ""
-" --help display this help and exit.\n"
-" --info-dir=DIR same as --dir-file=DIR/dir.\n"
-" --info-file=FILE specify Info file to install in the directory;\n"
-" equivalent to using the INFO-FILE argument.\n"
-" --item=TEXT same as --entry=TEXT.\n"
-" --keep-old do not replace entries, or remove empty sections."
-msgstr ""
-
-#: install-info/install-info.c:582
-msgid ""
-" --maxwidth, --max-width=COL wrap description at column COL.\n"
-" --menuentry=TEXT same as --name=TEXT.\n"
-" --name=TEXT the name of the entry is TEXT; used with --description\n"
-" to become synonymous with the --entry option.\n"
-" --no-indent do not format new entries in the DIR file.\n"
-" --quiet suppress warnings."
-msgstr ""
-
-#: install-info/install-info.c:590
-msgid ""
-" --regex=R put this file's entries in all sections that match the\n"
-" regular expression R (ignoring case).\n"
-" --remove same as --delete.\n"
-" --remove-exactly only remove if the info file name matches exactly;\n"
-" suffixes such as .info and .gz are not ignored.\n"
-" --section=SEC put entries in section SEC of the directory.\n"
-" If you specify more than one section, all the entries\n"
-" are added in each of the sections.\n"
-" If you don't specify any sections, they are "
-"determined\n"
-" from information in the Info file itself;\n"
-" if nothing is available there, the --defsection\n"
-" value is used; if that is not specified, the\n"
-" final default is \"Miscellaneous\".\n"
-" --section R SEC equivalent to --regex=R --section=SEC --add-once."
-msgstr ""
-
-#: install-info/install-info.c:606
-msgid ""
-" --silent suppress warnings.\n"
-" --test suppress updating of DIR-FILE.\n"
-" --version display version information and exit."
-msgstr ""
-
-#: install-info/install-info.c:639
-#, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"%c\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-" This (the Directory node) gives a menu of major topics.\n"
-" Typing \"q\" exits, \"H\" lists all Info commands, \"d\" returns here,\n"
-" \"h\" gives a primer for first-timers,\n"
-" \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-" In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-" to select it.\n"
-"\n"
-"%s\n"
-msgstr ""
-
-#: install-info/install-info.c:663
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)"
-msgstr ""
-
-#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr ""
-
-#: install-info/install-info.c:1186
-#, c-format
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr ""
-
-#: install-info/install-info.c:2061 install-info/install-info.c:2071
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr ""
-
-#: install-info/install-info.c:2167
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr ""
-
-#: install-info/install-info.c:2200
-#, c-format
-msgid "Extra regular expression specified, ignoring `%s'"
-msgstr ""
-
-#: install-info/install-info.c:2212
-#, c-format
-msgid "Error in regular expression `%s': %s"
-msgstr ""
-
-#: install-info/install-info.c:2274
-#, c-format
-msgid "excess command line argument `%s'"
-msgstr ""
-
-#: install-info/install-info.c:2278
-#, c-format
-msgid "No input file specified; try --help for more information."
-msgstr ""
-
-#: install-info/install-info.c:2280
-#, c-format
-msgid "No dir file specified; try --help for more information."
-msgstr ""
-
-#: install-info/install-info.c:2301
-#, c-format
-msgid "Could not read %s."
-msgstr ""
-
-#: install-info/install-info.c:2448
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr ""
-
-#: install-info/install-info.c:2696
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr ""
-
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
-#, perl-format
-msgid "could not open %s for writing: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:892
-msgid ""
-"move your @contents command if you want the contents after the title page"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:895
-msgid ""
-"move your @shortcontents and @contents commands if you want the contents "
-"after the title page"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
-msgid "%s is not a valid language code"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
-msgid "%s is not a valid region code"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1174
-#, perl-format
-msgid "%s is not a valid split possibility"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1196
-#, perl-format
-msgid "could not read %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1216
-#, perl-format
-msgid "error on closing @verbatiminclude file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
-#, perl-format
-msgid "@%s: could not find %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
-#, perl-format
-msgid "could not protect hash character in @%s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2636
-#, perl-format
-msgid "empty node name after expansion `%s'"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2644
-#, perl-format
-msgid "@%s `%s' previously defined"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2650
-#, perl-format
-msgid "here is the previous definition as @%s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
-msgid "empty argument in @%s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:772
-#, perl-format
-msgid "%s: output incompatible with split"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
-#, perl-format
-msgid "error on closing %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:965
-#, perl-format
-msgid "could not create directories `%s' or `%s': %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:973
-#, perl-format
-msgid "could not create directory `%s': %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:993
-#, perl-format
-msgid "@image file `%s' not found, using `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
-msgid "no argument specified for @U"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:1719
-#, perl-format
-msgid "@image file `%s' (for HTML) not found, using `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:2404
-#, perl-format
-msgid "raw format %s is not converted"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4647
-#, perl-format
-msgid "could not open html refs config file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4675
-msgid "missing type"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4678
-#, perl-format
-msgid "unrecognized type: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4695
-#, perl-format
-msgid "error on closing html refs config file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5022
-msgid "string not closed in css file"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5024
-msgid "--css-include ended in comment"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5026
-msgid "@import not finished in css file"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5052
-#, perl-format
-msgid "CSS file %s not found"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5058
-#, perl-format
-msgid "could not open --include-file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5068
-#, perl-format
-msgid "error on closing CSS file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
-#, perl-format
-msgid "no htmlxref.cnf entry found for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6591
-#, perl-format
-msgid "error on closing frame file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6615
-#, perl-format
-msgid "error on closing TOC frame file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6730
-#, perl-format
-msgid "handler %s of stage %s priority %s failed"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6935
-msgid "must specify a title with a title command or @top"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7146
-#, perl-format
-msgid "error on closing redirection node file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
-msgid "document without nodes"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:121
-msgid "document without Top node"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:169
-#, perl-format
-msgid "rename %s failed: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:250
-#, perl-format
-msgid "@%s output more than once: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:380
-#, perl-format
-msgid "@%s outside of any node"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:423
-#, perl-format
-msgid "@node name should not contain `,': %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1243
-#, perl-format
-msgid "Index entry in @%s with : produces invalid Info: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
-msgid "entry for index `%s' outside of any node"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1402
-#, perl-format
-msgid "error on closing image text file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1407
-#, perl-format
-msgid "@image file `%s' unreadable: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1428
-#, perl-format
-msgid "could not find @image file `%s.txt' nor alternate text"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1788
-msgid ""
-"@strong{Note...} produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2036
-#, perl-format
-msgid "@%s cross-reference name should not contain `:'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2074
-#, perl-format
-msgid "@%s node name should not contain `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2107
-#, perl-format
-msgid "@%s node name should not contain `:'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2154
-#, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2157
-msgid "`.' or `,' must follow @xref"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2952
-#, perl-format
-msgid "menu entry node name should not contain `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2963
-msgid "menu entry node name should not contain `:'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2983
-msgid "menu entry name should not contain `:'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
-#, perl-format
-msgid "multiple @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
-msgid "bad or empty @%s formal argument: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
-msgid "bad syntax for @%s argument: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
-#, perl-format
-msgid "%c%s requires a name"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
-msgid "bad name for @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
-msgid "@end %s seen before @%s closing brace"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
-msgid "@%s seen before @%s closing brace"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1179
-#, perl-format
-msgid "%c%s missing closing brace"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
-msgid "@%s missing closing delimiter sequence: %s}"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
-msgid "@itemx should not begin @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1358
-msgid "@itemx must follow @item"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
-msgid "@%s has text but no @item"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
-msgid "`@end' expected `%s', but saw `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
-msgid "@%s seen before @end %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1558
-#, perl-format
-msgid "no matching `%cend %s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
-#, perl-format
-msgid "misplaced %c"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
-#, perl-format
-msgid "unmatched `%c%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
-msgid "macro `%s' called with too many args"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
-msgid "@%s missing closing brace"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
-msgid "macro `%s' declared without argument called with an argument"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
-msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
-msgid "missing name for @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
-msgid "missing category for @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
-msgid "unexpected argument on @%s line: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2705
-msgid "empty multitable"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
-msgid "superfluous argument to @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
-msgid "bad argument to @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2767
-#, perl-format
-msgid "%s requires an argument: the formatter for %citem"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
-msgid "command @%s not accepting argument in brace should not be on @%s line"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
-msgid "accent command `@%s' not allowed as @%s argument"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
-msgid "@%s missing argument"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
-msgid "unknown @end %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
-#, perl-format
-msgid "superfluous argument to @%s %s: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
-msgid "bad argument to @%s: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2975
-#, perl-format
-msgid "@%s: could not open %s: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
-msgid "encoding `%s' is not a canonical texinfo encoding"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
-msgid "unrecognized encoding name `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3121
-#, perl-format
-msgid "@%s after the first element"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3128
-#, perl-format
-msgid "@%s only meaningful on a @multitable line"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3175
-#, perl-format
-msgid "@node precedes @%s, but parts may not be associated with nodes"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
-msgid "empty menu entry name in `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3317
-msgid "empty node name in menu entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
-msgid "@%s should not appear in @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
-msgid "@end %s should only appear at the beginning of a line"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
-msgid "macro `%s' previously defined"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
-msgid "here is the previous definition of `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
-msgid "redefining Texinfo language command: @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3650
-#, perl-format
-msgid "@%s without associated character"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
-msgid ""
-"@%s defined with zero or more than one argument should be invoked with {}"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
-msgid ""
-"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
-"value %d)"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
-msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
-msgid "accent command `@%s' must not be followed by whitespace"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
-msgid "use braces to give a command as an argument to @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
-#, perl-format
-msgid "%c%s expects `i' or `j' as argument, not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
-msgid "accent command `@%s' must not be followed by new line"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
-msgid "@%s expected braces"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
-msgid "unknown command `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4021
-#, perl-format
-msgid "undefined flag: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4025
-msgid "bad syntax for @value"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4032
-#, perl-format
-msgid "%c%s is obsolete."
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4035
-#, perl-format
-msgid "%c%s is obsolete; %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
-msgid "@%s should only appear at the beginning of a line"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
-msgid "@%s should only appear in heading or footing"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
-msgid "@%s not meaningful inside `@%s' block"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
-msgid "@%s in empty multitable"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4126
-msgid "@tab before @item"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
-msgid "too many columns in multitable item (max %d)"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4166
-msgid "ignoring @tab outside of multitable"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
-msgid "@%s outside of table or list"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4236
-#, perl-format
-msgid "@%s not allowed inside `@%s' block"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
-msgid "must be after `@%s' to use `@%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4416
-#, perl-format
-msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4420
-msgid "@dircategory after first node"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
-msgid "region %s inside region %s is not allowed"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4613
-msgid "@direntry after first node"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4621
-msgid "@menu in invalid context"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
-msgid "@%s seen before first @node"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4630
-msgid ""
-"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4694
-#, perl-format
-msgid "@%s should only appear in math context"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4709
-msgid "unexpected @"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
-msgid "@%s is not meaningful outside `@float' environment"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
-msgid "@%s should be right below `@float'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
-msgid "ignoring multiple @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
-msgid "command @%s does not accept arguments"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
-msgid "command @%s missing a node or external manual argument"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
-msgid "in @%s empty cross reference name after expansion `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
-msgid "in @%s empty cross reference title after expansion `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4935
-msgid "@image missing filename argument"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
-msgid "@%s missing first argument"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
-msgid "non-hex digits in argument for @U: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
-msgid "fewer than four hex digits in argument for @U: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
-msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5195
-msgid "superfluous arguments for node"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
-msgid "expected @end %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5331
-#, perl-format
-msgid "@%s should only accept an @-command as argument, not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
-msgid "remaining argument on @%s line: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5402
-#, perl-format
-msgid "environment command %s as argument to @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5429
-#, perl-format
-msgid "empty @%s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
-msgid "column fraction not a number: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
-msgid "@sp arg must be numeric, not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
-msgid "reserved index name %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
-msgid "unknown source index in @%s: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
-msgid "unknown destination index in @%s: %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
-msgid "@%s leads to a merging of %s in itself, ignoring"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
-msgid "unknown index `%s' in @printindex"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
-msgid "printing an index `%s' merged in another one, `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
-msgid "printindex before document beginning: @printindex %s"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
-msgid "@%s arg must be `top' or `bottom', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5565
-#, perl-format
-msgid "Only @%s 10 or 11 is supported, not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5573
-#, perl-format
-msgid "@%s arg must be `separate' or `end', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5581
-#, perl-format
-msgid "@%s arg must be `on', `off' or `odd', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
-msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5612
-#, perl-format
-msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
-msgid "@exampleindent arg must be numeric/`asis', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
-msgid "expected @%s on or off, not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
-msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
-msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
-msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:175
-#, perl-format
-msgid "raising the section level of @%s which is too low"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:207
-#, perl-format
-msgid "no chapter-level command before @%s"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:212
-#, perl-format
-msgid "lowering the section level of @%s appearing after a lower element"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:301
-#, perl-format
-msgid "no sectioning command associated with @%s"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:329
-#, perl-format
-msgid "@%s not empty"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
-#, perl-format
-msgid "@%s reference to nonexistent node `%s'"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:393
-#, perl-format
-msgid "@%s entry node name `%s' different from %s name `%s'"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:512
-#, perl-format
-msgid "unreferenced node `%s'"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:563
-#, perl-format
-msgid "node `%s' is %s for `%s' in sectioning but not in menu"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:572
-#, perl-format
-msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:590
-#, perl-format
-msgid "node `%s' is %s for `%s' in menu but not in sectioning"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:645
-#, perl-format
-msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:669
-#, perl-format
-msgid "%s reference to nonexistent `%s'"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:690
-#, perl-format
-msgid "node `%s' lacks menu item for `%s' despite being its Up target"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:698
-#, perl-format
-msgid "for `%s', up in menu `%s' and up `%s' don't match"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:1217
-#, perl-format
-msgid "@%s to `%s', different from %s name `%s'"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:1503
-#, perl-format
-msgid "empty index key in @%s"
-msgstr ""
-
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
-#, perl-format
-msgid "chm.pm: could not open %s for writing: %s\n"
-msgstr ""
-
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
-#, perl-format
-msgid "chm.pm: error on closing %s: %s"
-msgstr ""
-
-#: tp/init/latex2html.pm:200
-#, perl-format
-msgid "l2h: could not open latex file %s for writing: %s"
-msgstr ""
-
-#: tp/init/latex2html.pm:341
-msgid "l2h: L2H_TMP directory contains a dot"
-msgstr ""
-
-#: tp/init/latex2html.pm:346
-msgid "l2h: current directory contains a dot"
-msgstr ""
-
-#: tp/init/latex2html.pm:374
-#, perl-format
-msgid "l2h: command did not succeed: %s"
-msgstr ""
-
-#: tp/init/latex2html.pm:422
-#, perl-format
-msgid "l2h: image has invalid extension: %s"
-msgstr ""
-
-#: tp/init/latex2html.pm:438
-#, perl-format
-msgid "l2h: rename %s as %s failed: %s"
-msgstr ""
-
-#: tp/init/latex2html.pm:460
-#, perl-format
-msgid "l2h: could not open %s: %s"
-msgstr ""
-
-#: tp/init/latex2html.pm:493
-#, perl-format
-msgid "latex2html.pm: end of @%s item %d not found"
-msgstr ""
-
-#: tp/init/latex2html.pm:504
-#, perl-format
-msgid ""
-"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
-"of items found in the document"
-msgstr ""
-
-#: tp/init/latex2html.pm:534
-#, perl-format
-msgid "l2h: could not determine the fragment %d for @%s"
-msgstr ""
-
-#: tp/init/latex2html.pm:560
-#, perl-format
-msgid ""
-"l2h: could not extract the fragment %d for @%s with output counter %d from "
-"HTML"
-msgstr ""
-
-#: tp/init/latex2html.pm:621
-#, perl-format
-msgid "l2h: could not load %s: %s"
-msgstr ""
-
-#: tp/init/latex2html.pm:634
-#, perl-format
-msgid "l2h: could not open %s for writing: %s"
-msgstr ""
-
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
-#, perl-format
-msgid "tex4ht.pm: could not open %s: %s"
-msgstr ""
-
-#: tp/init/tex4ht.pm:219
-#, perl-format
-msgid "tex4ht.pm: chdir %s failed: %s"
-msgstr ""
-
-#: tp/init/tex4ht.pm:232
-#, perl-format
-msgid "tex4ht.pm: unable to return to initial directory: %s"
-msgstr ""
-
-#: tp/init/tex4ht.pm:244
-#, perl-format
-msgid "tex4ht.pm: output file missing: %s"
-msgstr ""
-
-#: tp/init/tex4ht.pm:260
-#, perl-format
-msgid "tex4ht.pm: command failed: %s"
-msgstr ""
-
-#: tp/init/tex4ht.pm:294
-#, perl-format
-msgid "tex4ht.pm: end of @%s item %d not found"
-msgstr ""
-
-#: tp/init/tex4ht.pm:301
-#, perl-format
-msgid ""
-"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
-"items found in the document for @%s"
-msgstr ""
-
-#: tp/init/tex4ht.pm:321
-#, perl-format
-msgid "tex4ht.pm: output has no HTML item for @%s %s"
-msgstr ""
-
-#: tp/init/tex4ht.pm:336
-#, perl-format
-msgid ""
-"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
-"items found in the document for @%s"
-msgstr ""
-
-#: tp/texi2any.pl:372
-#, perl-format
-msgid "error loading %s: %s\n"
-msgstr ""
-
-#: tp/texi2any.pl:385
-#, perl-format
-msgid "%s: unknown variable %s"
-msgstr ""
-
-#: tp/texi2any.pl:401
-#, perl-format
-msgid "%s: unknown variable %s\n"
-msgstr ""
-
-#: tp/texi2any.pl:437
-#, perl-format
-msgid "could not read init file %s"
-msgstr ""
-
-#: tp/texi2any.pl:593
-#, perl-format
-msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
-msgstr ""
-
-#: tp/texi2any.pl:676
-#, perl-format
-msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
-msgstr ""
-
-#: tp/texi2any.pl:679
-msgid ""
-"Translate Texinfo source documentation to various other formats, by default\n"
-"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
-"\n"
-"This program is commonly installed as both `makeinfo' and `texi2any';\n"
-"the behavior is identical, and does not depend on the installed name.\n"
-msgstr ""
-
-#: tp/texi2any.pl:685
-#, perl-format
-msgid ""
-"General options:\n"
-" --document-language=STR locale to use in translating Texinfo keywords\n"
-" for the output document (default C).\n"
-" --error-limit=NUM quit after NUM errors (default %d).\n"
-" --force preserve output even if errors.\n"
-" --help display this help and exit.\n"
-" --no-validate suppress node cross-reference validation.\n"
-" --no-warn suppress warnings (but not errors).\n"
-" --conf-dir=DIR search also for initialization files in DIR.\n"
-" --init-file=FILE load FILE to modify the default behavior.\n"
-" -c, --set-customization-variable VAR=VAL set customization variable VAR \n"
-" to value VAL.\n"
-" -v, --verbose explain what is being done.\n"
-" --version display version information and exit.\n"
-msgstr ""
-
-#: tp/texi2any.pl:701
-msgid ""
-"Output format selection (default is to produce Info):\n"
-" --docbook output Docbook XML rather than Info.\n"
-" --html output HTML rather than Info.\n"
-" --plaintext output plain text rather than Info.\n"
-" --xml output Texinfo XML rather than Info.\n"
-" --dvi, --dvipdf, --ps, --pdf call texi2dvi to generate given output,\n"
-" after checking validity of TEXINFO-FILE.\n"
-msgstr ""
-
-#: tp/texi2any.pl:709
-msgid ""
-"General output options:\n"
-" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
-" ignoring any @setfilename.\n"
-" --no-headers suppress node separators, Node: lines, and "
-"menus\n"
-" from Info output (thus producing plain "
-"text)\n"
-" or from HTML (thus producing shorter "
-"output).\n"
-" Also, if producing Info, write to\n"
-" standard output by default.\n"
-" --no-split suppress any splitting of the output;\n"
-" generate only one output file.\n"
-" --[no-]number-sections output chapter and sectioning numbers;\n"
-" default is on.\n"
-" -o, --output=DEST output to DEST.\n"
-" With split output, create DEST as a "
-"directory\n"
-" and put the output files there.\n"
-" With non-split output, if DEST is already\n"
-" a directory or ends with a /,\n"
-" put the output file there.\n"
-" Otherwise, DEST names the output file.\n"
-msgstr ""
-
-#: tp/texi2any.pl:729
-#, perl-format
-msgid ""
-"Options for Info and plain text:\n"
-" --disable-encoding do not output accented and special characters\n"
-" in Info output based on @documentencoding.\n"
-" --enable-encoding override --disable-encoding (default).\n"
-" --fill-column=NUM break Info lines at NUM characters (default "
-"%d).\n"
-" --footnote-style=STYLE output footnotes in Info according to STYLE:\n"
-" `separate' to put them in their own node;\n"
-" `end' to put them at the end of the node, "
-"in\n"
-" which they are defined (this is the "
-"default).\n"
-" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default "
-"%d).\n"
-" If VAL is `none', do not indent; if VAL is\n"
-" `asis', preserve existing indentation.\n"
-" --split-size=NUM split Info files at size NUM (default %d).\n"
-msgstr ""
-
-#: tp/texi2any.pl:746
-msgid ""
-"Options for HTML:\n"
-" --css-include=FILE include FILE in HTML <style> output;\n"
-" read stdin if FILE is -.\n"
-" --css-ref=URL generate CSS reference to URL.\n"
-" --internal-links=FILE produce list of internal links in FILE.\n"
-" --split=SPLIT split at SPLIT, where SPLIT may be `chapter',\n"
-" `section' or `node'.\n"
-" --transliterate-file-names use file names in ASCII transliteration.\n"
-" --node-files produce redirection files for nodes and \n"
-" anchors; default is set only if split.\n"
-msgstr ""
-
-#: tp/texi2any.pl:757
-msgid ""
-"Options for XML and Docbook:\n"
-" --output-indent=VAL does nothing, retained for compatibility.\n"
-msgstr ""
-
-#: tp/texi2any.pl:760
-msgid ""
-"Options for DVI/PS/PDF:\n"
-" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
-msgstr ""
-
-#: tp/texi2any.pl:763
-msgid ""
-"Input file options:\n"
-" --commands-in-node-names does nothing, retained for compatibility.\n"
-" -D VAR define the variable VAR, as with @set.\n"
-" -D 'VAR VAL' define VAR to VAL (one shell argument).\n"
-" -I DIR append DIR to the @include search path.\n"
-" -P DIR prepend DIR to the @include search path.\n"
-" -U VAR undefine the variable VAR, as with @clear.\n"
-msgstr ""
-
-#: tp/texi2any.pl:771
-msgid ""
-"Conditional processing in input:\n"
-" --ifdocbook process @ifdocbook and @docbook even if\n"
-" not generating Docbook.\n"
-" --ifhtml process @ifhtml and @html even if not generating HTML.\n"
-" --ifinfo process @ifinfo even if not generating Info.\n"
-" --ifplaintext process @ifplaintext even if not generating plain text.\n"
-" --iftex process @iftex and @tex.\n"
-" --ifxml process @ifxml and @xml.\n"
-" --no-ifdocbook do not process @ifdocbook and @docbook text.\n"
-" --no-ifhtml do not process @ifhtml and @html text.\n"
-" --no-ifinfo do not process @ifinfo text.\n"
-" --no-ifplaintext do not process @ifplaintext text.\n"
-" --no-iftex do not process @iftex and @tex text.\n"
-" --no-ifxml do not process @ifxml and @xml text.\n"
-"\n"
-" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
-msgstr ""
-
-#: tp/texi2any.pl:788
-msgid ""
-" The defaults for the @if... conditionals depend on the output format:\n"
-" if generating Docbook, --ifdocbook is on and the others are off;\n"
-" if generating HTML, --ifhtml is on and the others are off;\n"
-" if generating Info, --ifinfo is on and the others are off;\n"
-" if generating plain text, --ifplaintext is on and the others are off;\n"
-" if generating XML, --ifxml is on and the others are off.\n"
-msgstr ""
-
-#: tp/texi2any.pl:795
-msgid ""
-"Examples:\n"
-" makeinfo foo.texi write Info to foo's @setfilename\n"
-" makeinfo --html foo.texi write HTML to @setfilename\n"
-" makeinfo --xml foo.texi write Texinfo XML to @setfilename\n"
-" makeinfo --docbook foo.texi write Docbook XML to @setfilename\n"
-" makeinfo --plaintext foo.texi write plain text to standard "
-"output\n"
-" makeinfo --pdf foo.texi write PDF using texi2dvi\n"
-"\n"
-" makeinfo --html --no-headers foo.texi write html without node lines, "
-"menus\n"
-" makeinfo --number-sections foo.texi write Info with numbered sections\n"
-" makeinfo --no-split foo.texi write one Info file however big\n"
-msgstr ""
-
-#: tp/texi2any.pl:842
-#, perl-format
-msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
-msgstr ""
-
-#: tp/texi2any.pl:938
-#, perl-format
-msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
-msgstr ""
-
-#: tp/texi2any.pl:1015
-#, perl-format
-msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
-msgstr ""
-
-#: tp/texi2any.pl:1019
-msgid "--Xopt option without printed output"
-msgstr ""
-
-#: tp/texi2any.pl:1035
-#, perl-format
-msgid "unknown tree transformation %s"
-msgstr ""
-
-#: tp/texi2any.pl:1042
-#, perl-format
-msgid "ignoring splitting for format %s"
-msgstr ""
-
-#: tp/texi2any.pl:1101
-#, perl-format
-msgid "%s: missing file argument.\n"
-msgstr ""
-
-#: tp/texi2any.pl:1102
-#, perl-format
-msgid "Try `%s --help' for more information.\n"
-msgstr ""
-
-#: tp/texi2any.pl:1169
-msgid "fill_gaps_in_sectioning transformation return no result. No section?"
-msgstr ""
-
-#: tp/texi2any.pl:1192
-#, perl-format
-msgid "error on closing macro expand file %s: %s\n"
-msgstr ""
-
-#: tp/texi2any.pl:1198
-#, perl-format
-msgid "could not open %s for writing: %s\n"
-msgstr ""
-
-#: tp/texi2any.pl:1223
-msgid ""
-"insert_nodes_for_sectioning_commands transformation return no result. No "
-"section?"
-msgstr ""
-
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
-#, perl-format
-msgid "%s: error on closing %s: %s\n"
-msgstr ""
-
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
-#, perl-format
-msgid "%s: error on closing internal links file %s: %s\n"
-msgstr ""
-
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
-#, perl-format
-msgid "%s: could not open %s for writing: %s\n"
-msgstr ""
-
-#~ msgid "January"
-#~ msgstr "Jänner"
diff --git a/macros/texinfo/texinfo/po/el.gmo b/macros/texinfo/texinfo/po/el.gmo
index 77abcd58a6..13252e2ed6 100644
--- a/macros/texinfo/texinfo/po/el.gmo
+++ b/macros/texinfo/texinfo/po/el.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/el.po b/macros/texinfo/texinfo/po/el.po
index 0f95049681..ed95501439 100644
--- a/macros/texinfo/texinfo/po/el.po
+++ b/macros/texinfo/texinfo/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU texinfo 6.0.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2015-12-28 00:59+0200\n"
"Last-Translator: Tsiolkas Michail <cs112152@cs.uoi.gr>\n"
"Language-Team: Greek <team@lists.gnome.gr>\n"
@@ -24,26 +24,31 @@ msgstr ""
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: η επιλογή «%s» δεν είναι σαφής\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: η επιλογή «%s» δεν είναι σαφής· δυνατότητες:"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: άγνωστη επιλογή «%c%s»\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: η επιλογή «%c%s» δεν επιτÏέπει οÏίσματα\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: η επιλογή «--%s» απαιτεί ένα ÏŒÏισμα\n"
@@ -87,6 +92,7 @@ msgstr "Μη έγκυÏη Ï€ÏοηγοÏμενη αναφοÏά"
#: gnulib/lib/regcomp.c:156
#, fuzzy
+#| msgid "Unmatched [ or [^"
msgid "Unmatched [, [^, [:, [., or [="
msgstr "Δε βÏέθηκε αντιστοιχία για το [ ή το [^"
@@ -242,7 +248,6 @@ msgid "Insert completion"
msgstr ""
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr ""
@@ -266,7 +271,6 @@ msgid "found file %s"
msgstr ""
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr ""
@@ -279,7 +283,6 @@ msgid "---------- Footnotes ----------"
msgstr ""
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr ""
@@ -288,7 +291,6 @@ msgid "Look up a string in the index for this file"
msgstr ""
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr ""
@@ -297,7 +299,6 @@ msgid "Index entry: "
msgstr ""
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr ""
@@ -312,7 +313,6 @@ msgid ""
msgstr ""
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr ""
@@ -372,7 +372,6 @@ msgid "No available info files have '%s' in their indices"
msgstr ""
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
@@ -387,7 +386,6 @@ msgid "Cannot find node '%s'"
msgstr ""
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -416,7 +414,7 @@ msgstr ""
msgid "Try --help for more information.\n"
msgstr ""
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -505,7 +503,7 @@ msgid ""
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -812,17 +810,14 @@ msgid "could not open init file %s"
msgstr ""
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr ""
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr ""
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr ""
@@ -832,12 +827,10 @@ msgid "NUL character (^%c) not permitted"
msgstr ""
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr ""
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr ""
@@ -847,7 +840,6 @@ msgid "unknown action `%s'"
msgstr ""
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr ""
@@ -857,22 +849,18 @@ msgid "extra characters following action `%s'"
msgstr ""
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr ""
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr ""
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr ""
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr ""
@@ -894,7 +882,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr ""
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr ""
@@ -968,7 +955,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr ""
@@ -1273,7 +1259,6 @@ msgid "Select the most recently selected node"
msgstr ""
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1334,12 +1319,12 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr ""
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Invalid regular expression"
msgid "Using regular expressions for searches"
msgstr "Μη έγκυÏη κανονική έκφÏαση"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr ""
@@ -1356,8 +1341,7 @@ msgstr ""
msgid "Searching subfile %s ..."
msgstr ""
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr ""
@@ -1391,140 +1375,139 @@ msgstr ""
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4441 info/session.c:4554
+#, fuzzy
msgid "No more matches"
msgstr "Δε βÏέθηκε"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr ""
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr ""
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr ""
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr ""
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr ""
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr ""
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr ""
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr ""
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr ""
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr ""
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr ""
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr ""
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr ""
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr ""
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr ""
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr ""
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr ""
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr ""
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr ""
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr ""
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr ""
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr ""
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr ""
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr ""
@@ -1796,12 +1779,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr ""
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
@@ -1831,12 +1812,10 @@ msgid "excess command line argument `%s'"
msgstr ""
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
@@ -1855,939 +1834,933 @@ msgstr ""
msgid "no entries found for `%s'; nothing deleted"
msgstr ""
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr ""
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr ""
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
@@ -2816,7 +2789,7 @@ msgstr ""
msgid "@%s not empty"
msgstr ""
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
@@ -2826,213 +2799,213 @@ msgstr ""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr ""
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr ""
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr ""
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr ""
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr ""
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr ""
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr ""
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr ""
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3041,7 +3014,7 @@ msgid ""
"the behavior is identical, and does not depend on the installed name.\n"
msgstr ""
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3060,7 +3033,7 @@ msgid ""
" --version display version information and exit.\n"
msgstr ""
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3071,7 +3044,7 @@ msgid ""
" after checking validity of TEXINFO-FILE.\n"
msgstr ""
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3098,7 +3071,7 @@ msgid ""
" Otherwise, DEST names the output file.\n"
msgstr ""
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3120,7 +3093,7 @@ msgid ""
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3134,19 +3107,19 @@ msgid ""
" anchors; default is set only if split.\n"
msgstr ""
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3157,7 +3130,7 @@ msgid ""
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3177,7 +3150,7 @@ msgid ""
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3187,7 +3160,7 @@ msgid ""
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3204,91 +3177,302 @@ msgid ""
" makeinfo --no-split foo.texi write one Info file however big\n"
msgstr ""
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr ""
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr ""
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr ""
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "Unmatched \\{"
+msgid "unmatched `@end'"
+msgstr "Δε βÏέθηκε αντιστοιχία για το \\{"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr ""
+
+#, c-format
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
#~ msgstr "%s: η επιλογή «--%s» δεν επιτÏέπει οÏίσματα\n"
+#, c-format
#~ msgid "%s: unrecognized option '--%s'\n"
#~ msgstr "%s: άγνωστη επιλογή «--%s»\n"
+#, c-format
#~ msgid "%s: option '-W %s' is ambiguous\n"
#~ msgstr "%s: η επιλογή «-W %s» δεν είναι σαφής\n"
+#, c-format
#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
#~ msgstr "%s: η επιλογή «-W %s» δεν επιτÏέπει οÏίσματα\n"
+#, c-format
#~ msgid "%s: option '-W %s' requires an argument\n"
#~ msgstr "%s: η επιλογή «-W %s» απαιτεί ένα ÏŒÏισμα\n"
diff --git a/macros/texinfo/texinfo/po/en@boldquot.header b/macros/texinfo/texinfo/po/en@boldquot.header
index fedb6a06d1..506ca9e9ec 100644
--- a/macros/texinfo/texinfo/po/en@boldquot.header
+++ b/macros/texinfo/texinfo/po/en@boldquot.header
@@ -2,7 +2,7 @@
# The msgids must be ASCII and therefore cannot contain real quotation
# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
#
# This catalog translates grave accent (0x60) and apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019).
diff --git a/macros/texinfo/texinfo/po/en@quot.header b/macros/texinfo/texinfo/po/en@quot.header
index a9647fc35c..6522f0ce01 100644
--- a/macros/texinfo/texinfo/po/en@quot.header
+++ b/macros/texinfo/texinfo/po/en@quot.header
@@ -2,7 +2,7 @@
# The msgids must be ASCII and therefore cannot contain real quotation
# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
#
# This catalog translates grave accent (0x60) and apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019).
diff --git a/macros/texinfo/texinfo/po/eo.gmo b/macros/texinfo/texinfo/po/eo.gmo
index c35db0d9fe..e5b4b0bad1 100644
--- a/macros/texinfo/texinfo/po/eo.gmo
+++ b/macros/texinfo/texinfo/po/eo.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/eo.po b/macros/texinfo/texinfo/po/eo.po
index 6a3b55fbcf..9a3beec2ef 100644
--- a/macros/texinfo/texinfo/po/eo.po
+++ b/macros/texinfo/texinfo/po/eo.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 6.3.91\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-05-21 18:07+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -245,7 +245,6 @@ msgid "Insert completion"
msgstr "EnÅovi la kompletigon"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Serĉado de kompletigoj..."
@@ -269,7 +268,6 @@ msgid "found file %s"
msgstr "troviÄis dosiero %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "La piednotoj ne eligeblas"
@@ -282,7 +280,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Piednotoj ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Serĉado de indekseroj..."
@@ -291,7 +288,6 @@ msgid "Look up a string in the index for this file"
msgstr "Serĉi ĉenon en la indekso por ĉi tiu dosiero"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Nenia indekso trovita."
@@ -300,7 +296,6 @@ msgid "Index entry: "
msgstr "Indeksero: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Nenia indekso trovita."
@@ -316,7 +311,6 @@ msgstr ""
"Pasi al la sekva indeksero kongrua al la lasta komando “\\[index-search]â€"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Malestas antaŭa ĉeno por serĉo en indekso."
@@ -380,7 +374,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Malestas «%s» en la indeksoj de ĉiuj disponeblaj Info-dosieroj."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Eraro dum konverto de signara kodo"
@@ -395,7 +388,6 @@ msgid "Cannot find node '%s'"
msgstr "Nodo «%s» ne troveblas."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Programnomo ne indikatas."
@@ -424,7 +416,7 @@ msgstr "valoro %s ne estas valida por variablo %s"
msgid "Try --help for more information.\n"
msgstr "Por ricevi pli da informoj uzu la opcion “--helpâ€.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -457,6 +449,14 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -a, --all use all matching manuals.\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILE remember user keystrokes in FILENAME.\n"
+#| " -f, --file=MANUAL specify Info manual to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -475,6 +475,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILE output selected nodes to FILE."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -494,11 +499,21 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr " -b, --speech-friendly esti afabla al la parolsinteziloj."
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --strict-node-location (for debugging) use Info file pointers as-"
+#| "is.\n"
+#| " --subnodes recursively output menu items.\n"
+#| " -v, --variable VAR=VALUE assign VALUE to Info variable VAR.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file.\n"
+#| " -x, --debug=NUMBER set debugging level (-1 for all).\n"
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -542,6 +557,21 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers select buffers menu entry in emacs manual\n"
+#| " info emacs -n Files start at Files node within emacs manual\n"
+#| " info '(emacs)Files' alternative way to start at Files node\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -571,7 +601,7 @@ msgstr ""
" info --sub -o ELO.txt emacs eligi tutan Emaksan manlibron al ELO.txt\n"
" info -f ./UMO.info eligi la dosieron ./UMO.info sen atenti «dir»"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -881,17 +911,14 @@ msgid "could not open init file %s"
msgstr "ne eblas malfermi agordan dosieron %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "tro longa klavosekvenco"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "mankanta klavosekvenco"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-signo (\\000) malpermesatas"
@@ -901,12 +928,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "NUL-signo (^%c) malpermesatas"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "mankas agonomo"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "ne eblas ligi klavosekvencon al menuera cifero"
@@ -916,7 +941,6 @@ msgid "unknown action `%s'"
msgstr "nekonata ago «%s»."
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "tro longa agonomo"
@@ -926,22 +950,18 @@ msgid "extra characters following action `%s'"
msgstr "kromaj signoj post la ago «%s»"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "mankas nomo de variablo"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "mankas '=' tuj post variablonomo"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "tro longa variablonomo"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "tro longa valoro"
@@ -963,7 +983,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Legi en la eÄ¥ozono nomon de komando kaj plenumi Äin"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Maleblas plenumi eÄ¥ozonan (“echo-areaâ€) komandon ĉi tie."
@@ -1045,7 +1064,6 @@ msgid "Show all matching files"
msgstr "Montri ĉiujn kongruantajn dosierojn"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Neniu dosier-indekso."
@@ -1356,7 +1374,6 @@ msgid "Select the most recently selected node"
msgstr "Reviziti nodon plej ĵuse vizititan"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Malestas pli frua nodo en historio."
@@ -1417,12 +1434,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "BaskulÅalti la uzon de regulesprimoj en serĉoj"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Regulesprimoj uzatos en serĉoj."
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Laŭliteraj signoĉenoj uzatos en serĉoj."
@@ -1439,8 +1454,7 @@ msgstr "Serĉo kontinuis ekde la komenco de la dokumento."
msgid "Searching subfile %s ..."
msgstr "Serĉado en subdosiero «%s»..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Serĉo fiaskis."
@@ -1474,141 +1488,139 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Serĉoĉeno tro mallongas."
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Reirante al lasta kongruo en %s."
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Malestas pluaj kongruoj."
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Serĉi signoĉenon en ĉi tiu nodo kaj subnodoj"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Serĉi sub «%s»: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Iri al sekva kongruo en Info-subarbo"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Neniu aktiva serĉo."
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Iri al antaÅ­a kongruo en Info-subarbo"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Legi ĉenon kaj serĉi Äin usklecodistinge"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Legi ĉenon kaj serĉi Äin"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Legi ĉenon kaj serĉi Äin malantaÅ­en"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Ripeti la ĵusan serĉon samdirekte"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Malestas pli frua serĉoĉeno."
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Ripeti la ĵusan serĉon alidirekte"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "ViÅi la montratajn serĉajn kongruojn"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Serĉi signoĉenon dum vi tajpas Äin"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Serĉi tajpante regulesprime malantaŭen: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Serĉi tajpante malantaŭen: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Serĉi tajpante regulesprime: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Serĉi tajpante: "
# La vorto metiÄas antaÅ­ la kvar antaÅ­aj mesaÄoj kiam la serĉo fiaskas.
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "*Fiaskas* "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Ĉesigi la kurantan operacion"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Nuligita"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Montri la version de la rulanta Info"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info, versio %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "RefreÅigi la ekranon"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Eliri el Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Plenumi komandon asociitan kun ĉi tiu klavo minuskligita"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Komando nekonata (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "«%s» ne validas."
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "'%s' ne validas."
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Aldoni ĉi tiun ciferon al la kuranta nombra argumento"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Komenci (aÅ­ 4-obligi) la kurantan nombran argumenton"
@@ -1958,12 +1970,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: ne eblas legi (%s) kaj ne eblas krei (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY sen para END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY sen para START-INFO-DIR-ENTRY"
@@ -1993,12 +2003,10 @@ msgid "excess command line argument `%s'"
msgstr "troa argumento en komandlinio: «%s»"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Mankas enigdosiero; provu «--help» por pluaj informoj."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Mankas dosiero Info-katalogo (dir); provu «--help» por pluaj informoj."
@@ -2017,24 +2025,24 @@ msgstr "Nenia informo por Info-katalogo troviÄis en «%s»"
msgid "no entries found for `%s'; nothing deleted"
msgstr "TroviÄis nenia Info-kataloga informo pri «%s»; nenio forigitas"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "ne eblas malfermi %s por skribi: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"movu la @contents-komandon se vi deziras la enhavon post la titola paÄo"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2042,283 +2050,239 @@ msgstr ""
"movu la @shortcontents- kaj @contents-komandojn se vi deziras la enhavon "
"post la titola paÄo"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s ne estas valida lingvokodo"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s ne estas valida regiona kodo"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s ne estas valida fenda elekto"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "ne eblas legi %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "eraro dum fermo de '@verbatiminclude'-dosiero %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: ne eblas trovi %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "neniu nodo por alinomi"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "nodoj sen novaj nomoj je la fino de dosiero"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "ne eblas malfermi %s por skribi: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "ne eblas Åirmi kradon en '@%s'"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "vaka nodnomo post etendo '%s'"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s '%s' jam difiniÄis antaÅ­e"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "ĉi tie estas la antaŭa difino kiel '@%s'"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "vaka argumento en '@%s'"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: eligo malkongruas kun fendo"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "eraro dum fermo de %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "ne eblas krei dosierujojn «%s» aŭ «%s»: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "ne eblas krei dosierujon «%s»: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "'@image'-dosiero «%s» ne troviÄas; «%s» uziÄas"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "mankas argumento je @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "'@image'-dosiero «%s» (por HTML) ne troviÄas; «%s» uziÄas"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "kruda aranÄo %s ne konvertiÄas"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "ne eblas malfermi %s (dosiero de HTML-referencaj agordoj): %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "mankas tipo"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "nerekonata tipo: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "eraro dum fermo de %s (dosiero de HTML-referencaj agordoj): %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "nefermita signoĉeno en CSS-dosiero"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "'--css-include' finiÄas en komento"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "nefinita komando '@import' en CSS-dosiero"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS-dosiero %s ne troviÄas"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "ne eblas malfermi '--include-file' %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "eraro dum fermo de CSS-dosiero %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "ne troviÄas ero en 'htmlxref.cnf' por '%s'"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "eraro dum fermo de %s (dosiero de kadro): %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "eraro dum fermo de %s (dosiero de enhavtabela kadro): %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "fiaskis traktilo %s de fazo %s prioritato %s"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "necesas indiki titolon je komando '@title' aÅ­ '@top'"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "eraro dum fermo de %s (dosiero de aldirektigoj): %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "malnova nomo por '%s' estas nodo en la dokumento"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "vakas la dosiero por alinomita nodo '%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "celnodo (nova nomo por '%s') ne estas en dokumento: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"eraro dum fermo de %s (dosiero de aldirektigoj por alinomitaj nodoj): %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "vaka nodnomo"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "sintakso por ekstera nodo uziÄas por '%s'"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "dokumento sen nodoj"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "dokumento sen 'Top'-nodo"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "fiaskis alinomo de %s: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "'@%s' eliÄis plu ol unu fojo: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "'@%s' ekster iu ajn nodo"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "'@node' -- nomo ne devus enteni «,»: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Indeksero en @%s kun «:» produktas nevalidan Info-on: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "elemento por indekso «%s» estas ekster iu ajn nodo"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "eraro dum fermo de %s (dosiero kun 'image'-teksto): %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Dosiero «%s» en komando '@image' ne legeblas: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
"ne eblas trovi dosieron «%s.txt» en komando '@image' nek alternativan tekston"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2326,301 +2290,327 @@ msgstr ""
"«@strong{Note...}» estigas falsan referencon en Info; alivortigu por eviti "
"tion"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "'@%s' -- referenca nomo ne devus enteni «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "'@%s' -- nodnomo ne devus enteni «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "'@%s' -- nodnomo ne devus enteni «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "Post '@xref' sekvendas «.» aŭ «,», ne «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "Post '@xref' sekvendas «.» aŭ «,»"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "nodnomo en menuero ne devus enteni «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "nodnomo en menuero ne devus enteni «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "menuernomo ne devus enteni «:»"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "ne eblas malfermi %s por skribi: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "pluraj '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "misa aÅ­ vaka formala argumento de '@%s': %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "misa sintakso por argumento de '@%s': %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s bezonas nomon"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "misa nomo por '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "'@end %s' renkontiÄis antaÅ­ ferma '}' de '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "'@%s' renkontiÄis antaÅ­ ferma '}' de '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s sen “}â€"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "Al @%s mankas ferma disigila sekvenco: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "'@itemx' ne devus esti je komenco de '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "'@itemx' devas sekvi '@item'"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "'@%s' havas tekston sed neniun '@item'"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "“@end†atendis “%sâ€, sed renkontis “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "'@%s' renkontiÄis antaÅ­ '@end %s'"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "mankas para '%cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "misloka %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "senpara '%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "makroo «%s» havas troajn argumentojn"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s sen “}â€"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "makroo «%s» deklariÄis sen argumento sed alvokiÄas kun argumento"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ en etendo de '@%s' sekvas post '%s' anstataÅ­ post nomo de parametro aÅ­ \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "mankas nomo por '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "mankas kategorio por '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "neatendita argumento sur '@%s'-linio: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "vaka plurtabelo"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "troa argumento por '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "misa argumento por '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s bezonas argumenton: la aranÄilon por %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"komando '@%s', kiu ne toleras argumenton en vinkuloj, ne devus esti en linio "
"'@%s'"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "akcentkomando '@%s' ne permesatas kiel argumento de '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "Al '@%s' mankas argumento"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "nekonata '@end %s'"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "troa argumento por '@%s %s': %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "misa argumento por '@%s': %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: ne eblas malfermi %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "kodo «%s» ne estas kanonika Texinfo-kodo"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nekonata nomo de kodosistemo: «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "'@%s' post la unua elemento"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "'@%s' nur sencas en '@multitable'-linio"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@%s should not be associated with @top"
+msgid "@part should not be associated with @top"
+msgstr "'@%s' ne devus esti rilatita al '@top'"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "'@node' antaÅ­ '@%s', sed partoj ne rajtas rilati al nodoj"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "sintakso por ekstera nodo uziÄas por '%s'"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "vaka menuernomo en '%s'"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "vaka nodnomo en menuero"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s ne devus aperi en @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s devus aperi nur je komenco de linio"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makroo «%s» jam difiniÄis antaÅ­e"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ĉi tie estas la antaŭa difino de «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "redifino de Texinfo-komando: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s sen rilatata signo"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr "'@%s' kiu difiniÄis kun nula aÅ­ pluraj argumentoj alvokiÄendus kun {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2628,344 +2618,358 @@ msgstr ""
"makroalvoko ingiÄas tro profunde (agordu MAX_NESTED_MACROS se necesas; nuna "
"valoro estas %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr "rikura alvoko de makroo %s malpermesetas; uzu '@rmacro' se necesas"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "post akcentkomando '@%s' ne devus sekvi blankspaco"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "uzu vinkulojn {} por pasigi komandan argumenton al '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s atendas argumenton 'i' aÅ­ 'j', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "post akcentkomando '@%s' ne devus sekvi linifino"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s postulas vinkulojn {}"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "nekonata komando '%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "Nedifinita flago: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "misa sintakso por '@value'"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s arkaikiÄis."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s arkaikiÄis; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s devus aperi nur je komenco de linio"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s devus aperi nur en ĉapo aŭ subumo"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s estas sensenca ene de bloko '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s en vaka plurtabelo"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "'@tab' antaÅ­ '@item'"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "tro da kolumnoj en elemento de plurtabelo (%d maksimume)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignoriÄas komando '@tab' ekster plurtabelo"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s ekster tabelo aÅ­ listo"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s ne permesatas ene de bloko '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear in math context"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s devus aperi nur en matematika kunteksto"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "nur post '@%s' eblas uzi '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s sensencas ekster blokoj '@titlepage' aÅ­ '@quotation'"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "'@dircategory' post la unua nodo"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "regiono %s ene de regiono %s malpermesatas"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "'@direntry' post la unua nodo"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "'@menu' en nevalida kunteksto"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "'@%s' renkontiÄis jam antaÅ­ la unua '@node'"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "eble via @top-nodo staru sub @ifnottex anstataÅ­ sub @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s devus aperi nur en matematika kunteksto"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s devus aperi nur en matematika kunteksto"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "neatendita '@'"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s sensencas ekster bloko '@float'"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s devus esti tuj sub '@float'"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "pluraj '@%s' ignoriÄas"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "komando @%s ne toleras argumentojn"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "al komando '@%s' mankas nodo aÅ­ ekstera manlibra argumento"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "vaka referenca nomo en '@%s' post etendo '%s'"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "vaka referenca titolo en '@%s' post etendo '%s'"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "mankas dosiera argumento en komando '@image'"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "al '@%s' mankas unua argumento"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "nedeksesumaj ciferoj en argumento por @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "malpli ol kvar deksesumaj ciferoj en argumento por @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "argumento por @U preterpasas Unikodan maksimumon 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "troaj argumentoj por nodo"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "atendatas '@end %s'"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s devas toleri nur @-komando kiel argumento, ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "restanta argumento sur @%s-linio: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "media komando %s uziÄas kiel argumento de @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "vaka '@%s'"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "kolumna frakcio ne estas nombro: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "argumento de @sp devas esti nombro, ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "rezervita indeksnomo %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "nekonata fontindekso en @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "nekonata celindekso en @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s kondukus al kunfando de %s en si mem; ignoriÄas"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "nekonata indekso «%s» en @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "presiÄas indekso '%s' kiu kunfandiÄis en alia, '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "preskomando antaÅ­ komenco de dokumento: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "argumento de '@%s' devus esti 'top' aÅ­ 'bottom', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "por '@%s' nur '10' aÅ­ '11' eblas, ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "argumento de '@%s' devus esti 'separate' aÅ­ 'end', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "argumento de '@%s' devus esti 'on' aÅ­ 'off' aÅ­ 'odd', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"argumento de '@paragraphindent' devus esti numera aÅ­ 'none' aÅ­ 'asis', ne "
"'%s'"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"argumento de '@firstparagraphindent' devus esti 'none' aÅ­ 'insert', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "argumento de '@exampleindent' devus esti numera aÅ­ 'asis', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "post @%s devas sekvi 'on' aÅ­ 'off', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"argumento de '@kbdinputstyle' devus esti 'code'/'example'/'distinct', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "argumento de '@allowcodebreaks' devus esti 'true' aÅ­ 'false', ne '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"argumento de '@urefbreakstyle' devus esti 'after'/'before'/'none', ne '%s'"
@@ -2996,7 +3000,7 @@ msgstr "neniu sekciada komando estas rilatata al '@%s'"
msgid "@%s not empty"
msgstr "@%s ne vakas"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s referenco al neekzistanta nodo «%s»"
@@ -3006,105 +3010,105 @@ msgstr "@%s referenco al neekzistanta nodo «%s»"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s-era nodnomo '%s' malsamas de %s-nomo '%s'"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nodo «%s» ne estas referencita"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "nodo «%s» estas %s por '%s' en sekciado sed ne en menuo"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "nodo «%s» '%s' malsamas en menuo '%s' kaj en sekciado '%s'"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "nodo «%s» estas %s por '%s' en menuo sed ne en sekciado"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s-ligo '%s' (por nodo «%s») malsamas de %s-nomo '%s'"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s referenco al neekzistanta «%s»"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "en nodo «%s» mankas menuero por '%s', malgraŭ esti ties ligo 'Up'"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "por '%s', supren en menuo '%s' kaj supren en '%s' ne kongruas"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s al '%s', malsamas de %s-nomo '%s'"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "vaka indeksÅlosilo en '@%s'"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: ne eblas malfermi %s por skribi: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: eraro dum fermo de %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: ne eblas malfermi %s por skribi: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: dosierujo «L2H_TMP» enhavas punkton"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: nuna dosierujo enhavas punkton"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: komando ne sukcesis: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: bildo havas nevalidan sufikson: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: fiaskis alinomo de %s al %s: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: ne eblas malfermi %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: fino de @%s-ero %d ne troviÄas"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3113,12 +3117,12 @@ msgstr ""
"latex2html.pm: traktado produktis %d erojn en HTML; sed atendatas %d, la "
"nombro de elementoj en la dokumento"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: ne eblas determini fragmenton %d por @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3126,47 +3130,47 @@ msgid ""
msgstr ""
"l2h: ne eblas eltiri fragmenton %d por @%s kun eliga nombrilo %d el HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: ne eblas Åargi %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: ne eblas malfermi %s por skribi: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: ne eblas malfermi %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: fiaskis ÅanÄi dosierujon al %s: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: ne eblas reiri al komenca dosierujo: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: mankas eligdosiero: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: komando fiaskis: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: fino de @%s-ero %d ne troviÄas"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3175,12 +3179,12 @@ msgstr ""
"tex4ht.pm: traktado produktis %d erojn en HTML; sed atendatas %d, la nombro "
"de elementoj en la dokumento por @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: eligo ne enhavas HTML-an eron por '@%s %s'"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3189,37 +3193,37 @@ msgstr ""
"tex4ht.pm: traktado ricevis %d erojn en HTML; sed atendatas %d, la nombro de "
"elementoj en la dokumento por @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "eraro dum Åargo de %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: nekonata variablo %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: nekonata variablo %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "ne eblas legi agordan dosieron %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "ignoriÄas nekonata valoro de TEXINFO_OUTPUT_FORMAT: «%s»\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uzmaniero: %s [OPCIO...] TEXINFO-DOSIERO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3233,7 +3237,7 @@ msgstr ""
"Ĉi tiu programo kutime instaliÄis kiel ambaÅ­ 'makeinfo' kaj 'texi2any';\n"
"ilia konduto tute samas kaj ne dependas je la nomo.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3267,7 +3271,7 @@ msgstr ""
" -v, --verbose rakonti kio estas farata\n"
" --version montri informon pri versio kaj fini\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3288,7 +3292,7 @@ msgstr ""
" post kontrolo de valideco de TEXINFO-"
"DOSIERO\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3334,7 +3338,7 @@ msgstr ""
" aÅ­ finas per '/', meti eligdosierojn tien;\n"
" alikaze, CELO estas la eligdosiero\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3372,7 +3376,7 @@ msgstr ""
" --split-size=NOMBRO fendi en dosieroj po NOMBRO bajtoj (defaÅ­lte "
"%d)\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3400,7 +3404,7 @@ msgstr ""
" ankroj; estas defaÅ­lta nur dum "
"disfendado\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3408,7 +3412,7 @@ msgstr ""
"Opcioj por XML kaj Docbook:\n"
" --output-indent=VALORO (faras nenion; rekoniÄas por kongruo)\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3416,7 +3420,7 @@ msgstr ""
"Opcioj por DVI/PS/PDF:\n"
" --Xopt=OPCIO doni tiu OPCIO al 'texi2dvi'; ripeteblas\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3434,7 +3438,7 @@ msgstr ""
" -P UJO antaŭmeti dosierUJOn al la serĉvojo de @include\n"
" -U VAR maldifini la variablon VAR, kiel per @clear\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3472,7 +3476,7 @@ msgstr ""
"\n"
" Krome, ĉe la opcioj --no-ifFORMO, ja traktiÄas la pecoj sub @ifnotFORMO.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3489,7 +3493,7 @@ msgstr ""
"malaktivas;\n"
" kiam XML generiÄas, --ifxml aktivas kaj la ceteraj malaktivas.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3522,63 +3526,63 @@ msgstr ""
" makeinfo --no-split UM.texi Kreas unu Info-dosieron, kiom ajn "
"grandan.\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s: Post “--footnote-style†estu “separate†aÅ­ “endâ€, ne “%sâ€.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: Post “--paragraph-indent†estu nombro, “none†aÅ­ “asisâ€, ne “%sâ€.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: dum generado de %s, eblas indiki nur unu enigan DOSIEROn kun opcio '-o'\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "opcio '--Xopt' indikatas sed ne fariÄas preseligo"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "nekonata arbotransformo %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "ignoriÄas disfendo por aranÄo %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: mankas dosiera argumento.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Por pluaj detaloj tajpu “%s --helpâ€.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"Transformo 'fill_gaps_in_sectioning()' ne donis rezulton. Neniu sekcio?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "eraro dum fermo de %s (dosiero de makroaj etendoj): %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "ne eblas malfermi %s por skribi: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3586,21 +3590,290 @@ msgstr ""
"transformo 'insert_nodes_for_sectioning_commands()' ne donis rezulton. "
"Neniu sekcio?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: eraro dum fermo de %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: eraro dum fermo de %s (dosiero de internaj ligoj): %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: ne eblas malfermi %s por skribi: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "mankas para '%cend %s'"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "misloka %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "senpara '%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s bezonas nomon"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "misa nomo por '@%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s bezonas nomon"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "misa nomo por '@%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s bezonas nomon"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "misa nomo por '@%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept an @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s devas toleri nur @-komando kiel argumento, ne '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "media komando %s uziÄas kiel argumento de @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "misa argumento por '@%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "misa argumento por '@%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "vaka argumento en '@%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "misa argumento por '@%s': %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "por '@%s' nur '10' aÅ­ '11' eblas, ne '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "%s: Post “--footnote-style†estu “separate†aÅ­ “endâ€, ne “%sâ€.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "argumento de '@%s' devus esti 'on' aÅ­ 'off' aÅ­ 'odd', ne '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "misa argumento por '@%s': %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"argumento de '@firstparagraphindent' devus esti 'none' aÅ­ 'insert', ne '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "misa argumento por '@%s': %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s bezonas argumenton: la aranÄilon por %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "senpara '%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "troa argumento por '@%s %s': %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "misa argumento por '@%s': %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: ne eblas trovi %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: ne eblas malfermi %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "'@%s' post la unua elemento"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "'@%s' nur sencas en '@multitable'-linio"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "'@node' antaÅ­ '@%s', sed partoj ne rajtas rilati al nodoj"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s estas sensenca ene de bloko '@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s ne permesatas ene de bloko '@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s devus aperi nur en matematika kunteksto"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s sensencas ekster blokoj '@titlepage' aÅ­ '@quotation'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s bezonas nomon"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "misa aÅ­ vaka formala argumento de '@%s': %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s atendas argumenton 'i' aÅ­ 'j', ne '%s'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "Nedifinita flago: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s arkaikiÄis."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s arkaikiÄis; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s devus aperi nur en matematika kunteksto"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s sen rilatata signo"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s atendas argumenton 'i' aÅ­ 'j', ne '%s'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "misloka %c"
+
#~ msgid ""
#~ " -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
#~ " --no-raw-escapes output escapes as literal text.\n"
@@ -3614,9 +3887,11 @@ msgstr "%s: ne eblas malfermi %s por skribi: %s\n"
#~ " --restore=DOSIERO legi la unuajn klavofrapojn el DOSIERO\n"
#~ " -O, --show-options, --usage montri la nodon pri komandliniaj opcioj"
+#, c-format
#~ msgid "can't open %s: %s"
#~ msgstr "ne eblas malfermi %s: %s"
+#, c-format
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "erarserĉa eliro alidirektiÄas al «%s»"
@@ -3626,15 +3901,41 @@ msgstr "%s: ne eblas malfermi %s por skribi: %s\n"
#~ msgid "arguments are quoted by default"
#~ msgstr "argumentoj citatas defaÅ­lte"
+#~ msgid "no node to be renamed"
+#~ msgstr "neniu nodo por alinomi"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "nodoj sen novaj nomoj je la fino de dosiero"
+
+#, perl-format
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Arkaika variablo %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "'@%s' ne devus esti rilatita al '@top'"
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "malnova nomo por '%s' estas nodo en la dokumento"
+
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "vakas la dosiero por alinomita nodo '%s'"
+#, perl-format
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "celnodo (nova nomo por '%s') ne estas en dokumento: %s"
+
+#, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "eraro dum fermo de %s (dosiero de aldirektigoj por alinomitaj nodoj): %s"
+
+#~ msgid "empty node name"
+#~ msgstr "vaka nodnomo"
+
+#, perl-format
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: arkaika variablo %s\n"
+#, perl-format
#~ msgid "obsolete variable %s\n"
#~ msgstr "arkaika variablo %s\n"
diff --git a/macros/texinfo/texinfo/po/es.gmo b/macros/texinfo/texinfo/po/es.gmo
index 1465eb409e..232359050d 100644
--- a/macros/texinfo/texinfo/po/es.gmo
+++ b/macros/texinfo/texinfo/po/es.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/es.po b/macros/texinfo/texinfo/po/es.po
index f01ddbd578..65dcbf74db 100644
--- a/macros/texinfo/texinfo/po/es.po
+++ b/macros/texinfo/texinfo/po/es.po
@@ -6,10 +6,10 @@
# Antonio Ceballos <aceballos@gmail.com>, 2015, 2016, 2017, 2019.
msgid ""
msgstr ""
-"Project-Id-Version: texinfo-6.5.93\n"
+"Project-Id-Version: texinfo-6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-15 22:27+0100\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-21 10:02+0200\n"
"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
"Language: es\n"
@@ -249,7 +249,6 @@ msgstr "Insertar entrada"
# TODO review
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Contruyendo lista de entradas..."
@@ -274,7 +273,6 @@ msgid "found file %s"
msgstr "encontrado el fichero %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "No se pudieron mostrar las notas a pie de página"
@@ -288,7 +286,6 @@ msgid "---------- Footnotes ----------"
msgstr "---- Notas a pie de página ----"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Buscando en el índice..."
@@ -297,7 +294,6 @@ msgid "Look up a string in the index for this file"
msgstr "Buscar un texto en el índice de este fichero"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "No se encontraron índices"
@@ -306,7 +302,6 @@ msgid "Index entry: "
msgstr "Entrada del índice: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "No se encontraron índices."
@@ -327,7 +322,6 @@ msgstr ""
# TODO review index=text
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "No existe constancia previa de texto de búsqueda"
@@ -392,7 +386,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "No existen ficheros Info que contengan la palabra '%s' en sus índices"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Error al convertir la codificación de caracteres del fichero"
@@ -407,7 +400,6 @@ msgid "Cannot find node '%s'"
msgstr "El nodo '%s' no se ha encontrado"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "No se ha especificado ningún nombre de programa"
@@ -436,7 +428,7 @@ msgstr "el valor %s no es válido para la variable %s"
msgid "Try --help for more information.\n"
msgstr "Pruebe la opción `--help' para obtener más información.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -595,7 +587,7 @@ msgstr ""
" info -f ./foo.info muestra el fichero './foo.info', sin buscar en\n"
" el directorio"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -915,17 +907,14 @@ msgid "could not open init file %s"
msgstr "no se ha podido abrir el fichero de inicialización %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "secuencia de teclas demasiado larga"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "secuencia de teclas ausente"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "El carácter `NUL' (\\000) no está permitido aquí"
@@ -935,12 +924,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "El carácter `NUL' (^%c) no está permitido aquí"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "nombre de acción ausente"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "no se puede asociar la secuencia de teclas a un dígito de menú"
@@ -950,7 +937,6 @@ msgid "unknown action `%s'"
msgstr "acción desconocida '%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nombre de acción demasiado largo"
@@ -960,23 +946,19 @@ msgid "extra characters following action `%s'"
msgstr "caracteres extra tras nombre de acción '%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "nombre de variable ausente"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr ""
"ausencia del carácter `=' inmediatamente después del nombre de la variable"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nombre de variable demasiado largo"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "valor demasiado largo"
@@ -998,7 +980,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Leer el nombre de una orden desde el área de mensajes y ejecutarla"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "No se puede ejecutar la orden 'echo-area' aquí"
@@ -1083,7 +1064,6 @@ msgid "Show all matching files"
msgstr "Muestra todos los ficheros coincidentes."
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "No hay índice de fichero"
@@ -1398,7 +1378,6 @@ msgid "Select the most recently selected node"
msgstr "Seleccionar el nodo usado más recientemente"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "No hay nodos anteriores en la historia"
@@ -1460,12 +1439,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Activar o desactivar el uso de expresiones regulares en las búsquedas"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Usando expresiones regulares en las búsquedas"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Usando texto literal en las búsquedas"
@@ -1482,8 +1459,7 @@ msgstr "La búsqueda continuó desde el principio del documento"
msgid "Searching subfile %s ..."
msgstr "Buscando sub-fichero %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "La búsqueda finalizó sin resultados"
@@ -1518,142 +1494,140 @@ msgid "Search string too short"
msgstr "El texto de búsqueda es demasiado corto."
# TODO review
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Vuelta atrás hasta la última coincidencia desde %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "No hay más coincidencia"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Buscar cadena en este nodo y sus subnodos"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Buscar bajo %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Ir a la siguiente coincidencia en el subárbol de Info"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Ninguna búsqueda activa"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Ir a la coincidencia anterior en el subárbol de Info"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Leer un texto y buscarlo (mayúsculas y minúsculas son significativas)"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Leer una cadena de texto y buscarla"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Leer una cadena de texto y buscarla hacia atrás"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Repetir la última búsqueda en la misma dirección que la anterior"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "No existe constancia de búsqueda anterior"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Repetir la última búsqueda en dirección contraria"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Borra las coincidencias de búsqueda visualizadas"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Buscar de forma interactiva un texto según se escribe"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Búsqueda interactiva hacia atrás (exp.reg.): "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Búsqueda interactiva hacia atrás: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Búsqueda interactiva (exp.reg.): "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Búsqueda interactiva: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Falló "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Cancelar la operación en curso"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Cancelado"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Mostrar la versión de Info que se está ejecutando"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "Versión de GNU Info %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Redibujar los contenidos de la pantalla"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Salir de Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr ""
"Ejecutar comando asociado a la versión en minúsculas de esta tecla o "
"combinación de teclas"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Orden desconocida (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" no es válida"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "'%s' no es válida"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Sumar este dígito al argumento numérico actual"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Comenzar (o multiplicar por 4) el argumento numérico actual"
@@ -2056,12 +2030,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: no se pudo leer (%s) y no se pudo crear (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "`START-INFO-DIR-ENTRY' presente, pero sin pareja (END-INFO-DIR-ENTRY)"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "`END-INFO-DIR-ENTRY' presente, pero sin pareja (START-INFO-DIR-ENTRY)"
@@ -2092,14 +2064,12 @@ msgid "excess command line argument `%s'"
msgstr "Demasiados argumentos en la línea de órdenes '%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"No se ha especificado fichero de entrada;\n"
"pruebe usted la opción `--help' para obetener más información."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Fichero índice no especificado;\n"
@@ -2120,25 +2090,25 @@ msgstr "No existe constancia de entrada `dir' en '%s'"
msgid "no entries found for `%s'; nothing deleted"
msgstr "No se encontraron entradas para '%s'; no se borrará nada"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "no se pudo abrir %s para escribir: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"mueva su orden @contents si quiere los contenidos después de la página del "
"título"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2146,287 +2116,244 @@ msgstr ""
"mueva sus órdenes @shortcontents y @contents si quiere los contenidos "
"después de la página del título"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "'%s' no es válido como código de lenguaje"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "'%s' no es válido como código de región"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "'%s' no es una posibilidad de división válida"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "no se pudo leer %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "error cerrando el fichero @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: no se pudo encontrar %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "ningún nodo que renombrar"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "hay nodos sin nombre nuevo al final del fichero"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "no se pudo abrir %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "el uso de un fichero de nodos renombrados (`%s') está obsoleto"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "no se ha podido proteger el carácter almohadilla en @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "nombre de nodo vacío tras expandir `%s'"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s '%s' ya ha sido definido anteriormente"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "la definición previa de `@%s' se encuentra aquí"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "argumento vacío en @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: salida incompatible con división"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "error cerrando %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "no se pudieron crear los directorios '%s' o '%s': %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "no se pudo crear el directorio '%s': %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "El fichero @image '%s' no se ha encontrado; se utilizará '%s'"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "no se ha especificado argumento alguno para @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr ""
"El fichero @image '%s' (para HTML) no se ha encontrado; se utilizará '%s'"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "el formato en bruto %s no se ha convertido"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
"no se pudo abrir el fichero de configuración de referencias html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "tipo ausente"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "tipo desconocido: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "error cerrando el fichero de configuración de referencias html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "cadena de texto sin cerrar en el fichero css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "'--css-include' finaliza con un comentario"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import no finalizado en el fichero css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "No se ha encontrado el fichero CSS %s"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "no se pudo abrir '--include-file' %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "error cerrando el fichero CSS '%s': %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "no se encontraron entradas htmlxref.cnf para `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "error al cerrar el fichero marco %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "error al cerrar el fichero de tabla de contenidos %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "el manejador %s de la etapa %s con prioridad %s ha fallado"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
"hay que especificar un título mediante una orden de título o mediante @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "error al cerrar el fichero de redirección de nodos %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "el antiguo nombre de '%s' es un nodo del documento"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "fichero vacío para el nodo renombrado '%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "el nodo objetivo (nuevo nombre para '%s') no está en el documento: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "error al cerrar el fichero de redirección de nodos renombrados %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "nombre de nodo vacío"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "se ha utilizado la sintaxis de nodo externo para `%s'"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "documento sin nodos"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "documento sin nodo Top"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "fallo al cambiar el nombre de %s: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s salida más de una vez: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s fuera de nodo alguno"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "el nombre de @node no puede contener `,': %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "La entrada de índice en @%s con : produce un Info no válido: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "la entrada para el índice '%s' se encuentra fuera de nodo alguno"
#  TODO ASK
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "error al cerrar el fichero de texto imagen %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "El fichero de imagen '%s' no es accesible: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
"no se ha podido encontrar el fichero de imagen `%s.txt' ni el texto "
"alternativo"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2434,307 +2361,331 @@ msgstr ""
"@strong{Note...} produce una referencia cruzada no deseada en Info; "
"reescríbalo para que esto no ocurra"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "un nombre de referencia cruzada @%s no puede contener `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "el nombre de un nodo @%s no puede contener `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "el nombre de un nodo @%s no puede contener `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' o `,' tiene que ir precedido de @xref, no de %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "`.' o `,' tiene que ir precedido de @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "el nombre de nodo de una entrada de menú no debe contener '%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "el nombre de nodo de una entrada de menú no debe contener ':'"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "el nombre de una entrada de menú no debe contener ':'"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "no se pudo abrir %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "@%s múltiple"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "argumento formal @%s incorrecto o vacío: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "sintaxis del argumento @%s incorrecta: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "la construcción `%c%s' requiere un nombre"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "nombre inaceptable para @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "hay un @end %s antes de la llave de cierre de @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "hay un @%s antes de la llave de cierre de @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s se esperaba leer `}'"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s sin secuencia delimitadora de cierre: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx no debe comenzar @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx tiene que estar después de @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s tiene texto pero ningún @item"
# TODO review
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "Se esperaba ver `@end' '%s', pero se ha leído '%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s aparece antes de @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "no hay un '%cend %s' correspondiente"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "carácter `%c' fuera de lugar"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "`%c%s' desemparejado"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "La llamada a la macro '%s' contiene demasiados argumentos"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s se esperaba leer `}'"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr ""
"La llamada a la macro '%s', declarada sin argumentos, contiene un argumento"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"se leyó \\, al expandir @%s, tras '%s' en vez de un nombre de parámetro o \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "falta un nombre para @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "falta una categoría para @%s"
# TODO review
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "argumento erróneo en una línea @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "multi-tabla vacía"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "argumento superfluo para @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "argumento erróneo para @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "`%s' requiere un argumento: el procesador de formato para %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"la orden @%s, que no acepta argumento entre llaves, no puede estar en una "
"línea @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "la orden de acentuación `@%s' no se permite como argumento de @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "a @%s le falta argumento"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "@end %s desconocido"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "argumento superfluo para @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "argumento erróneo para @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: no se pudo abrir %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "la codificación `%s' no es una codificación canónica de texinfo"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "`%s' no se corresponde con ningún tipo de codificación conocido"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s después del primer elemento"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s carece de sentido fuera de una línea @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part no debe estar asociado con @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
"@node precede a @%s, pero las partes no pueden estar asociadas con los nodos"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "se ha utilizado la sintaxis de nodo externo para `%s'"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "nombre de entrada de menú vacío en `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "nombre de nodo vacío en una entrada de menú"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s no puede aparecer en @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s solo puede aparecer al comienzo de una línea"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "la macro '%s' ya ha sido definida en este documento"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "la definición previa de '%s' se encuentra aquí"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "se redefine la orden del lenguaje Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s sin carácter asociado"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s definido sin ningún argumento o con más de uno tiene que ser invocado "
"con {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2742,350 +2693,363 @@ msgstr ""
"anidamiento demasiado profundo en llamada a macro (habría que modificar\n"
"MAX_NESTED_MACROS; su valor actual es %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"no se permite llamar a la macro %s recursivamente; utilice @rmacro si lo "
"necesita"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "la orden de acentuación `@%s' no puede ir seguida de espacio en blanco"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "use llaves para pasar una orden como argumento de @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "el uso de `%c%s' presupone como argumentos `i' o `j', no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "la orden de acentuación `@%s' no puede ir seguida de nueva línea"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s esperaba llaves"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "orden desconocida `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "etiqueta indefinida: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "sintaxis de @value incorrecta"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s es una sintaxis ya obsoleta."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s es una sintaxis ya obsoleta; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s solo puede aparecer al comienzo de una línea"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s solo puede aparecer en el encabezado o al pie"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "`@%s' carece de sentido bajo la influencia de un bloque `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s en multi-tabla vacía"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab antes de @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "demasiadas columnas para el elemento multi-tabla (max %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignorando `@tab' no influenciado por el entorno `multitable'"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s fuera de tabla o lista"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s no está permitido en un bloque `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s solo puede aparecer en la entrada de un índice"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "no se permiten más de dos niveles de subentradas en el índice"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "tiene que ir después de `@%s' para poder usar `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
"`@%s' carece de sentido fuera de influencias de entornos como `@titlepage' o "
"`@quotation'"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory después del primer nodo"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "una región %s no está permitida dentro de una región %s"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry después del primer nodo"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu en un contexto que no es válido"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "se ha encontrado un @%s antes del primer @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"¿Quizás su nodo `@top' debería quedar bajo la influencia de un bloque "
"`@ifnottex' en vez de la de un bloque `@ifinfo'?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s solo puede aparecer en la entrada de un índice"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s solo puede aparecer en un contexto matemático"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "no se esperaba @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s carece de sentido si se da fuera de entornos `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s debe estar inmediatamente debajo de `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "se ignora @%s múltiple"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "la orden @%s no admite argumentos"
# TODO review
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "a la orden @%s le falta un nodo o un argumento manual externo"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "en @%s nombre de referencia cruzada vacío tras expansión `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "en @%s título de referencia cruzada vacío tras expansión `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "la primitiva `@image' carece de referencia a fichero alguno"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s falta el primer argumento"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "dígitos no hexadecimales en el argumento de @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "menos de cuatro dígitos hexadecimales en el argumento de @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "el argumento de @U excede el Unicode máximo 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "argumentos de nodo superfluos"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "se esperaba @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s solo debe aceptar una orden-@ como argumento, no `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "argumento restante en la línea @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "orden de entorno %s como argumento de @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "@%s vacío"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "fracción de columna no numérica: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "el argumento de @sp tiene que ser numérico, así que '%s' no es válido"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "nombre de índice reservado %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "índice de origen desconocido en @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "índice de destino desconocido en @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s llevaría a fusionar %s consigo mismo; ignorar"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "índice desconocido `%s' en `@printindex'"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "imprimiendo un índice `%s' fusionado en otro, `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex antes del comienzo del documento: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "el argumento de @%s debe ser `top' o `bottom', no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Sólo @%s 10 or 11 está soportado, no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "el argumento de @%s debe ser `separate' o `end', no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "el argumento de @%s debe ser `on', `off' o `odd', no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"el argumento de @paragraphindent debe ser numérico/`none'/`asis', no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"el argumento de @firstparagraphindent debe ser `none' o `insert', no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "el argumento de @exampleindent debe ser numérico/`asis', no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "Se esperaba leer @%s \"on\" u \"off\", no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"el argumento de @kbdinputstyle debe ser `code'/`example'/`distinct', no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "el argumento de @allowcodebreaks debe ser `true' o `false', no '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"el argumento de @urefbreakstyle debe ser `after'/`before'/`none', no '%s'"
@@ -3116,7 +3080,7 @@ msgstr "no hay ninguna orden de seccionamiento asociada a @%s"
msgid "@%s not empty"
msgstr "@%s no vacío"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s hace referencia a un nodo inexistente (`%s')"
@@ -3126,108 +3090,108 @@ msgstr "@%s hace referencia a un nodo inexistente (`%s')"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "el nombre de nodo `%s' de la entrada @%s difiere del nombre de %s `%s'"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "Nodo '%s' no referenciado"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "el nodo `%s' es %s para `%s' en el seccionamiento pero no en el menú"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "el nodo %s `%s' en el menú `%s' y en el seccionamiento `%s' difieren"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "el nodo `%s' es %s para `%s' en menú pero no en seccionamiento"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
"el puntero %s `%s' (para el nodo `%s') es diferente del nombre de %s `%s'"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s hace referencia a algo que no existe (`%s')"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"El nodo `%s' carece de elemento de menú alguno para `%s' aunque consta como "
"su destino para `Up'"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "para `%s', subir en el menú `%s' y subir `%s' no concuerdan"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s para `%s', diferente del nombre de %s `%s'"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "clave de índice vacía en @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: no se ha podido abrir %s para escritura: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: error al cerrar %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: no se ha podido abrir para escritura el fichero de latex %s: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: el directorio L2H_TMP contiene un punto"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: el directorio actual contiene un punto"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: la orden no terminó con éxito: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: la extensión de la imagen no es válida: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: el cambio de nombre de %s por %s ha fallado: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: no se ha podido abrir %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: final del elemento @%s %d no encontrado"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3236,12 +3200,12 @@ msgstr ""
"latex2html.pm: el procesamiento ha producido %d elementos en HTML; se "
"esperaban %d, el número de elementos que se han encontrado en el documento"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: no se ha podido determinar el fragmento %d para @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3250,47 +3214,47 @@ msgstr ""
"l2h: no se ha podido extraer el fragmento %d para @%s con el contador de\n"
"salida %d del HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: no se ha podido cargar %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: no se ha podido abrir %s para escritura: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: no se ha podido abrir %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: fallo al cambiar al directorio %s: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: no se ha podido volver al directorio inicial: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: falta el fichero de salida: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: la orden ha fallado: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: final de elemento @%s %d no encontrado"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3299,12 +3263,12 @@ msgstr ""
"tex4ht.pm: el procesamiento ha producido %d elementos en HTML; se esperaban "
"%d, el número de elementos que se han encontrado en el documento para %s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: la salida no tiene ningún elemento HTML para @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3313,37 +3277,37 @@ msgstr ""
"tex4ht.pm: el procesamiento ha recuperado %d elementos en HTML; se esperaban "
"%d, el número de elementos que se han encontrado en el documento para %s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "error al cargar %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: variable desconocida %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: variable desconocida %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "no se ha podido leer el fichero de inicialización %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "ignorando valor desconocido de TEXINFO_OUTPUT_FORMAT ('%s').\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO-TEXINFO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3361,7 +3325,7 @@ msgstr ""
"el comportamiento es idéntico, y no depende del nombre que se haya "
"instalado.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3409,7 +3373,7 @@ msgstr ""
" --version mostrar información sobre la versión de esta\n"
" aplicación informática.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3430,7 +3394,7 @@ msgstr ""
" después de comprobar la validez de\n"
" FICHERO-TEXINFO.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3486,7 +3450,7 @@ msgstr ""
" En caso contrario, DESTINO es el nombre del\n"
" fichero.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3540,7 +3504,7 @@ msgstr ""
" una es de un tamaño NÚMERO (por defecto "
"%d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3570,7 +3534,7 @@ msgstr ""
"solo\n"
" si hay división.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3578,7 +3542,7 @@ msgstr ""
"opciones para XML y Docbook:\n"
" --output-indent=VAL no hace nada; se mantiene por compatibilidad.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3587,7 +3551,7 @@ msgstr ""
" --Xopt=OPC pasa OPC a text2dvi; puede repetirse.\n"
# TODO review shell
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3622,7 +3586,7 @@ msgstr ""
" propio documento mediante el uso de\n"
" `@clear VARIABLE'.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3666,7 +3630,7 @@ msgstr ""
" También, para las opciones de tipo --no-ifFORMATO, procesar "
"`@ifnotFORMATO'.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3684,7 +3648,7 @@ msgstr ""
"no;\n"
" si este es XML, --ifxml estará activo, mientras que el resto no;\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3761,66 +3725,66 @@ msgstr ""
"cuán\n"
" grande sea.\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: `--footnote-style' toma como argumentos `separate' o `end', no '%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: `--paragraph-indent' toma un argumento numérico/`none'/`asis', y no "
"'%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: al generar %s, solo puede especificarse un FICHERO de entrada con -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "opción --Xopt sin salida impresa"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "transformación de árbol desconocida '%s'"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "no se realiza división para el formato %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: se necesita nombre de fichero que procesar.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pruebe `%s --help' para obtener más información.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"La transformación fill_gaps_in_sectioning no da ningún resultado.\n"
"¿No hay ninguna sección?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "error al cerrar el fichero de expansión de macros '%s': %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "no se pudo abrir %s para escriturea: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3829,21 +3793,256 @@ msgstr ""
"resultado.\n"
"¿No hay ninguna sección?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: error cerrando %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: error al cerrar el fichero de enlaces internos %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: no se pudo abrir %s para escritura: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "no hay un '@end %s' correspondiente"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "{ mal colocado"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "'@end %s' desemparejado"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set requiere un nombre"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "nombre inaceptable para @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear requiere un nombre"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "nombre inaceptable para @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro requiere un nombre"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "nombre inaceptable para @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@clickstyle solo debe aceptar una orden-@ como argumento, no `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "orden de entorno %s como argumento de @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "argumento erróneo para @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "argumento erróneo para @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "argumento vacío en @columnfractions"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "argumento erróneo para @printindex: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Solamente @fonttextsize 10 o 11 está soportado, no '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "@footnotestyle toma como argumentos `separate' o `end', no '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+"el argumento de @setchapternewpage debe ser `on', `off' o `odd', no '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "argumento erróneo para @need: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "el argumento de @firstparagraph debe ser `none' o `insert', no '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "argumento erróneo para @headings: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s requiere un argumento: el procesador de formato para @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "`@end' desemparejado"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "argumento superfluo para @end %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "argumento erróneo para @end: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: no se pudo encontrar %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: no se pudo abrir %s:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename después del primer elemento"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions carece de sentido fuera de una línea @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+"@node precede a @part, pero las partes no pueden estar asociadas con los "
+"nodos"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s carece de sentido bajo la influencia de un bloque @%s"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s no está permitido en un bloque `@copying'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry solo puede aparecer en la entrada de un índice"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@author carece de sentido fuera de influencias de entornos como `@titlepage' "
+"o `@quotation'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s requiere un nombre"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "argumento formal @%s incorrecto o vacío: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "el uso de @dotless presupone como argumentos `i' o `j', no `%c'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "etiqueta indefinida: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s es una sintaxis ya obsoleta."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s es una sintaxis ya obsoleta; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ solo puede aparecer en un contexto matemático"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb sin carácter asociado"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "el uso de @dotless presupone como argumentos `i' o `j', no `%s'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "} mal colocado"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "ningún nodo que renombrar"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "hay nodos sin nombre nuevo al final del fichero"
+
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr "el uso de un fichero de nodos renombrados (`%s') está obsoleto"
+
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "el antiguo nombre de '%s' es un nodo del documento"
+
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "fichero vacío para el nodo renombrado '%s'"
+
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr ""
+#~ "el nodo objetivo (nuevo nombre para '%s') no está en el documento: %s"
+
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "error al cerrar el fichero de redirección de nodos renombrados %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "nombre de nodo vacío"
+
#~ msgid "can't open %s: %s"
#~ msgstr "no se pudo abrir %s: %s"
@@ -3859,9 +4058,6 @@ msgstr "%s: no se pudo abrir %s para escritura: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Variable obsoleta %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s no debe estar asociado con @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: variable obsoleta %s\n"
diff --git a/macros/texinfo/texinfo/po/fi.gmo b/macros/texinfo/texinfo/po/fi.gmo
index 64bc3b3edc..18ce90bd18 100644
--- a/macros/texinfo/texinfo/po/fi.gmo
+++ b/macros/texinfo/texinfo/po/fi.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/fi.po b/macros/texinfo/texinfo/po/fi.po
index 4b26973431..159cb08097 100644
--- a/macros/texinfo/texinfo/po/fi.po
+++ b/macros/texinfo/texinfo/po/fi.po
@@ -1,14 +1,14 @@
# Finnish translations for texinfo package.
# Copyright (C) 2018 Free Software Foundation, Inc.
# This file is distributed under the same license as the texinfo package.
-# Tommi Nieminen <translator@legisign.org>, 2018.
+# Tommi Nieminen <translator@legisign.org>, 2018-2019.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU texinfo 6.3.92\n"
+"Project-Id-Version: GNU texinfo 6.5.93\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2018-02-23 16:35+0200\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-03-05 09:35+0200\n"
"Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
"Language: fi\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.7\n"
#: gnulib/lib/error.c:195
msgid "Unknown system error"
@@ -104,7 +104,7 @@ msgstr "Viallinen \\{\\}-sisältö"
#: gnulib/lib/regcomp.c:168
msgid "Invalid range end"
-msgstr ""
+msgstr "Virheellinen alueen loppu"
#: gnulib/lib/regcomp.c:171
msgid "Memory exhausted"
@@ -192,7 +192,7 @@ msgstr ""
#: info/echo-area.c:654
msgid "Kill ring is empty"
-msgstr ""
+msgstr "Leikkausrengas on tyhjä"
#: info/echo-area.c:667
msgid "Yank back a previous kill"
@@ -200,19 +200,19 @@ msgstr ""
#: info/echo-area.c:700
msgid "Kill to the end of the line"
-msgstr ""
+msgstr "Leikkaa rivin loppuun"
#: info/echo-area.c:713
msgid "Kill to the beginning of the line"
-msgstr ""
+msgstr "Leikkaa rivin alkuun"
#: info/echo-area.c:725
msgid "Kill the word following the cursor"
-msgstr ""
+msgstr "Leikkaa kohdistinta seuraava sana"
#: info/echo-area.c:745
msgid "Kill the word preceding the cursor"
-msgstr ""
+msgstr "Leikkaa kohdistinta edeltävä sana"
#: info/echo-area.c:977 info/echo-area.c:1036
msgid "No completions"
@@ -242,7 +242,6 @@ msgid "Insert completion"
msgstr "Lisää täydennys"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Koostetaan täydennyksiä..."
@@ -266,7 +265,6 @@ msgid "found file %s"
msgstr "löytyi tiedosto %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Alaviitteitä ei voi näyttää"
@@ -279,7 +277,6 @@ msgid "---------- Footnotes ----------"
msgstr "--------- Alaviitteet ---------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Etsitään hakemistotietueita..."
@@ -288,16 +285,14 @@ msgid "Look up a string in the index for this file"
msgstr "Etsi merkkijonoa tiedoston hakemistosta"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Hakemistoja ei löytynyt"
#: info/indices.c:217
msgid "Index entry: "
-msgstr "Hakemistotietue:"
+msgstr "Hakemistotietue: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Hakemistoja ei löytynyt."
@@ -312,7 +307,6 @@ msgid ""
msgstr ""
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Ei aiempaa indeksihakujonoa"
@@ -377,7 +371,6 @@ msgstr ""
"Merkkijonoa \"%s\" ei löydy saatavilla olevien info-tiedostojen indekseistä"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Virhe muunnettaessa tiedoston merkistökoodausta"
@@ -389,17 +382,16 @@ msgstr "Ei valikkokohtaa \"%s\" solmussa \"%s\""
#: info/info.c:415 info/info.c:1181
#, c-format
msgid "Cannot find node '%s'"
-msgstr "Solmua \"%s\" ei löydy"
+msgstr "Solmua â€%s†ei löydy"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Ohjelman nimeä ei ole annettu"
#: info/info.c:635
#, c-format
msgid "invalid number: %s\n"
-msgstr "Virheellinen luku: %s\n"
+msgstr "virheellinen luku: %s\n"
#: info/info.c:815
#, c-format
@@ -414,14 +406,14 @@ msgstr "%s: ei sellaista muuttujaa"
#: info/info.c:828 info/infokey.c:560
#, c-format
msgid "value %s is not valid for variable %s"
-msgstr ""
+msgstr "arvo %s ei kelpaa muuttujalle %s"
#: info/info.c:840
#, c-format
msgid "Try --help for more information.\n"
msgstr "Lisätietoa voi saada valitsimella --help\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -513,6 +505,8 @@ msgid ""
"\n"
"For a summary of key bindings, type H within Info."
msgstr ""
+"\n"
+"Näppäinsidosyhteenvedon saa Infon komennolla H."
#: info/info.c:1132
msgid ""
@@ -530,8 +524,22 @@ msgid ""
" dump entire emacs manual to out.txt\n"
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+"\n"
+"Esimerkkejä:\n"
+" info näytä ylimmän tason hakemiston valikko\n"
+" info info-stnd näytä tämän Info-ohjelman käsikirja\n"
+" info emacs aloita ylimmän tason hakemiston emacs-"
+"solmusta\n"
+" info emacs buffers valitse emacs-oppaan Buffers-valikkotietue\n"
+" info emacs -n Files aloita emacs-oppaan Files-solmusta\n"
+" info '(emacs)Files' vaihtoehtoinen tapa aloittaa Files-solmusta\n"
+" info --show-options emacs aloita emacsin komentorivivalitsinsolmusta\n"
+" info --subnodes -o emacs.txt emacs\n"
+" tulosta koko emacs-opas tiedostoon emacs.txt\n"
+" info -f ./foo.info näytä tiedosto ./foo.info etsimättä "
+"hakemistosta"
+
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -578,7 +586,7 @@ msgstr "Tässä solmussa ei ole \"%s\"-osoitinta"
#: info/info.c:1190
#, c-format
msgid "Unknown Info command '%c'; try '?' for help"
-msgstr "Tuntematon Info-komento \"%c\": katso ohjetta komennolla \"?\""
+msgstr "Tuntematon Info-komento â€%câ€: katso ohje ?-komennolla"
#: info/info.c:1191
#, c-format
@@ -619,7 +627,7 @@ msgstr ""
#: info/infodoc.c:42
msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n"
-msgstr ""
+msgstr "\\%-10[get-info-help-node] Siirry Infon opastukseen.\n"
#: info/infodoc.c:44
msgid "\\%-10[prev-line] Move up one line.\n"
@@ -639,11 +647,11 @@ msgstr ""
#: info/infodoc.c:48
msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n"
-msgstr ""
+msgstr "\\%-10[beginning-of-node] Siirry tämän solmun alkuun.\n"
#: info/infodoc.c:49
msgid "\\%-10[end-of-node] Go to the end of this node.\n"
-msgstr ""
+msgstr "\\%-10[end-of-node] Siirry tämän solmun loppuun.\n"
#: info/infodoc.c:51
msgid "\\%-10[move-to-next-xref] Skip to the next hypertext link.\n"
@@ -658,14 +666,15 @@ msgstr ""
#: info/infodoc.c:53
msgid "\\%-10[history-node] Go back to the last node seen in this window.\n"
msgstr ""
+"\\%-10[history-node] Siirry tässä ikkunassa viimeksi nähtyyn solmuun.\n"
#: info/infodoc.c:55
msgid "\\%-10[global-prev-node] Go to the previous node in the document.\n"
-msgstr ""
+msgstr "\\%-10[global-prev-node] Siirry tiedoston edelliseen solmuun.\n"
#: info/infodoc.c:56
msgid "\\%-10[global-next-node] Go to the next node in the document.\n"
-msgstr ""
+msgstr "\\%-10[global-next-node] Siirry tiedoston seuraavaan solmuun.\n"
#: info/infodoc.c:57
msgid "\\%-10[prev-node] Go to the previous node on this level.\n"
@@ -685,7 +694,7 @@ msgstr ""
#: info/infodoc.c:61
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
-msgstr ""
+msgstr "\\%-10[dir-node] Siirry päähakemistosolmuun.\n"
#: info/infodoc.c:63
msgid "1...9 Pick the first...ninth item in this node's menu.\n"
@@ -705,7 +714,7 @@ msgstr ""
#: info/infodoc.c:67
msgid "\\%-10[goto-node] Go to a node specified by name.\n"
-msgstr ""
+msgstr "\\%-10[goto-node] Siirry nimettyyn solmuun.\n"
#: info/infodoc.c:69
msgid "\\%-10[search] Search forward for a specified string.\n"
@@ -731,12 +740,12 @@ msgstr ""
#: info/infodoc.c:76
msgid "\\%-10[abort-key] Cancel the current operation.\n"
-msgstr ""
+msgstr "\\%-10[abort-key] Peru nykyinen toiminto.\n"
#: info/infodoc.c:195
#, c-format
msgid "This is GNU Info version %s. "
-msgstr ""
+msgstr "Tämä on GNU Infon versio %s. "
#: info/infodoc.c:196
msgid "The current search path is:\n"
@@ -773,7 +782,7 @@ msgstr ""
#: info/infodoc.c:333
msgid "Display help message"
-msgstr ""
+msgstr "Näytä ohjeviesti"
#: info/infodoc.c:346
msgid "Visit Info node '(info)Help'"
@@ -799,7 +808,7 @@ msgstr "Näytä mitä kirjoittaa annetun komennon suorittamiseksi"
#: info/infodoc.c:799
msgid "Where is command: "
-msgstr ""
+msgstr "Missä on komento: "
#: info/infodoc.c:821
#, c-format
@@ -819,7 +828,7 @@ msgstr ""
#: info/infodoc.c:836
#, c-format
msgid "There is no function named '%s'"
-msgstr "Funktiota nimeltä \"%s\" ei ole"
+msgstr "Funktiota nimeltä â€%s†ei ole"
#: info/infomap.c:585
#, c-format
@@ -827,17 +836,14 @@ msgid "could not open init file %s"
msgstr ""
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
-msgstr ""
+msgstr "liian pitkä näppäinjono"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
-msgstr ""
+msgstr "näppäinjono puuttuu"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-merkki (\\000) ei ole sallittu"
@@ -847,12 +853,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "NUL-merkki (^%c) ei ole sallittu"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
-msgstr ""
+msgstr "toiminnon nimi puuttuu"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr ""
@@ -862,7 +866,6 @@ msgid "unknown action `%s'"
msgstr "tuntematon toiminto \"%s\""
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "liian pitkä toiminnon nimi"
@@ -872,22 +875,18 @@ msgid "extra characters following action `%s'"
msgstr ""
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "muuttujan nimi puuttuu"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
-msgstr "muuttujan nimeä ei seuraa välittömästi \"=\""
+msgstr "muuttujan nimeä ei seuraa välittömästi â€=â€"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "liian pitkä muuttujan nimi"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "liian pitkä arvo"
@@ -909,7 +908,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr ""
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr ""
@@ -985,7 +983,6 @@ msgid "Show all matching files"
msgstr "Näytä kaikki osuvat tiedostot"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Ei tiedostoindeksiä"
@@ -998,6 +995,8 @@ msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
msgstr ""
+"Tervetuloa Infon versioon %s. Ohje: \\[get-help-window], opastus: \\[get-"
+"info-help-node]."
#: info/session.c:1254
msgid "Move down to the next line"
@@ -1130,8 +1129,8 @@ msgstr "Valitse tämä valikkokohta"
#, c-format
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Valikossa ei ole %d kohdetta"
+msgstr[1] "Valikossa ei ole %d kohdetta"
#: info/session.c:2226
msgid "Select the last item in this node's menu"
@@ -1158,7 +1157,7 @@ msgstr ""
#: info/session.c:2424
#, c-format
msgid "The reference disappeared! (%s)"
-msgstr ""
+msgstr "Viite katosi! (%s)"
#: info/session.c:2436
msgid "Read a menu item and select its node"
@@ -1191,7 +1190,7 @@ msgstr ""
#: info/session.c:2764
#, c-format
msgid "No menu in node '%s'"
-msgstr "Solmussa \"%s\" ei ole valikkoa"
+msgstr "Solmussa â€%s†ei ole valikkoa"
#: info/session.c:2811
#, c-format
@@ -1252,7 +1251,7 @@ msgstr "Lue solmun nimi ja valitse se"
#: info/session.c:3351 info/session.c:3355
msgid "Goto node: "
-msgstr "Siirry solmuun:"
+msgstr "Siirry solmuun: "
#: info/session.c:3534
msgid "Find the node describing program invocation"
@@ -1288,7 +1287,6 @@ msgid "Select the most recently selected node"
msgstr "Valitse viimeksi valittu solmu"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Historiassa ei ole aiempia solmuja"
@@ -1298,7 +1296,7 @@ msgstr "Lue tiedoston nimi ja valitse se"
#: info/session.c:3648
msgid "Find file: "
-msgstr "Etsi tiedosto:"
+msgstr "Etsi tiedosto: "
#: info/session.c:3665
#, c-format
@@ -1308,7 +1306,7 @@ msgstr "Ei löydy: \"%s\""
#: info/session.c:3713
#, c-format
msgid "Could not create output file '%s'"
-msgstr "Tulostiedostoa \"%s\" ei voida luoda"
+msgstr "Tulostiedostoa â€%s†ei voi luoda"
#: info/session.c:3727
#, c-format
@@ -1349,14 +1347,12 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr ""
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
-msgstr ""
+msgstr "Hauissa käytetään säännöllisiä lausekkeita"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
-msgstr ""
+msgstr "Hauissa käytetään merkkijonoliteraaleja"
#: info/session.c:4112
msgid "Search continued from the end of the document"
@@ -1371,8 +1367,7 @@ msgstr "Hakua jatkettiin asiakirjan alusta"
msgid "Searching subfile %s ..."
msgstr "Etsitään alitiedostoa %s..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Haku epäonnistui"
@@ -1395,7 +1390,7 @@ msgstr ""
#: info/session.c:4195 info/session.c:4201
msgid " backward"
-msgstr "taaksepäin"
+msgstr " taaksepäin"
#: info/session.c:4198
#, c-format
@@ -1406,166 +1401,165 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Liian lyhyt hakujono"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Ei enempää osumia"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Etsi merkkijonoa tästä solmusta alisolmuineen"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr ""
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Siirry seuraavaan osumaan Info-alipuussa"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Ei aktiivista hakua"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Siirry Infon alipuun edelliseen osumaan"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr ""
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Lue merkkijono ja etsi sitä"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Lue merkkijono ja etsi sitä taaksepäin"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Toisto viimeisin haku samaan suuntaan"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Ei aiempaa hakujonoa"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Toista viimeisin haku käänteissuuntaan"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Tyhjennä näytetyt osumat"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Hae merkkijonoa vuorovaikutteisesti kirjoittaessasi"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr ""
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr ""
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr ""
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
-msgstr "I-haku:"
+msgstr "I-haku: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Epäonnistuu "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Peru nykyinen toimenpide"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Lopeta"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Näytä suoritettavan Infon versio"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Infon versio %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Piirrä näyttö uudelleen"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Lopeta Infon käyttö"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr ""
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Tuntematon komento (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" on virheellinen"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "\"%s\" on virheellinen"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Lisää tämä numero nykyiseen numeeriseen argumenttiin"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr ""
#: info/variables.c:67
msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr ""
+msgstr "Kun käytössä, alaviitteet näytetään ja piilotetaan automaattisesti"
#: info/variables.c:71
msgid "When \"On\", creating or deleting a window resizes other windows"
-msgstr ""
+msgstr "Kun käytössä, ikkunan luominen tai poistaminen vaikuttaa muiden kokoon"
#: info/variables.c:75
msgid "When \"On\", flash the screen instead of ringing the bell"
-msgstr ""
+msgstr "Kun käytössä, näyttöä välkytetään kellon soiton sijaan"
#: info/variables.c:79
msgid "When \"On\", errors cause the bell to ring"
-msgstr ""
+msgstr "Kun käytössä, virheet aiheuttavat kellon soiton"
#: info/variables.c:83
msgid "When \"On\", Info garbage collects files which had to be uncompressed"
msgstr ""
+"Kun käytössä, Info kerää roskat tiedostoista, joiden pakkaus täytyi purkaa"
#: info/variables.c:86
msgid "When \"On\", the portion of the matched search string is highlighted"
-msgstr ""
+msgstr "Kun käytössä, osa täsmäävästä merkkijonosta korostetaan"
#: info/variables.c:90
msgid "Controls what happens when scrolling is requested at the end of a node"
@@ -1577,7 +1571,7 @@ msgstr "Kuten vierityskäyttäytyminen"
#: info/variables.c:99
msgid "The number lines to scroll when the cursor moves out of the window"
-msgstr ""
+msgstr "Montako riviä vierittää kohdistimen siirryttyä pois ikkunasta"
#: info/variables.c:103
msgid "Controls whether scroll-behavior affects cursor movement commands"
@@ -1585,12 +1579,12 @@ msgstr ""
#: info/variables.c:107
msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr ""
+msgstr "Kun käytössä, Info hyväksyy ja näyttää ISO Latin -merkit"
#: info/variables.c:111
msgid ""
"What to do when a scrolling command is issued at the end of the last node"
-msgstr ""
+msgstr "Mitä tehdä, kun vierityskomento annetaan viimeisen solmun lopussa"
#: info/variables.c:116
msgid "Minimal length of a search string"
@@ -1606,7 +1600,7 @@ msgstr "Ohita oletuskansiot tiedostonhakupolusta"
#: info/variables.c:128
msgid "Hide some Info file syntax in the text of nodes"
-msgstr ""
+msgstr "Piilota osa Info-syntaksista solmujen tekstistä"
#: info/variables.c:132
msgid ""
@@ -1658,7 +1652,7 @@ msgstr "Aseta Info-muuttujan arvo"
#: info/variables.c:254
msgid "Set variable: "
-msgstr "Aseta muuttuja:"
+msgstr "Aseta muuttuja: "
#: info/variables.c:270
#, c-format
@@ -1786,6 +1780,9 @@ msgid ""
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
+" --silent piilota varoitukset.\n"
+" --test älä päivitä DIR-FILEä.\n"
+" --version näytä versiotiedot ja lopeta."
#: install-info/install-info.c:639
#, c-format
@@ -1813,12 +1810,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr ""
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
@@ -1848,12 +1843,10 @@ msgid "excess command line argument `%s'"
msgstr ""
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
@@ -1872,939 +1865,934 @@ msgstr ""
msgid "no entries found for `%s'; nothing deleted"
msgstr ""
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
-msgstr ""
+msgstr "%s ei ole kelvollinen kielikoodi"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
-msgstr ""
+msgstr "%s ei ole kelvollinen aluekoodi"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "ei voida lukea: %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr ""
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "virhe suljettaessa: %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "raakamuotoa %s ei muunneta"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "tyyppi puuttuu"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "tuntematon tyyppi: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "merkkijonoa ei päätetty CSS-tiedostossa"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include päättyi kommenttiin"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "CSS-tiedoston @import ei pääty"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS-tiedostoa %s ei löytynyt"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "tyhjä solmun nimi"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "solmuton asiakirja"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
-msgstr ""
+msgstr "tiedosto ilman Top-solmua"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "@xrefiä tulee seurata \".\" tai \",\", ei %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
-msgstr "@xrefiä tulee seurata \".\" tai \",\""
+msgstr "@xrefiä tulee seurata â€.†tai â€,â€"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
-msgstr ""
+msgstr "valikkotietueen solmun nimessä ei saa olla â€%sâ€"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
-msgstr ""
+msgstr "valikkotietueen solmun nimessä ei saa olla â€:â€"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
-msgstr ""
+msgstr "valikkotietueen nimessä ei saa olla â€:â€"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "toistuva @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
-msgstr ""
+msgstr "%c%s vaatii nimen"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
-msgstr ""
+msgstr "%c%s – sulkeva aaltosulje puuttuu"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx:n tulee seurata @itemiä"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "pariton \"%c%s\""
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s: sulkeva aaltosulje puuttuu"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
-msgstr ""
+msgstr "luokka puuttuu: @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
-msgstr ""
+msgstr "tuntematon @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
-msgstr ""
+msgstr "tuntematon koodausnimi â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "tyhjä solmun nimi valikkotietueessa"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro \"%s\" on aiemmin määritelty"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
-msgstr ""
+msgstr "%c%s odottaa parametriksi â€i†tai â€jâ€, ei â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "aksenttikomentoa \"@%s\" ei saa seurata uusi rivi"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s odottaa aaltosulkeita"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "tuntematon komento \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "määrittelemätön lippu: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s on vanhentunut."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
-msgstr ""
+msgstr "%c%s on vanhentunut; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear in math context"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s tulisi esiintyä vain matematiikkakontekstissa"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory ensimmäisen solmun jälkeen"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry ensimmäisen solmun jälkeen"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu virheellisessä kontekstissa"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s ennen ensimmäistä @nodea"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s tulisi esiintyä vain matematiikkakontekstissa"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s tulisi esiintyä vain matematiikkakontekstissa"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "odottamaton @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "tyhjä @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
-msgstr ""
+msgstr "Vain @%s 10 tai 11 ovat tuettuja, ei â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
@@ -2833,7 +2821,7 @@ msgstr ""
msgid "@%s not empty"
msgstr "@%s ei ole tyhjä"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
@@ -2843,213 +2831,215 @@ msgstr ""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
-msgstr ""
+msgstr "viitteetön solmu â€%sâ€"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "tyhjä indeksiavain: @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr ""
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr ""
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: ei voitu avata tiedostoa %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
-msgstr ""
+msgstr "tex4ht.pm: ei voi palauttaa alkukansiota: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
+"tex4ht.pm: käsittely palautti %d HTML-tietuetta. Odotettiin %d, mikä on "
+"tietueiden määrä tiedostossa kohteelle @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: tuntematon muuttuja %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: tuntematon muuttuja %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
-msgstr ""
+msgstr "alustustiedostoa %s ei voitu lukea"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr ""
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Käyttö: %s [VALITSIN]... TEXINFOTSTO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3057,8 +3047,13 @@ msgid ""
"This program is commonly installed as both `makeinfo' and `texi2any';\n"
"the behavior is identical, and does not depend on the installed name.\n"
msgstr ""
+"Käännä Texinfon lähdedokumentaatio muihin muotoihin, oletuksena Info-,\n"
+"tiedostoksi, joka sopii lukemiseen Emacsilla tai itsenäisellä GNU Infolla.\n"
+"\n"
+"Ohjelma asennetaan tavallisesti sekä nimellä â€makeinfo†että â€texi2anyâ€.\n"
+"Ohjelmat toimivat asennusnimistään riippumatta samoin.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3077,7 +3072,7 @@ msgid ""
" --version display version information and exit.\n"
msgstr ""
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3088,7 +3083,7 @@ msgid ""
" after checking validity of TEXINFO-FILE.\n"
msgstr ""
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3115,7 +3110,7 @@ msgid ""
" Otherwise, DEST names the output file.\n"
msgstr ""
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3137,7 +3132,7 @@ msgid ""
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3151,19 +3146,21 @@ msgid ""
" anchors; default is set only if split.\n"
msgstr ""
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
+"Valitsimet DVI/PS/PDF-muodolle:\n"
+" --Xopt=VAL välitä VAL texi2dvi:lle; voi toistaa.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3174,7 +3171,7 @@ msgid ""
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3194,7 +3191,7 @@ msgid ""
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3204,7 +3201,7 @@ msgid ""
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3221,80 +3218,309 @@ msgid ""
" makeinfo --no-split foo.texi write one Info file however big\n"
msgstr ""
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
-msgstr ""
+msgstr "tuntematon puumuunnos %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: tiedostoparametri puuttuu\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "Lisätietoa komennolla â€%s --helpâ€.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: ei voitu avata tiedostoa %s kirjoitettavaksi: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "no matching `@end %s'"
+msgstr "pariton \"%c%s\""
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "pariton \"%c%s\""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s vaatii nimen"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s vaatii nimen"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s vaatii nimen"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Vain @%s 10 tai 11 ovat tuettuja, ei â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "pariton \"%c%s\""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "tex4ht.pm: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "tex4ht.pm: ei voitu avata tiedostoa %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s tulisi esiintyä vain matematiikkakontekstissa"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s vaatii nimen"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s odottaa parametriksi â€i†tai â€jâ€, ei â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "määrittelemätön lippu: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s on vanhentunut."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s on vanhentunut; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s tulisi esiintyä vain matematiikkakontekstissa"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s odottaa parametriksi â€i†tai â€jâ€, ei â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr ""
+
+#~ msgid "empty node name"
+#~ msgstr "tyhjä solmun nimi"
+
#~ msgid "can't open %s: %s"
#~ msgstr "ei voida avata %s: %s"
diff --git a/macros/texinfo/texinfo/po/fr.gmo b/macros/texinfo/texinfo/po/fr.gmo
index 956ec72b0a..2703d59faa 100644
--- a/macros/texinfo/texinfo/po/fr.gmo
+++ b/macros/texinfo/texinfo/po/fr.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/fr.po b/macros/texinfo/texinfo/po/fr.po
index 56d3b7cdaf..55f12f4bf7 100644
--- a/macros/texinfo/texinfo/po/fr.po
+++ b/macros/texinfo/texinfo/po/fr.po
@@ -13,10 +13,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: texinfo 6.5.93\n"
+"Project-Id-Version: texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-13 18:48+0100\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-28 12:18+0200\n"
"Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
@@ -250,7 +250,6 @@ msgid "Insert completion"
msgstr "Complète"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Recherche des façons de compléter..."
@@ -274,7 +273,6 @@ msgid "found file %s"
msgstr "Trouve le fichier %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Impossible d'afficher les notes de bas de page"
@@ -288,7 +286,6 @@ msgid "---------- Footnotes ----------"
msgstr "----- Notes de bas de page ----"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Recherche des entrées d'index..."
@@ -297,7 +294,6 @@ msgid "Look up a string in the index for this file"
msgstr "Recherche une chaîne dans l'index pour ce fichier"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Aucun index trouvé."
@@ -306,7 +302,6 @@ msgid "Index entry: "
msgstr "Entrée d'index : "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Aucun index trouvé."
@@ -322,7 +317,6 @@ msgid ""
msgstr "Va à la correspondance suivante de la commande « \\[index-search] »"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Aucune chaîne de recherche d'index précédente."
@@ -387,7 +381,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "« %s » n'est présent dans aucun des index disponibles."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Erreur lors de la conversion d'encodage de caractères du fichier."
@@ -402,7 +395,6 @@ msgid "Cannot find node '%s'"
msgstr "Impossible de trouver le nœud « %s »."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Aucun nom de programme donné."
@@ -431,7 +423,7 @@ msgstr "la valeur %s est invalide pour une variable %s"
msgid "Try --help for more information.\n"
msgstr "Utilisez --help pour plus d'informations.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -576,7 +568,7 @@ msgstr ""
" info -f ./foo.info Affiche ./foo.info, sans parcourir\n"
" l'arborescence."
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -887,17 +879,14 @@ msgid "could not open init file %s"
msgstr "impossible d'ouvrir le fichier d'initialisation %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "séquence de touches trop longue"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "séquence de touches manquante"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "le caractère NUL (\\000) est interdit"
@@ -907,12 +896,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "le caractère NUL (^%c) est interdit"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "nom de l'action manquant"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "impossible d'affecter la séquence de touches à une clé de menu"
@@ -922,7 +909,6 @@ msgid "unknown action `%s'"
msgstr "action « %s » inconnue"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nom d'action trop long"
@@ -932,22 +918,18 @@ msgid "extra characters following action `%s'"
msgstr "caractères en surplus détectés après l'action « %s »"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "nom de variable manquant"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "« = » manquant immédiatement après la variable"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nom de variable trop long"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "valeur trop longue"
@@ -969,7 +951,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Lit le nom d'une commande dans la zone d'écho et l'exécute"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Impossible d'exécuter une commande de zone d'écho ici."
@@ -1052,7 +1033,6 @@ msgid "Show all matching files"
msgstr "Afficher tous les fichiers correspondant"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Pas d'index de fichier"
@@ -1359,7 +1339,6 @@ msgid "Select the most recently selected node"
msgstr "Choisit le nœud le plus récemment sélectionné"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Aucun nœud antérieur dans l'historique."
@@ -1420,12 +1399,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Marche-arrêt des expressions rationnelles dans les recherches"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "La recherche utilise des expressions rationnelles."
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "La recherche utilise des chaînes littérales."
@@ -1442,8 +1419,7 @@ msgstr "Poursuite de la recherche depuis le début du document."
msgid "Searching subfile %s ..."
msgstr "Recherche dans le sous-fichier « %s »..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Échec de la recherche."
@@ -1477,140 +1453,138 @@ msgstr "%s%s%s : "
msgid "Search string too short"
msgstr "Chaîne à rechercher trop courte"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Va à la dernière correspondance à partir de %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Pas d'autre correspondance."
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Recherche une chaîne dans ce nœud et ses enfants."
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Recherche dans le sous-fichier « %s »..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Va à la correspondance suivante dans l'arborescence Info"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Pas de recherche en cours"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Va à la correspondance précédante dans l'arborescence Info"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Lit une chaîne et la recherche en respectant la casse"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Lit une chaîne et la recherche"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Lit une chaîne et la recherche vers l'arrière"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Recommence la dernière recherche dans la même direction"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Aucune chaîne de recherche antérieure"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Répète la dernière recherche dans la direction opposée"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Efface les mises en surbrillance"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Recherche interactive de la chaîne en cours de frappe"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Recherche arrière interactive d'exp. ration. : "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Recherche arrière interactive : "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Recherche interactive d'exp. ration. : "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Recherche interactive : "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Échec "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Annule l'opération en cours"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Quitte"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Affiche la version d'Info en cours"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "\"GNU Info version %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Redessine l'écran"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Quitte Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Exécute la commande liée à la minuscule associée à cette touche"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Commande inconnue (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "« %s » est invalide"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "« %s » est invalide"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Ajouter ce chiffre à l'argument numérique courant"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Démarre (ou multiplie par 4) l'argument numérique courant"
@@ -1973,12 +1947,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s : impossible de lire (%s) et de créer (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY sans END-INFO-DIR-ENTRY correspondant"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY sans START-INFO-DIR-ENTRY correspondant"
@@ -2008,12 +1980,10 @@ msgid "excess command line argument `%s'"
msgstr "argument en trop sur la ligne de commande : « %s »"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Aucun fichier d'entrée indiqué ; consultez l'aide (--help)."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Aucun fichier dir indiqué ; consultez l'aide (--help)."
@@ -2032,25 +2002,25 @@ msgstr "aucune entrée de répertoire Info dans « %s »"
msgid "no entries found for `%s'; nothing deleted"
msgstr "aucune entrée pour « %s » ; aucune suppression"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "impossible d'ouvrir %s en écriture : %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"Vous devez déplacer la commande @contents pour que le contenu soit\n"
"à la suite de la page de titre."
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2058,285 +2028,241 @@ msgstr ""
"Vous devez déplacer les commandes @shortcontents et @contents\n"
"pour que le contenu soit à la suite de la page de titre."
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s n'est pas un code de langue"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s n'est pas un code de zone géographique"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s n'est pas une division valable"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "impossible de lire %s : %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "erreur de fermeture du fichier @verbatiminclude %s : %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s : impossible de trouver %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "aucun nœud à renommer"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "nœuds sans nouveau nom à la fin du fichier"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "impossible d'ouvrir %s : %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "l'utilisation d'un fichier de nœuds renommés (%s) est désapprouvé"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "impossible de protéger le caractère hash dans @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "nom de nœud vide après expansion de « %s »"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s « %s » déjà défini"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "voici la définition précédente de @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "argument vide dans @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s : sotie incompatible avec des divisions"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "erreur lors de la fermeture de %s : %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "impossible de créer les répertoires « %s » ou « %s » : %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "impossible de créer les répertoires « %s » : %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "fichier @image « %s » non trouvé ; utilisation de « %s »"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "aucun argument spécifié à @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr ""
"fichier @image « %s » (pour le HTML) non trouvé ; utilisation de « %s »"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "le format brut %s n'est pas converti"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "impossible d'ouvrir le fichier de param. des réf. html %s : %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "type manquant"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "type inconnu : %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "erreur de fermeture du fichier de param. des réf. html %s : %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "chaîne non terminée dans le fichier css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include s'est terminé dans un commentaire"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import non terminé dans le fichier css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "fichier CSS %s non trouvé"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "impossible d'ouvrir --include-file %s : %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "erreur de fermeture du fichier CSS %s : %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "aucune entrée htmlxref.cnf trouvée pour « %s »"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "erreur de fermeture du fichier-cadre HTML %s : %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr ""
"erreur de fermeture du fichier-cadre de table des matières (TOC) %s : %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "échec du gestionnaire %s de l'étape %s priorité %s"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "vous devez indiquer un titre avec @top ou une commande de titrage"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "erreur de fermeture du fichier de redirection des nœuds %s : %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "l'ancien nom de « %s » est un nœud de ce document"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "le nœud renommé « %s » est un fichier vide"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "nœud cible (nouveau nom de « %s ») absent du document : %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"erreur de fermeture du fichier de redirection des nœuds renommés %s : %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "nom de nœud vide"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "utilisation de la syntaxe de nœud externe pour « %s »"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "document sans nœud."
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "document sans nœud Top."
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "échec du renommage de %s : %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s affiché plus d'une fois : %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s hors de tout nœud"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "nom de @node ne doit pas contenir de « , » : %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
"Une entrée d'index dans @%s comporte un : qui produit de l'Info invalide : %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "l'entrée de l'index « %s » est hors de tout nœud"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "erreur de fermeture du fichier texte image %s : %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "fichier @image « %s » illisible : %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "fichier @image « %s.txt » et texte de remplacement non trouvés"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2344,303 +2270,327 @@ msgstr ""
"@strong{Note...} produit un renvoi parasite dans Info ; reformulez pour "
"éviter cela"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "un nom de renvoi @%s ne devrait pas contenir de « : »"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "un nom de nœud @%s ne devrait pas contenir de « %s »"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "le nom d'un nœud @%s ne devrait pas contenir de « : »"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "« . » ou « , » doit suivre @xref, pas %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "« . » ou « , » doit suivre @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "un nom de nœud en entrée de menu ne devrait contenir de « %s »"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "un nom de nœud en entrée de menu ne devrait contenir de « : »"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "une entrée de menu ne devrait pas contenir de « : »"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "impossible d'ouvrir %s : %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "@%s multiples"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "argument formel @%s erroné ou vide : %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "syntaxe incorrecte de l'argument de @%s : %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s a besoin d'un nom"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "mauvais nom pour @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s présent avant l'accolade clôturant @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s présent avant l'accolade clôturant @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s sans accolade fermante"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s sans séquence de délimiteur de fermeture : %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx ne doit pas débuter @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx doit suivre @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s contient du texte mais pas d'@item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "« @end » attendait « %s », mais a eu « %s »"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s présent avant @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "aucun « %cend %s » correspondant"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "%c mal placée"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "« %c%s » sans correspondance"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "macro « %s » appelée avec trop d'arguments"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s sans accolade fermante"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "macro « %s » déclarée sans argument, mais appelée avec un argument"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ dans l'expansion de @%s suivie par « %s » au lieu du nom du paramètre\n"
"ou de \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "@%s sans nom"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "@%s sans catégorie"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "argument inattendu à la ligne @%s : %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "multitable vide"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "argument superflu à @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "mauvais argument à @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s nécessite un argument : le formateur %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"une commande @%s n'acceptant pas d'argument entre parenthèses ne devrait\n"
"pas se trouver sur une ligne @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "commande d'accentuation « @%s » interdite en argument à @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s sans d'argument"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "@end %s inconnu"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "argument superflu à @%s %s : %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "mauvais argument à @%s : %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s : impossible d'ouvrir %s : %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "le codage « %s » n'est pas accepté par texinfo"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "codage « %s » non reconnu"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s après le premier élément"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s n'a de sens que sur une ligne @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part ne devrait pas être associé à @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
"@node précède @%s, mais des parties ne peuvent être associées à des nœuds"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "utilisation de la syntaxe de nœud externe pour « %s »"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "entrée de menu vide dans « %s »."
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "nœud vide dans l'entrée de menu"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s ne devrait pas apparaître dans @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s ne peut apparaître qu'en début de ligne"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro « %s » déjà définie"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "voici la définition précédente de « %s »"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "redéfinition de la commande Texinfo : %s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s sans caractère associé"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr "@%s défini sans ou avec plus d'un argument s'invoque avec {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2648,352 +2598,365 @@ msgstr ""
"appel de macro trop profondément imbriqué (dérogation par "
"MAX_NESTED_MACROS ; valeur actuelle %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr "appel récursif de la macro %s interdit ; utiliser @rmacro si besoin"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "la commande d'accentuation « @%s » doit être suivie d'une espace"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "utiliser des accolades pour passer une commande en argument à « @%s »"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s attend l'argument « i » ou « j », pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
"la commande d'accentuation « @%s » ne doit pas être suivie d'un saut de ligne"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s accolades attendues"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "commande « %s » inconnue"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "drapeau indéfini : %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "syntaxe de @value incorrecte"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s est obsolète."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s est obsolète ; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s ne doit apparaître qu'en début de ligne"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s ne peut apparaître qu'en en-tête ou en pied de page"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s n'a aucun sens dans un bloc « %s »"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s dans une multitable vide"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab avant @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "trop de colonnes dans une entrée de multitable (%d max)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "@tab non pris en compte hors de multitable"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s en dehors d'une table ou d'une liste"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s interdit dans un bloc « @%s »"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s est réservé aux entrées d'index"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "seuls deux niveaux de sous-entrée d'index sont autorisés"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "il faut être après « @%s » pour utiliser « @%s »"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
"@%s n'a aucun sens hors des environnements « @titlepage » et « @quotation »"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory après le premier nœud"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "il n'est pas possible de placer une région %s dans une région %s"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry après le premier nœud"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu au sein d'un contexte non valide"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s vu avant le premier @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"votre nœud @top ne devrait-il pas être dans @ifnottex plutôt que @ifinfo ?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s est réservé aux entrées d'index"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s est réservé au contexte math"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "@ inattendu"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s n'a aucun sens hors de l'environnement « @float »"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s se place juste en dessous de « @float »"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "@%s multiples ignorés"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "la commande @%s s'emploie sans argument"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "la commande @%s doit avoir un argument nœud ou manuel externe"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "dans @%s, nom de renvoi vide après expansion de « %s »"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "dans @%s, titre du renvoi vide après expansion de « %s »"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image sans nom de fichier"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s sans premier argument"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "nombre non hex en argument à @U : %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "moins de quatre nombres hex en argument à @U : %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "l'argument à @U dépasse la limite Unicode de 0x10FFFF : %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "arguments de nœud superflus"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "@end %s attendu"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s ne devrait accepter en argument qu'une @-commande, pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "argument restant à la ligne @%s : %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "commande d'environnement %s en argument de @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "@%s vide"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "fraction de colonne non numérique : %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "l'argument de @sp doit être numérique, pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "%s est un nom d'index réservé"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "source d'index inconnue dans @%s : %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "destination d'index inconnue dans @%s : %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s conduit à une fusion de %s avec lui-même ; ignoré"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "index « %s » inconnu dans @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "impression d'un index « %s » fusionné dans un autre, « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex avant le début du document : @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "l'argument de @%s doit être « top » ou « bottom », pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Seuls @%s 10 ou 11 sont autorisés, pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "l'argument à @%s doit être « separate » ou « end », pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr ""
"l'argument de @%s doit être « on », « off » ou « odd », mais pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"l'argument de @paragraphindent doit être numérique, « none » ou « asis », "
"pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"l'argument de @firstparagraphindent doit être « none » ou « insert », pas "
"« %s »"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"l'argument de @exampleindent doit être numérique ou « asis », pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "@%s peut être « on » ou « off », pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"l'argument de @kbdinputstyle doit être « code », « example » ou "
"« distinct », pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"l'argument de @allowcodebreaks doit être « true » ou « false », pas « %s »"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"l'argument de @urefbreakstyle doit être « after », « before » ou « none », "
@@ -3024,7 +2987,7 @@ msgstr "aucune commande de sectionnement associée à @%s"
msgid "@%s not empty"
msgstr "@%s n'est pas vide"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s pointe vers un nœud « %s » inexistant"
@@ -3034,114 +2997,114 @@ msgstr "@%s pointe vers un nœud « %s » inexistant"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "entrée @%s du nœud nommé « %s » différente du nom de %s « %s »"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nœud « %s » non référencé"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
"le nœud « %s » est %s pour « %s » dans le sectionnement, mais pas dans le "
"menu"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
"le nœud %s « %s » est différent dans le menu « %s » et dans le sectionnement "
"« %s »"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
"le nœud « %s » est %s pour « %s » dans le menu mais pas dans le sectionnement"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "le pointeur %s « %s » (pour le nœud « %s ») diffère de %s nommé « %s »"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s fait référence à « %s » qui n'existe pas"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"le nœud « %s » n'a pas d'entrée de menu pour « %s », dont le « Up » le "
"désigne"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
"pour « %s », au-dessus dans le menu « %s » et au-dessus « %s » ne "
"correspondent pas"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s pour « %s », différent de %s nommé « %s »"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "entrée d'index vide dans @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm : impossible d'ouvrir %s en écriture : %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm : erreur lors de la fermeture de %s : %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h : impossible d'ouvrir %s en écriture : %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h : le répertoire L2H_TMP contient un point"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h : le répertoire courant contient un point"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h : commande en échec : %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h : extension d'image invalide : %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h : échec du renommage de %s en %s : %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h : impossible d'ouvrir %s : %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm : fin de @%s élément %d non trouvé"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3150,12 +3113,12 @@ msgstr ""
"latex2html.pm : le traitement a produit %d éléments HTML ; %d étaient "
"attendus, correspondant au nombre d'éléments du document"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h : impossible de déterminer le fragment %d pour @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3164,47 +3127,47 @@ msgstr ""
"l2h : impossible d'extraire le fragment %d pour @%s avec un compteur HTML de "
"sortie %d"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h : impossible de charger %s : %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h : impossible d'ouvrir %s en écriture : %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm : impossible d'ouvrir %s : %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm : impossible de passer dans le répertoire %s : %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm : impossible de retourner au répertoire initial : %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm : fichier de sortie absent : %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm : commande en échec : %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm : fin de @%s, élément %d non trouvé"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3213,12 +3176,12 @@ msgstr ""
"tex4ht.pm : le traitement a produit %d éléments HTML ; %d étaient attendus, "
"correspondant au nombre d'éléments du document pour @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm : sortie sans élément HTML pour @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3227,37 +3190,37 @@ msgstr ""
"tex4ht.pm : le traitement a récupéré %d éléments HTML ; %d étaient attendus, "
"correspondant au nombre d'éléments du document pour @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "erreur de chargement de %s : %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s : variable %s inconnue"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s : variable %s inconnue\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "impossible de lire le fichier init %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "valeur « %s » de TEXINFO_OUTPUT_FORMAT non reconnue, ignorée.\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Utilisation : %s [OPTION]... FICHIER-TEXINFO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3272,7 +3235,7 @@ msgstr ""
"Ce programme s'installe sous les noms de « makeinfo » et « texi2any » ;\n"
"le comportement est identique et ne dépend pas du nom de l'installation.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3309,7 +3272,7 @@ msgstr ""
" -v, --verbose Explique ce qui est fait.\n"
" --version Affiche la version du logiciel et s'arrête.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3328,7 +3291,7 @@ msgstr ""
" resultat demandé, après contrôle de\n"
" validité de FICHIER-TEXINFO.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3380,7 +3343,7 @@ msgstr ""
" par un /, y dépose le fichier résultant.\n"
" Sinon, DEST sera le nom du fichier.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3422,7 +3385,7 @@ msgstr ""
" --split-size=NB Divise les fichiers Info à la taille NB (par\n"
" défaut %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3451,7 +3414,7 @@ msgstr ""
" nœuds et ancres ; défini par défaut\n"
" uniquement avec l'option « split ».\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3459,7 +3422,7 @@ msgstr ""
"Options des formats XML et Docbook :\n"
" --output-indent=VAL sans objet (conservé pour compatibilité).\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3467,7 +3430,7 @@ msgstr ""
"Options des formats DVI, PS et PDF :\n"
" --Xopt=OPTION Passe OPTION à texi2dvi ; peut être répété.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3489,7 +3452,7 @@ msgstr ""
" -U VAR Supprime la variable VAR, comme avec "
"@clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3526,7 +3489,7 @@ msgstr ""
"\n"
" De plus, pour les options --no-ifFORMAT, traite les @ifnotFORMAT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3544,7 +3507,7 @@ msgstr ""
" Si on produit du texte, --ifplaintext est « on » et les autres « off ».\n"
" Si on produit du format XML, --ifxml est « on » et les autres « off ».\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3579,63 +3542,63 @@ msgstr ""
" makeinfo --no-split foo.texi Écrit un seul fichier Info\n"
" quelque soit sa taille\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s: --footnote-style est « separate » ou « end », pas « %s ».\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s : --paragraph-indent est numérique, « none » ou « asis », pas « %s ».\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s : pour produire %s, un seul fichier d'entrée peut être spécifié par -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "option --Xopt sans sortie imprimée"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "transformation d'arbre inconnue %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "découpage sans objet pour le format %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s : argument fichier absent.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Consultez « %s --help » pour plus d'informations.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"la transformation fill_gaps_in_sectioning ne renvoie rien. Pas de section ?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "erreur de fermeture du fichier d'expansion de macros %s : %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "impossible d'ouvrir %s en écriture : %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3643,17 +3606,228 @@ msgstr ""
"la transformation insert_nodes_for_sectioning_commands ne renvoie rien. Pas "
"de section ?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s : erreur de fermeture de %s : %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s : erreur de fermeture du fichiers de liens internes %s : %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s : impossible d'ouvrir %s en écriture : %s\n"
+
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "aucun « @end %s » correspondant"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "{ mal placée"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "« @end %s » sans correspondance"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set a besoin d'un nom"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "mauvais nom pour @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear a besoin d'un nom"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "mauvais nom pour @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro a besoin d'un nom"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "mauvais nom pour @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+"@clickstyle ne devrait accepter en argument qu'une @-commande, pas « %s »"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "commande d'environnement %s en argument de @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "mauvais argument à @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "mauvais argument à @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "@columnfractions vide"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "mauvais argument à @printindex : %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Seuls @fonttextsize 10 ou 11 sont autorisés, pas « %s »"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "l'argument à @footnotestyle est « separate » ou « end », pas « %s »"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+"l'argument de @setnewchapter doit être « on », « off » ou « odd », mais pas "
+"« %s »"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "mauvais argument à @need : %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"l'argument de @firstparagraph doit être « none » ou « insert », pas « %s »"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "mauvais argument à @headings : %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s nécessite un argument : le formateur de @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "« @end » sans correspondance"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "argument superflu à @end %s : %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "mauvais argument à @end : %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include : impossible de trouver %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include : impossible d'ouvrir %s :"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename après le premier élément"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions n'a de sens que sur une ligne @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+"@node précède @part, mais des parties ne peuvent être associées à des nœuds"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s n'a aucun sens dans un bloc %s"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s interdit dans un bloc « @copying »"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry est réservé aux entrées d'index"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@author n'a aucun sens hors des environnements « @titlepage » et "
+"« @quotation »"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s a besoin d'un nom"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "argument formel à @%s erroné ou vide :"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless attend l'argument « i » ou « j », pas « %c »"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "drapeau indéfini : %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s est obsolète."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s est obsolète ; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ est réservé au contexte math"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb sans caractère associé"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless attend l'argument « i » ou « j », pas « %s »"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "} mal placée"
diff --git a/macros/texinfo/texinfo/po/he.gmo b/macros/texinfo/texinfo/po/he.gmo
index b59754903d..389d157d7e 100644
--- a/macros/texinfo/texinfo/po/he.gmo
+++ b/macros/texinfo/texinfo/po/he.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/he.po b/macros/texinfo/texinfo/po/he.po
index d9afeaf48f..24d0798ebe 100644
--- a/macros/texinfo/texinfo/po/he.po
+++ b/macros/texinfo/texinfo/po/he.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 4.2\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2002-04-03 12:31+0300\n"
"Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
"Language-Team: Hebrew <eliz@gnu.org>\n"
@@ -22,36 +22,43 @@ msgstr ""
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n"
#: gnulib/lib/getopt.c:621
#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
msgid "%s: invalid option -- '%c'\n"
msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n"
#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:682
#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n"
@@ -69,11 +76,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:144
#, fuzzy
+#| msgid "invalid encoded character `%s'"
msgid "Invalid collation character"
msgstr "`%s' éåâù ããå÷î åú"
#: gnulib/lib/regcomp.c:147
#, fuzzy
+#| msgid "unlikely character %c in @var"
msgid "Invalid character class name"
msgstr "@var êåúá %c øéáñ-éúìá åú"
@@ -91,11 +100,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:159
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ( or \\("
msgstr "âåæ-ïá åì ïéàù }"
#: gnulib/lib/regcomp.c:162
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched \\{"
msgstr "âåæ-ïá åì ïéàù }"
@@ -105,11 +116,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:168
#, fuzzy
+#| msgid "Invalid node name: `%s'"
msgid "Invalid range end"
msgstr "`%s' :éåâù (node) ä÷ñéô íù"
#: gnulib/lib/regcomp.c:171
#, fuzzy
+#| msgid "virtual memory exhausted"
msgid "Memory exhausted"
msgstr "éìàèøéåä ïåøëæä øîâð"
@@ -127,16 +140,19 @@ msgstr ""
#: gnulib/lib/regcomp.c:183
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ) or \\)"
msgstr "âåæ-ïá åì ïéàù }"
#: gnulib/lib/regcomp.c:676
#, fuzzy
+#| msgid "No previous search string"
msgid "No previous regular expression"
msgstr "ïåøçà ùåôéçî úæåøçî ïéà"
#: gnulib/lib/xalloc-die.c:34
#, fuzzy
+#| msgid "virtual memory exhausted"
msgid "memory exhausted"
msgstr "éìàèøéåä ïåøëæä øîâð"
@@ -238,6 +254,7 @@ msgstr "äãéçé äîìùä"
#: info/echo-area.c:1049
#, fuzzy, c-format
+#| msgid "%d completions:\n"
msgid "%d completion:\n"
msgid_plural "%d completions:\n"
msgstr[0] " :úåîìùä %d\n"
@@ -248,7 +265,6 @@ msgid "Insert completion"
msgstr "äîìùä óñåä"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "...úåîìùä úîéùø áéëøî"
@@ -258,21 +274,23 @@ msgstr "úåîìùää ïåìç úà ìåìâ"
#: info/filesys.c:88
#, fuzzy, c-format
+#| msgid "%s; for file `%s'.\n"
msgid "looking for file \"%s\""
msgstr ".%s äì÷ú äúø÷ `%s' õáå÷á\n"
#: info/filesys.c:150
#, fuzzy, c-format
+#| msgid "Making %s file `%s' from `%s'.\n"
msgid "looking for file %s in %s"
msgstr ".%s èîøåôá `%s'-ì `%s' õáå÷ ãáòî\n"
#: info/filesys.c:236 info/filesys.c:250 info/filesys.c:271
#, fuzzy, c-format
+#| msgid "Find file: "
msgid "found file %s"
msgstr "Find file: "
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "íééìåù úåøòä âéöäì ïúéð àì"
@@ -285,7 +303,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Footnotes ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "...íéñ÷ãðéàä ìë úà ÷øåñ"
@@ -294,7 +311,8 @@ msgid "Look up a string in the index for this file"
msgstr "äæ õáå÷ ìù ñ÷ãðéàá úæåøçî ùôç"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr ".ñ÷ãðéà óà àöîð àì"
@@ -303,38 +321,45 @@ msgid "Index entry: "
msgstr "Index entry: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr ".ñ÷ãðéà óà àöîð àì"
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr "(.ãåò àåöîì äñðé `\\[next-index-match]') .\"%s\" èéøô %s-á éúàöî"
#: info/indices.c:446
#, fuzzy
+#| msgid ""
+#| "Go to the next matching index item from the last `\\[index-search]' "
+#| "command"
msgid ""
"Go to the next matching index item from the last '\\[index-search]' command"
msgstr "äðåøçà `\\[index-search]' úãå÷ôî úæåøçî íàåúä óñåð ñ÷ãðéà èéøô ùôç"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr ".ñ÷ãðéàá ùåôéçì úîãå÷ úæåøçî ïéà"
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No %sindex entries containing \"%s\"."
msgid "No more index entries containing '%s'"
msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No %sindex entries containing \"%s\"."
msgid "No index entries containing '%s'"
msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of \"%s\"..."
msgid "Scanning indices of '%s'..."
msgstr "...\"%s\" ìù íéñ÷ãðéàä ìë úà ÷øåñ"
@@ -345,11 +370,13 @@ msgstr ""
#: info/indices.c:654 info/indices.c:656
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index apropos"
msgstr "Index apropos: "
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No %sindex entries containing \"%s\"."
msgid "Index entries containing '%s':\n"
msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
@@ -368,41 +395,45 @@ msgstr ""
#: info/indices.c:889 info/indices.c:891
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index topic"
msgstr "Index apropos: "
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No %sindex entries containing \"%s\"."
msgid "No index entries containing '%s'."
msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have \"%s\" in their indices."
msgid "No available info files have '%s' in their indices"
msgstr ".åìù ñ÷ãðéàá \"%s\" ìéëî ïàë íéð÷úåîäî Info õáå÷ óà"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr ".`%s' óéòñ ïéà `%s' ä÷ñéô ìù èéøôúá"
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr ".äàöîð àì `%s' ä÷ñéô"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
#: info/info.c:635
#, fuzzy, c-format
+#| msgid "Invalid node name: `%s'"
msgid "invalid number: %s\n"
msgstr "`%s' :éåâù (node) ä÷ñéô íù"
@@ -418,6 +449,7 @@ msgstr ""
#: info/info.c:828 info/infokey.c:560
#, fuzzy, c-format
+#| msgid "Set the value of an Info variable"
msgid "value %s is not valid for variable %s"
msgstr "Info äðúùî ìù êøò äðù"
@@ -426,7 +458,7 @@ msgstr "Info äðúùî ìù êøò äðù"
msgid "Try --help for more information.\n"
msgstr ".øúåé áø òãéî úâöäì --help äñð\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -438,6 +470,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
@@ -472,6 +505,7 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers.\n"
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr ""
" .øåáéã æúðñîì åîéàúäì éãë êñîì äáéúë ïôåà äðù -b, --speech-friendly\n"
@@ -517,8 +551,13 @@ msgid ""
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Email bug reports to bug-texinfo@gnu.org,\n"
+#| "general questions and discussion to help-texinfo@gnu.org.\n"
+#| "Texinfo home page: http://www.gnu.org/software/texinfo/"
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -531,6 +570,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr ".äàöîð àì `%s' õáå÷á `%s' ä÷ñéô"
@@ -544,61 +584,73 @@ msgstr "!äæ ïåìçá úâöåîä ä÷ñéôá àöîð åðéà ïîñä"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr ".ãéçé ïåìç ÷åçîì ïúéð àì"
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr ".íééìåù úåøòä ïéà åæ ä÷ñéôá"
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr ".%sì äééðôä ïéà åæ ä÷ñéôá"
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr ".äøæò úìá÷ì `?' äñð ;Info-ì úøëåî äðéà `%c' äãå÷ô"
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr ".Info õéøäì éãë åéã ììëåùî åðéà `%s' âåñî âö"
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr ".åæ ä÷ñéô ìù ïåøçàä ãåîòá øáë ä/úà"
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr ".åæ ä÷ñéô ìù ïåùàøä ãåîòá øáë ä/úà"
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr ".ãçà ïåìç ÷ø íéé÷"
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr ".éãî øúåé ïè÷ äéä ïåìçä"
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr ".åäùìë ïåìç ÷åçîì àð ;äøæò ïåìç âéöäì íå÷î ÷éôñî ïéà"
@@ -608,6 +660,7 @@ msgstr ""
#: info/infodoc.c:40
#, fuzzy
+#| msgid "\\%-10[quit-help] Quit this help.\n"
msgid "\\%-10[quit-help] Close this help window.\n"
msgstr "\\%-10[quit-help] äæ äøæò ïåìç øåâñ\n"
@@ -621,21 +674,25 @@ msgstr "\\%-10[get-info-help-node] Info ùîúùîì êéøãî âöä\n"
#: info/infodoc.c:44
#, fuzzy
+#| msgid "\\%-10[up-node] Move \"up\" from this node.\n"
msgid "\\%-10[prev-line] Move up one line.\n"
msgstr "\\%-10[up-node] úéçëåð ä÷ñéô ìù áà-ú÷ñéôì øåáò\n"
#: info/infodoc.c:45
#, fuzzy
+#| msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n"
msgid "\\%-10[next-line] Move down one line.\n"
msgstr "\\%-10[next-node] úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
#: info/infodoc.c:46
#, fuzzy
+#| msgid "\\%-10[scroll-backward] Scroll backward a page.\n"
msgid "\\%-10[scroll-backward] Scroll backward one screenful.\n"
msgstr "\\%-10[scroll-backward] äøåçà ãçà óã ìåìâ\n"
#: info/infodoc.c:47
#, fuzzy
+#| msgid "\\%-10[scroll-forward] Scroll forward a page.\n"
msgid "\\%-10[scroll-forward] Scroll forward one screenful.\n"
msgstr "\\%-10[scroll-forward] äîéã÷ ãçà óã ìåìâ\n"
@@ -649,11 +706,16 @@ msgstr "\\%-10[end-of-node] úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
#: info/infodoc.c:51
#, fuzzy
+#| msgid ""
+#| "\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n"
msgid "\\%-10[move-to-next-xref] Skip to the next hypertext link.\n"
msgstr "\\%-10[move-to-next-xref] úéçëåð ä÷ñéôá àáä øåùé÷ì ïîñ ææä\n"
#: info/infodoc.c:52
#, fuzzy
+#| msgid ""
+#| "\\%-10[select-reference-this-line] Follow the hypertext link under "
+#| "cursor.\n"
msgid ""
"\\%-10[select-reference-this-line] Follow the hypertext link under the "
"cursor.\n"
@@ -661,71 +723,86 @@ msgstr "\\%-10[select-reference-this-line] åéìò àöîð ïîñäù øåùé÷ éøçà áå÷ò\n"
#: info/infodoc.c:53
#, fuzzy
+#| msgid "\\%-10[history-node] Move to the last node seen in this window.\n"
msgid "\\%-10[history-node] Go back to the last node seen in this window.\n"
msgstr "\\%-10[history-node] äæ ïåìçá äâöåäù äðåøçàä ä÷ñéôì øåæç\n"
#: info/infodoc.c:55
#, fuzzy
+#| msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n"
msgid "\\%-10[global-prev-node] Go to the previous node in the document.\n"
msgstr "\\%-10[prev-node] úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
#: info/infodoc.c:56
#, fuzzy
+#| msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n"
msgid "\\%-10[global-next-node] Go to the next node in the document.\n"
msgstr "\\%-10[next-node] úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
#: info/infodoc.c:57
#, fuzzy
+#| msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n"
msgid "\\%-10[prev-node] Go to the previous node on this level.\n"
msgstr "\\%-10[prev-node] úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
#: info/infodoc.c:58
#, fuzzy
+#| msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n"
msgid "\\%-10[next-node] Go to the next node on this level.\n"
msgstr "\\%-10[next-node] úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
#: info/infodoc.c:59
#, fuzzy
+#| msgid "\\%-10[up-node] Move \"up\" from this node.\n"
msgid "\\%-10[up-node] Go up one level.\n"
msgstr "\\%-10[up-node] úéçëåð ä÷ñéô ìù áà-ú÷ñéôì øåáò\n"
#: info/infodoc.c:60
#, fuzzy
+#| msgid "\\%-10[end-of-node] Go to the end of this node.\n"
msgid "\\%-10[top-node] Go to the top node of this document.\n"
msgstr "\\%-10[end-of-node] úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
#: info/infodoc.c:61
#, fuzzy
+#| msgid "\\%-10[end-of-node] Go to the end of this node.\n"
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
msgstr "\\%-10[end-of-node] úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
#: info/infodoc.c:63
#, fuzzy
+#| msgid " %-10s Pick first ... ninth item in node's menu.\n"
msgid "1...9 Pick the first...ninth item in this node's menu.\n"
msgstr " %-10s úéçëåðä ä÷ñéôä èéøôúá éòéùú ãò ïåùàø óéòñ øçá\n"
#: info/infodoc.c:64
#, fuzzy
+#| msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n"
msgid "\\%-10[last-menu-item] Pick the last item in this node's menu.\n"
msgstr "\\%-10[last-menu-item] úéçëåðä ä÷ñéôä èéøôúá ïåøçà óéòñ øçá\n"
#: info/infodoc.c:65
#, fuzzy
+#| msgid " %-10s Pick menu item specified by name.\n"
msgid "\\%-10[menu-item] Pick a menu item specified by name.\n"
msgstr " %-10s åîù é\"ôò èéøôúî óéòñ øçá\n"
#: info/infodoc.c:66
#, fuzzy
+#| msgid ""
+#| "\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n"
msgid "\\%-10[xref-item] Follow a cross reference specified by name.\n"
msgstr "\\%-10[xref-item] øåùé÷ä íù àøå÷ ;øåùé÷ øçà áå÷ò\n"
#: info/infodoc.c:67
#, fuzzy
+#| msgid " %-10s Move to node specified by name.\n"
msgid "\\%-10[goto-node] Go to a node specified by name.\n"
msgstr " %-10s äîù é\"ôò ä÷ñéôì øåáò\n"
#: info/infodoc.c:69
#, fuzzy
+#| msgid " %-10s Search forward for a specified string,\n"
msgid "\\%-10[search] Search forward for a specified string.\n"
msgstr " %-10s äæ Info õáå÷á êìéàå ïàëî úæåøçî ùôç\n"
@@ -739,6 +816,11 @@ msgstr ""
#: info/infodoc.c:72
#, fuzzy
+#| msgid ""
+#| "\\%-10[index-search] Search for a specified string in the index entries "
+#| "of this Info\n"
+#| " file, and select the node referenced by the first entry "
+#| "found.\n"
msgid ""
"\\%-10[index-search] Search for a specified string in the index, and\n"
" select the node referenced by the first entry found.\n"
@@ -752,11 +834,13 @@ msgstr ""
#: info/infodoc.c:76
#, fuzzy
+#| msgid "Cancel current operation"
msgid "\\%-10[abort-key] Cancel the current operation.\n"
msgstr "úéçëåð äìåòô ìèá"
#: info/infodoc.c:195
#, fuzzy, c-format
+#| msgid "This is %s, produced by makeinfo version %s from %s.\n"
msgid "This is GNU Info version %s. "
msgstr "This is %s, produced by makeinfo version %s from %s.\n"
@@ -803,6 +887,7 @@ msgstr "äøæò êñî âöä"
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "Info úëøòîá ùåîéùì êéøãî âöä"
@@ -817,6 +902,7 @@ msgstr "Describe key: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr ".øãâåî åðéà \"%s\""
@@ -830,41 +916,43 @@ msgstr "Where is command: "
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "åäùìë ù÷îì äøåù÷ äðéà `%s' äãå÷ôä"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr ".`%s' úìòôäì äãéçéä êøãä àåä `%s'"
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr ".%s äãå÷ôä úà ìéòôé %s"
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr ".úîéé÷ äðéà `%s' íùá äéö÷ðåô"
#: info/infomap.c:585
#, fuzzy, c-format
+#| msgid "cannot open input file `%s'"
msgid "could not open init file %s"
msgstr "`%s' èì÷ õáå÷ úçéúôá äì÷ú"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "éãî äëåøà íéù÷î úøãñ"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "äøñç íéù÷î úøãñ"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "øåñà (\\000) ÷éø åúá ùåîéùä"
@@ -874,12 +962,12 @@ msgid "NUL character (^%c) not permitted"
msgstr "øåñà (^%c) ÷éø åúá ùåîéùä"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "äãå÷ô íù øñç"
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "key sequence too long"
msgid "cannot bind key sequence to menu-digit"
msgstr "éãî äëåøà íéù÷î úøãñ"
@@ -889,7 +977,6 @@ msgid "unknown action `%s'"
msgstr "äòåãé äððéà `%s' äãå÷ô"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "éãî êåøà äãå÷ô íù"
@@ -899,22 +986,18 @@ msgid "extra characters following action `%s'"
msgstr "`%s' äãå÷ôì êùîäá íéøúåéî íéåú"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "äðúùîä íù øñç"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "äðúùîä íù éøçà ãéî `=' øñç"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "éãî êåøà äðúùîä íù"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "éãî êåøà êøò"
@@ -936,7 +1019,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "äúåà òöáå úåãå÷ôä úøåùî äãå÷ô ìù íù àø÷"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an `echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr ".äæ áöîá `echo-area' úãå÷ô òöáì ïúéð àì"
@@ -967,6 +1051,11 @@ msgstr ".%s õáå÷ ãáòì ïúéð àì\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -981,6 +1070,9 @@ msgstr ""
#: info/nodemenu.c:185
#, fuzzy
+#| msgid ""
+#| "Here is the menu of nodes you have recently visited.\n"
+#| "Select one from this menu, or use `\\[history-node]' in another window.\n"
msgid ""
"Here is the menu of nodes you have recently visited.\n"
"Select one from this menu, or use '\\[history-node]' in another window.\n"
@@ -1020,7 +1112,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr ""
@@ -1029,6 +1120,9 @@ msgstr ""
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1167,6 +1261,7 @@ msgstr "èéøôúäî äæ óéòñá øçá"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] ".íéôéòñ %d ïéà äæ èéøôúá"
@@ -1196,6 +1291,7 @@ msgstr "Follow xref: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "!íìòð (%s) øåùé÷ä ìù ãòéä"
@@ -1229,11 +1325,13 @@ msgstr "úéçëåðä äøåùá òéôåîä èéøôúî óéòñ åà øåùé÷ øçà áå÷ò"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr ".íéèéøôú `%s' ïéà ä÷ñéôá"
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr ".`%s' óéòñá äéìà øù÷î `%s'-á èéøôúä øùà ä÷ñéô éúàöî àì"
@@ -1271,11 +1369,13 @@ msgstr "äæ êîñîá äðåùàøä ä÷ñéôì øåáò"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr ".äæ êîñîá úåà÷ñéô øúåé ïéà"
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
@@ -1314,11 +1414,13 @@ msgstr "Get Manpage: "
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "äæ êîñîá (`Top') úéùàøä ä÷ñéôì øåáò"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "`(dir)' ä÷ñéôì øåáò"
@@ -1331,7 +1433,6 @@ msgid "Select the most recently selected node"
msgstr "äâöåäù äðåøçàä ä÷ñéôì øåæç"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1345,16 +1446,19 @@ msgstr "Find file: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr ".àöîð àì `%s' õáå÷"
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
#: info/session.c:3727
#, fuzzy, c-format
+#| msgid "error writing to `%s'"
msgid "error writing to %s: %s"
msgstr "`%s'-ì äáéúëá äì÷ú"
@@ -1367,6 +1471,7 @@ msgstr ""
# "Done." is appended.
#: info/session.c:3785
#, fuzzy, c-format
+#| msgid "Writing node %s..."
msgid "writing node %s..."
msgstr "`%s' ä÷ñéô èìô"
@@ -1376,6 +1481,7 @@ msgstr "INFO_PRINT_COMMAND êøã åæ ä÷ñéô ïëåú ñôãä"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr ".`%s'-ì ÷éôà úçéúôá äì÷ú"
@@ -1383,6 +1489,7 @@ msgstr ".`%s'-ì ÷éôà úçéúôá äì÷ú"
# "Done." is appended.
#: info/session.c:3864
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "printing node %s..."
msgstr "%s ä÷ñéô úñôãä"
@@ -1390,6 +1497,7 @@ msgstr "%s ä÷ñéô úñôãä"
# "Done." is appended.
#: info/session.c:3872
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "finished printing node %s"
msgstr "%s ä÷ñéô úñôãä"
@@ -1398,12 +1506,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr ""
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr ""
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr ""
@@ -1413,6 +1519,7 @@ msgstr ""
#: info/session.c:4117
#, fuzzy
+#| msgid "Kill to the beginning of the line"
msgid "Search continued from the beginning of the document"
msgstr "äøåù úìéçú ãò ÷çî"
@@ -1421,13 +1528,15 @@ msgstr "äøåù úìéçú ãò ÷çî"
msgid "Searching subfile %s ..."
msgstr "... %s õáå÷-úú ÷øåñ"
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr ".äàöîð àì úæåøçîä"
#: info/session.c:4192
#, fuzzy, c-format
+#| msgid "%s%sfor string [%s]: "
msgid "%s%s%s [%s]: "
msgstr "%s%sfor string [%s]: "
@@ -1441,6 +1550,7 @@ msgstr "Search"
#: info/session.c:4194 info/session.c:4200
#, fuzzy
+#| msgid " case-sensitively "
msgid " case-sensitively"
msgstr " case-sensitively "
@@ -1448,6 +1558,7 @@ msgstr " case-sensitively "
# format string above in a prompt, and we don't translate prompts.
#: info/session.c:4195 info/session.c:4201
#, fuzzy
+#| msgid "Search backward"
msgid " backward"
msgstr "Search backward"
@@ -1460,144 +1571,148 @@ msgstr ""
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr ""
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "... %s õáå÷-úú ÷øåñ"
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "úåéùéøá úåáùçúä êåú äúåà ùôçå úæåøçî àø÷"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "äúåà ùôçå úæåøçî àø÷"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "äøåçà äúåà ùôçå úæåøçî àø÷"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "ïååéë åúåàá ïåøçà ùåôéç ìò øåæç"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "ïåøçà ùåôéçî úæåøçî ïéà"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "êåôä ïååéëá ïåøçà ùåôéç ìò øåæç"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "äúåà ä/ãéì÷î ä/úàù éãë êåú úæåøçî ùôç"
-#: info/session.c:4878
+#: info/session.c:4893
#, fuzzy
+#| msgid "I-search backward: "
msgid "Regexp I-search backward: "
msgstr "I-search backward: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-search backward: "
-#: info/session.c:4881
+#: info/session.c:4896
#, fuzzy
+#| msgid "I-search: "
msgid "Regexp I-search: "
msgstr "I-search: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-search: "
# Untranslated because is used with the I-search: prompt.
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Failing "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "úéçëåð äìåòô ìèá"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "ìèåá"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "àöå úéðëúä úñøéâ ìò òãéî âöä"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "äâåöú ùãç"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Info úéðëåúî àö"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "äæ ù÷î ìù úåðè÷ úåéúåà úñøéâì äøåù÷ä äãå÷ô ìòôä"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr ".(%s) úøëåî-éúìá äãå÷ô"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" äéåâù äãå÷ô"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "\"%s\" is invalid"
msgid "'%s' is invalid"
msgstr "\"%s\" äéåâù äãå÷ô"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "éçëåð éøîåð èðîåâøàì åæ äøôñ óñåä"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "4-á íéé÷ êøò ìåôë åà ,éøîåð èðîåâøà ìù äãì÷ä ìçúä"
@@ -1648,6 +1763,8 @@ msgstr "úåéáéñ 8 éìòá ISO éåú âéöîå èìå÷ Info ,\"On\" áöîá íà"
#: info/variables.c:111
#, fuzzy
+#| msgid ""
+#| "Controls what happens when scrolling is requested at the end of a node"
msgid ""
"What to do when a scrolling command is issued at the end of the last node"
msgstr "ä÷ñéô óåñá äìéìâä úåâäðúä ìò èìåù"
@@ -1680,6 +1797,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "àáä øåùé÷ì ïîñ ææä"
@@ -1740,6 +1858,7 @@ msgstr "÷éø åðéä %s õáå÷"
#: install-info/install-info.c:291
#, fuzzy, c-format
+#| msgid " for %s"
msgid "%s for %s"
msgstr " for %s"
@@ -1750,6 +1869,7 @@ msgstr ".íéðééôàî ìù äàìî äîéùø úìá÷ì `%s --help' äñð\n"
#: install-info/install-info.c:538
#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n"
@@ -1848,6 +1968,23 @@ msgstr ""
#: install-info/install-info.c:639
#, fuzzy, c-format
+#| msgid ""
+#| "This is the file .../info/dir, which contains the\n"
+#| "topmost node of the Info hierarchy, called (dir)Top.\n"
+#| "The first time you invoke Info you start off looking at this node.\n"
+#| "\n"
+#| "%s\tThis is the top of the INFO tree\n"
+#| "\n"
+#| " This (the Directory node) gives a menu of major topics.\n"
+#| " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+#| " \"h\" gives a primer for first-timers,\n"
+#| " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+#| "\n"
+#| " In Emacs, you can click mouse button 2 on a menu item or cross "
+#| "reference\n"
+#| " to select it.\n"
+#| "\n"
+#| "* Menu:\n"
msgid ""
"This is the file .../info/dir, which contains the\n"
"topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -1883,16 +2020,15 @@ msgstr ""
#: install-info/install-info.c:663
#, fuzzy, c-format
+#| msgid "%s: could not read (%s) and could not create (%s)\n"
msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "íàåú END-INFO-DIR-ENTRY àìì START-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "íàåú START-INFO-DIR-ENTRY àìì END-INFO-DIR-ENTRY"
@@ -1922,17 +2058,16 @@ msgid "excess command line argument `%s'"
msgstr "`%s' øúåéî èðîåâøà"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ".äøæò úìá÷ì --help äñð ;èì÷ õáå÷ ïåéö ïéà"
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ".äøæò úìá÷ì --help äñð ;dir õáå÷ ïåéö ïéà"
#: install-info/install-info.c:2301
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not read %s."
msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
@@ -1946,950 +2081,1026 @@ msgstr "`%s'-á éùàø èéøôú éôéòñ ïéà"
msgid "no entries found for `%s'; nothing deleted"
msgstr "÷çîð àì íåìë ;`%s' øåáò èéøôú éôéòñ åàöîð àì"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid language code"
msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
-#: tp/Texinfo/Common.pm:1157
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid region code"
msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, fuzzy, perl-format
+#| msgid "macro `%s' previously defined"
msgid "@%s `%s' previously defined"
msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, fuzzy, perl-format
+#| msgid "here is the previous definition of `%s'"
msgid "here is the previous definition as @%s"
msgstr "äðåùàøì øãâåä `%s' ïàë"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to %c%s"
msgid "empty argument in @%s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing %s: %s"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directories `%s' or `%s': %s"
msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directory `%s': %s"
msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, fuzzy, perl-format
+#| msgid "@image file `%s' unreadable: %s"
msgid "@image file `%s' not found, using `%s'"
msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
+#| msgid "No node name specified for `%c%s' command"
msgid "no argument specified for @U"
msgstr "ä÷ñéô íù àìì `%c%s' äàøåä"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, fuzzy, perl-format
+#| msgid "@image file `%s' (for HTML) not readable: %s"
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
#, fuzzy
+#| msgid "missing action name"
msgid "missing type"
msgstr "äãå÷ô íù øñç"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, fuzzy, perl-format
+#| msgid "%s: unrecognized option `--%s'\n"
msgid "unrecognized type: %s"
msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing html refs config file %s: %s"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, fuzzy, perl-format
+#| msgid "cannot open input file `%s'"
msgid "could not open --include-file %s: %s"
msgstr "`%s' èì÷ õáå÷ úçéúôá äì÷ú"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing CSS file %s: %s"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, fuzzy, perl-format
+#| msgid "no index entries found for `%s'\n"
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing frame file %s: %s"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing TOC frame file %s: %s"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing redirection node file %s: %s"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, fuzzy, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, fuzzy, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
#, fuzzy
+#| msgid "No menu in this node."
msgid "document without nodes"
msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, fuzzy, perl-format
+#| msgid "(outside of any node)"
msgid "@%s outside of any node"
msgstr "(ä÷ñéô ìëì õåçî)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, fuzzy, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, fuzzy, c-format, perl-format
+#| msgid "Entry for index `%s' outside of any node"
msgid "entry for index `%s' outside of any node"
msgstr "ä÷ñéô ìëì õåçî øãâåî `%s' ñ÷ãðéà èéøô"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing image text file %s: %s"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, fuzzy, perl-format
+#| msgid "`.' or `,' must follow cross reference, not %c"
msgid "`.' or `,' must follow @xref, not %s"
msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
#, fuzzy
+#| msgid "`.' or `,' must follow cross reference, not %c"
msgid "`.' or `,' must follow @xref"
msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "íù ùøåã %c%s"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, fuzzy, c-format, perl-format
+#| msgid " for %s"
msgid "bad name for @%s"
msgstr " for %s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s-ì øñç éðîé øâåñ"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`%s' àöîð íìåà ,`%s' ì\"ö `@end' éøçà"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, fuzzy, perl-format
+#| msgid "No matching `%cend %s'"
msgid "no matching `%cend %s'"
msgstr "íàåú `%cend %s' øñç"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, fuzzy, perl-format
+#| msgid "Misplaced %c"
msgid "misplaced %c"
msgstr "åîå÷îá åðéàù %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, fuzzy, perl-format
+#| msgid "Unmatched `%c%s'"
msgid "unmatched `%c%s'"
msgstr "âåæ-ïá åì ïéàù `%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' called with too many args"
msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s missing close brace"
msgid "@%s missing closing brace"
msgstr "%c%s-ì øñç éðîé øâåñ"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' declared without argument called with an argument"
msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "øèîøô íù åà \\ íå÷îá ,åø÷àî úáçøäá \\ úåá÷òá `%s'"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, fuzzy, c-format, perl-format
+#| msgid "missing action name"
msgid "missing name for @%s"
msgstr "äãå÷ô íù øñç"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
#, fuzzy
+#| msgid "%s: empty file"
msgid "empty multitable"
msgstr "÷éø åðéä %s õáå÷"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to %c%s"
msgid "superfluous argument to @%s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to %c%s"
msgid "bad argument to @%s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s úàøåäá %citem øåáò áåöéò úèéù :èðîåâøà ùøãð"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, fuzzy, c-format, perl-format
+#| msgid "%s: option `--%s' doesn't allow an argument\n"
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing argument"
msgstr ".õáå÷ íù øñç %s úéðëúì\n"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown @end %s"
msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to %c%s"
msgid "bad argument to @%s: %s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, fuzzy, c-format, perl-format
+#| msgid "unrecogized encoding name `%s'"
msgid "unrecognized encoding name `%s'"
msgstr "`%s' øëåî-éúìá ãåãé÷ íù"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, fuzzy, c-format, perl-format
+#| msgid "No menu in node `%s'."
msgid "empty menu entry name in `%s'"
msgstr ".íéèéøôú `%s' ïéà ä÷ñéôá"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@end %s should only appear at the beginning of a line"
msgstr "äøåù úìéçú ãò ÷çî"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "äðåùàøì øãâåä `%s' ïàë"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, fuzzy, c-format, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "use braces to give a command as an argument to @%s"
msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, fuzzy, perl-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s expected `{...}'"
msgid "@%s expected braces"
msgstr "`{...}'-ì äôéö %c%s"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown command `%s'"
msgid "unknown command `%s'"
msgstr "`%s' úøëåî-éúìá äàøåä"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete."
msgstr "ïùåéî åðéä %c%s"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete; %s"
msgstr "ïùåéî åðéä %c%s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@%s should only appear at the beginning of a line"
msgstr "äøåù úìéçú ãò ÷çî"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, fuzzy, c-format, perl-format
+#| msgid "%s: empty file"
msgid "@%s in empty multitable"
msgstr "÷éø åðéä %s õáå÷"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, fuzzy, c-format, perl-format
+#| msgid "Too many columns in multitable item (max %d)"
msgid "too many columns in multitable item (max %d)"
msgstr "(%d ãò øúåî) multitable ìù @item-á úåãåîò éãî øúåé"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "multitable-ì õåçî @tab-î éúîìòúä"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, fuzzy, perl-format
+#| msgid "@%s not meaningful inside `@%s' block"
msgid "@%s not allowed inside `@%s' block"
msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, fuzzy, c-format, perl-format
+#| msgid "Must be in `%s' insertion to use `%sx'"
msgid "must be after `@%s' to use `@%s'"
msgstr "`%s' êåúá ÷øå êà ùåîéùá øúåî `%sx'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, fuzzy, c-format, perl-format
+#| msgid "Footnotes inside footnotes are not allowed"
msgid "region %s inside region %s is not allowed"
msgstr "íééìåù úåøòä êåúá íééìåù úåøòäá äëéîú ïéà"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, fuzzy, c-format, perl-format
+#| msgid "@menu seen before first @node, creating `Top' node"
msgid "@%s seen before first @node"
msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "?@ifinfo íå÷îá @ifnottex-á úô÷åî úåéäì äúéä äëéøö @top ú÷ñéô éë ïëúééä"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
#, fuzzy
+#| msgid "Expected `%s'"
msgid "unexpected @"
msgstr "`%s' éåôö äéä ïàë"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, fuzzy, c-format, perl-format
+#| msgid "@%s not meaningful inside `@%s' block"
msgid "@%s is not meaningful outside `@float' environment"
msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image úàøåäá øñç õáå÷ íù"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing first argument"
msgstr ".õáå÷ íù øñç %s úéðëúì\n"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, fuzzy, c-format, perl-format
+#| msgid "Expected `%s'"
msgid "expected @end %s"
msgstr "`%s' éåôö äéä ïàë"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "environment command %s as argument to @%s"
msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@sp arg must be numeric, not `%s'"
msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, fuzzy, c-format, perl-format
+#| msgid "Invalid node name: `%s'"
msgid "reserved index name %s"
msgstr "`%s' :éåâù (node) ä÷ñéô íù"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown source index in @%s: %s"
msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s' in @printindex"
msgid "unknown index `%s' in @printindex"
msgstr "@printindex-á `%s' øëåî-éúìá ñ÷ãðéà"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, fuzzy, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, fuzzy, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, fuzzy, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
@@ -2919,8 +3130,9 @@ msgstr ""
msgid "@%s not empty"
msgstr ""
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, fuzzy, perl-format
+#| msgid "%s reference to nonexistent node `%s'"
msgid "@%s reference to nonexistent node `%s'"
msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
@@ -2929,214 +3141,225 @@ msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, fuzzy, perl-format
+#| msgid "%s reference to nonexistent node `%s'"
msgid "%s reference to nonexistent `%s'"
msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, fuzzy, perl-format
+#| msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "äøæçá òéáöîù èéøôú óéòñ ïéà ìáà ,`%s' ìò òéáöî `%s' ä÷ñéô ìù Up äãù"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr ""
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr ""
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr ""
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, fuzzy, perl-format
+#| msgid "error writing to `%s'"
msgid "error loading %s: %s\n"
msgstr "`%s'-ì äáéúëá äì÷ú"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s"
msgstr "äòåãé äððéà `%s' äãå÷ô"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s\n"
msgstr "äòåãé äððéà `%s' äãå÷ô"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
msgid "could not read init file %s"
msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr ""
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
#, fuzzy
+#| msgid ""
+#| "Translate Texinfo source documentation to various other formats, by "
+#| "default\n"
+#| "Info files suitable for reading online with Emacs or standalone GNU "
+#| "Info.\n"
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3147,8 +3370,19 @@ msgstr ""
" ìãçî úøéøáë ,íéøçà íéðåù íéèîøåôì Texinfo øå÷î úôùá ãåòéú íâøú\n"
".GNU Info úéðëú åà Emacs úøæòá äàéø÷ì íéîéàúîä Info éöá÷ øöééî \n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, fuzzy, perl-format
+#| msgid ""
+#| "General options:\n"
+#| " --error-limit=NUM quit after NUM errors (default %d).\n"
+#| " --force preserve output even if errors.\n"
+#| " --help display this help and exit.\n"
+#| " --no-validate suppress node cross-reference validation.\n"
+#| " --no-warn suppress warnings (but not errors).\n"
+#| " --reference-limit=NUM warn about at most NUM references (default "
+#| "%d).\n"
+#| " -v, --verbose explain what is being done.\n"
+#| " --version display version information and exit.\n"
msgid ""
"General options:\n"
" --document-language=STR locale to use in translating Texinfo keywords\n"
@@ -3175,8 +3409,13 @@ msgstr ""
" .úéðëúä úìåòô ìò èåøô âöä -v, --verbose\n"
" .àöå äðëúä úñøéâ éáâì òãéî âöä --version\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
+#| msgid ""
+#| "Output format selection (default is to produce Info):\n"
+#| " --docbook output DocBook rather than Info.\n"
+#| " --html output HTML rather than Info.\n"
+#| " --xml output XML (TexinfoML) rather than Info.\n"
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3191,8 +3430,23 @@ msgstr ""
" .Info íå÷îá HTML èîøåôá èìô ïëä --html\n"
" .Info íå÷îá XML èîøåôá èìô ïëä --xml\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
#, fuzzy
+#| msgid ""
+#| "General output options:\n"
+#| " -E, --macro-expand FILE output macro-expanded source to FILE.\n"
+#| " ignoring any @setfilename.\n"
+#| " --no-headers suppress node separators, Node: lines, and "
+#| "menus\n"
+#| " from Info output (thus producing plain "
+#| "text)\n"
+#| " or from HTML (thus producing shorter "
+#| "output);\n"
+#| " also, write to standard output by default.\n"
+#| " --no-split suppress splitting of Info or HTML output,\n"
+#| " generate only one output file.\n"
+#| " --number-sections output chapter and sectioning numbers.\n"
+#| " -o, --output=FILE output to FILE (directory if split HTML),\n"
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3229,8 +3483,26 @@ msgstr ""
" .èìô õáå÷á úåà÷ñéôå íé÷øô øøôñ --number-sections\n"
" .(HTML èìô íà äé÷éú) FILE õáå÷ì èìô áåúë -o, --output=FILE\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, fuzzy, perl-format
+#| msgid ""
+#| "Options for Info and plain text:\n"
+#| " --enable-encoding output accented and special characters in\n"
+#| " Info output based on @documentencoding.\n"
+#| " --fill-column=NUM break Info lines at NUM characters (default "
+#| "%d).\n"
+#| " --footnote-style=STYLE output footnotes in Info according to "
+#| "STYLE:\n"
+#| " `separate' to put them in their own "
+#| "node;\n"
+#| " `end' to put them at the end of the node\n"
+#| " in which they are defined (default).\n"
+#| " --paragraph-indent=VAL indent Info paragraphs by VAL spaces "
+#| "(default %d).\n"
+#| " If VAL is `none', do not indent; if VAL "
+#| "is\n"
+#| " `asis', preserve existing indentation.\n"
+#| " --split-size=NUM split Info files at size NUM (default %d).\n"
msgid ""
"Options for Info and plain text:\n"
" --disable-encoding do not output accented and special characters\n"
@@ -3263,7 +3535,7 @@ msgstr ""
" .øå÷îá äúéäù éôë äææä ìò øåîù ,`asis'\n"
" .(%d ç\"îøá) NUM ìãåâá íéöá÷-úúì Info ÷ìç --split-size=NUM\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3277,20 +3549,29 @@ msgid ""
" anchors; default is set only if split.\n"
msgstr ""
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
#, fuzzy
+#| msgid ""
+#| "Input file options:\n"
+#| " --commands-in-node-names allow @ commands in node names.\n"
+#| " -D VAR define the variable VAR, as with @set.\n"
+#| " -I DIR append DIR to the @include search path.\n"
+#| " -P DIR prepend DIR to the @include search "
+#| "path.\n"
+#| " -U VAR undefine the variable VAR, as with "
+#| "@clear.\n"
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3307,8 +3588,20 @@ msgstr ""
" .@include ìù ùåôéç úîéùø ùàøá DIR óñåä -P DIR\n"
" .@clear úãå÷ôá åîë ,VAR äðúùî úøãâä ìèá -U VAR\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
#, fuzzy
+#| msgid ""
+#| "Conditional processing in input:\n"
+#| " --ifhtml process @ifhtml and @html even if not generating "
+#| "HTML.\n"
+#| " --ifinfo process @ifinfo even if not generating Info.\n"
+#| " --ifplaintext process @ifplaintext even if not generating plain "
+#| "text.\n"
+#| " --iftex process @iftex and @tex; implies --no-split.\n"
+#| " --no-ifhtml do not process @ifhtml and @html text.\n"
+#| " --no-ifinfo do not process @ifinfo text.\n"
+#| " --no-ifplaintext do not process @ifplaintext text.\n"
+#| " --no-iftex do not process @iftex and @tex text.\n"
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3337,8 +3630,13 @@ msgstr ""
" .@ifplaintext-á èñëè ãáòú ìà --no-ifplaintext\n"
" .@tex-å @iftex-á èñëè ãáòú ìà --no-iftex\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
#, fuzzy
+#| msgid ""
+#| " The defaults for the @if... conditionals depend on the output format:\n"
+#| " if generating HTML, --ifhtml is on and the others are off;\n"
+#| " if generating Info, --ifinfo is on and the others are off;\n"
+#| " if generating plain text, --ifplaintext is on and the others are off;\n"
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3352,8 +3650,23 @@ msgstr ""
" .íéìòôåî íðéà øúéä ìëå ìòôåî --ifinfo ,èñëè åà Info àåä èìôä íà\n"
" .íéìòôåî íðéà øúéä ìëå ìòôåî --ifplaintext ,èñëè àåä èìôä íà\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
#, fuzzy
+#| msgid ""
+#| "Examples:\n"
+#| " makeinfo foo.texi write Info to foo's @setfilename\n"
+#| " makeinfo --html foo.texi write HTML to @setfilename\n"
+#| " makeinfo --xml foo.texi write XML to @setfilename\n"
+#| " makeinfo --docbook foo.texi write DocBook XML to "
+#| "@setfilename\n"
+#| " makeinfo --no-headers foo.texi write plain text to standard "
+#| "output\n"
+#| "\n"
+#| " makeinfo --html --no-headers foo.texi write html without node lines, "
+#| "menus\n"
+#| " makeinfo --number-sections foo.texi write Info with numbered "
+#| "sections\n"
+#| " makeinfo --no-split foo.texi write one Info file however big\n"
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3380,82 +3693,326 @@ msgstr ""
" úåà÷ñéô øåøôñ íò Info èìô makeinfo --number-sections foo.texi\n"
" äéäéù ìëë ìåãâ ,ãéçé õáå÷á Info èìô makeinfo --no-split foo.texi\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "unknown tree transformation %s"
msgstr "äòåãé äððéà `%s' äãå÷ô"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr ".õáå÷ íù øñç %s úéðëúì\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr ".`%s --help' äñð øúé èåøôì\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing macro expand file %s: %s\n"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, fuzzy, perl-format
+#| msgid "%s: could not read (%s) and could not create (%s)\n"
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "No matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "íàåú `%cend %s' øñç"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced {"
+msgstr "åîå÷îá åðéàù %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "âåæ-ïá åì ïéàù `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "íù ùøåã %c%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "íù ùøåã %c%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "íù ùøåã %c%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @alias"
+msgstr "%c%s-ì éåâù èðîåâøà"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @definfoenclose"
+msgstr "%c%s-ì éåâù èðîåâøà"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @printindex: %s"
+msgstr "%c%s-ì éåâù èðîåâøà"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @need: %s"
+msgstr "%c%s-ì éåâù èðîåâøà"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @headings: %s"
+msgstr "%c%s-ì éåâù èðîåâøà"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s úàøåäá %citem øåáò áåöéò úèéù :èðîåâøà ùøãð"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "âåæ-ïá åì ïéàù `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @end: %s"
+msgstr "%c%s-ì éåâù èðîåâøà"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "íù ùøåã %c%s"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete."
+msgstr "ïùåéî åðéä %c%s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete; %s"
+msgstr "ïùåéî åðéä %c%s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced }"
+msgstr "åîå÷îá åðéàù %c"
+
#~ msgid "Insert this character"
#~ msgstr "äæ åú óñåä"
@@ -3471,6 +4028,7 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "CAN'T SEE THIS"
#~ msgstr "!úåàøéäì êéøö åðéàù èñ÷è"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "* Menu: Nodes whoses indices contain \"%s\":\n"
@@ -3478,6 +4036,7 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ "\n"
#~ "* Menu: (úåîéàúîä úåà÷ñôäå \"%s\" íéìéëîä ñ÷ãðéà éèéøô)\n"
+#, c-format
#~ msgid ""
#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
#~ "There is NO warranty. You may redistribute this software\n"
@@ -3489,6 +4048,7 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ " .GNU General Public License ïåéùøä éàðúì íàúäá\n"
#~ " .COPYING õáå÷á åðééò ,åìà íéðéðòá èåøéô øúéì\n"
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
#~ "\n"
@@ -3660,21 +4220,27 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ "\\%-10[search-backward] äæ Info õå÷á äøåçàå ïàëî úæåøçî ùôç\n"
#~ " .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
+#, c-format
#~ msgid " %-10s Quit this help.\n"
#~ msgstr " %-10s äæ äøæò ïåìç øåâñ\n"
+#, c-format
#~ msgid " %-10s Quit Info altogether.\n"
#~ msgstr " %-10s Info úéðëúî éøîâì àö\n"
+#, c-format
#~ msgid " %-10s Invoke the Info tutorial.\n"
#~ msgstr " %-10s Info ùîúùîì êéøãî âöä\n"
+#, c-format
#~ msgid " %-10s Move to the `next' node of this node.\n"
#~ msgstr " %-10s úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
+#, c-format
#~ msgid " %-10s Move to the `previous' node of this node.\n"
#~ msgstr " %-10s úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
+#, c-format
#~ msgid " %-10s Move `up' from this node.\n"
#~ msgstr " %-10s úéçëåð ä÷ñéô ìù áà-ú÷ñéôì øåáò\n"
@@ -3682,45 +4248,59 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ " Picking a menu item causes another node to be selected.\n"
#~ msgstr " .úøçà ä÷ñéôì øáòîì úîøåâ èéøôúî äøéçá\n"
+#, c-format
#~ msgid " %-10s Follow a cross reference. Reads name of reference.\n"
#~ msgstr " %-10s øåùé÷ä íù àøå÷ ;øåùé÷ øçà áå÷ò\n"
+#, c-format
#~ msgid " %-10s Move to the last node seen in this window.\n"
#~ msgstr " %-10s äæ ïåìçá äâöåäù äðåøçàä ä÷ñéôì øåæç\n"
+#, c-format
#~ msgid " %-10s Skip to next hypertext link within this node.\n"
#~ msgstr " %-10s úéçëåð ä÷ñéôá àáä øåùé÷ì ïîñ ææä\n"
+#, c-format
#~ msgid " %-10s Follow the hypertext link under cursor.\n"
#~ msgstr " %-10s åéìò àöîð ïîñäù øåùé÷ éøçà áå÷ò\n"
+#, c-format
#~ msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"
#~ msgstr " %-10s `g (DIR)'-ì êøò-äååù ;DIR ä÷ñéôì øåáò\n"
+#, c-format
#~ msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n"
#~ msgstr " %-10s `g Top'-ì êøò-äååù ;Top ä÷ñéôì øåáò\n"
+#, c-format
#~ msgid " %-10s Scroll forward a page.\n"
#~ msgstr " %-10s äîéã÷ ãçà óã ìåìâ\n"
+#, c-format
#~ msgid " %-10s Scroll backward a page.\n"
#~ msgstr " %-10s äøåçà ãçà óã ìåìâ\n"
+#, c-format
#~ msgid " %-10s Go to the beginning of this node.\n"
#~ msgstr " %-10s úéçëåð ä÷ñéô úìéçúì ïîñ ææä\n"
+#, c-format
#~ msgid " %-10s Go to the end of this node.\n"
#~ msgstr " %-10s úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
+#, c-format
#~ msgid " %-10s Scroll forward 1 line.\n"
#~ msgstr " %-10s äîéã÷ úçà äøåù ïîñ ææä\n"
+#, c-format
#~ msgid " %-10s Scroll backward 1 line.\n"
#~ msgstr " %-10s äøåçà úçà äøåù ïîñ ææä\n"
+#, c-format
#~ msgid " %-10s Pick last item in node's menu.\n"
#~ msgstr " %-10s úéçëåðä ä÷ñéôä èéøôúá ïåøçà óéòñ øçá\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search for a specified string in the index entries of this Info\n"
#~ msgstr " %-10s øåáòå äæ Info õáå÷ ìù íéñ÷ãðéàá úæåøçî ùôç\n"
@@ -3741,27 +4321,32 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ " and select the node in which the next occurrence is found.\n"
#~ msgstr " .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
+#, c-format
#~ msgid " %-10s Search backward for a specified string\n"
#~ msgstr " %-10s äæ Info õáå÷á äøåçàå ïàëî úæåøçî ùôç\n"
#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
#~ msgstr "--- `\\[kill-node]' åà `\\[history-node]' ù÷ä äàéöéì ---\n"
+#, c-format
#~ msgid "ESC %s is undefined."
#~ msgstr ".øãâåî åðéà \"ESC %s\""
+#, c-format
#~ msgid "%s is defined to %s."
#~ msgstr "%s is defined to %s."
#~ msgid "incorrect number of arguments"
#~ msgstr "éåâù äãå÷ôì íéèðîåâøàä øôñî"
+#, c-format
#~ msgid "cannot create output file `%s'"
#~ msgstr "`%s' èìô õáå÷ úøéöéá äì÷ú"
#~ msgid "section too long"
#~ msgstr "éãî êåøà ÷ìç"
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INPUT-FILE]\n"
#~ "\n"
@@ -3788,28 +4373,35 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ " .àöå úéðëúä úñøéâ ìò òãéî âöä --version\n"
#~ "\n"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too small"
#~ msgstr "ïé÷ú infokey õáå÷ úåéäì éãëá éãî ïè÷ -- `%s' õáå÷î íìòúî"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too big"
#~ msgstr "ïé÷ú infokey õáå÷ úåéäì éãëá éãî ìåãâ -- `%s' õáå÷î íìòúî"
+#, c-format
#~ msgid "Error reading infokey file `%s' - short read"
#~ msgstr "àø÷ð õáå÷ä ìë àì - `%s' infokey õáå÷ úàéø÷á äì÷ú"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
#~ msgstr ""
#~ "åðåëãò êøåöì infokey õøä -- (éåâù íñ÷ øôñî) ïé÷ú åðéà `%s' infokey õáå÷"
+#, c-format
#~ msgid "Your infokey file `%s' is out of date -- run infokey to update it"
#~ msgstr "åðåëãò êøåöì infokey õøä -- ïëãåòî åðéà `%s' infokey õáå÷"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
#~ msgstr ""
#~ "åðåëãò êøåöì infokey õøä -- (éåâù ÷ìç êøåà) ïé÷ú åðéà `%s' infokey õáå÷"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
#~ msgstr ""
@@ -3833,6 +4425,7 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "Selecting Next node..."
#~ msgstr "...äàáä ä÷ñéôá øçåá"
+#, c-format
#~ msgid "Moving Up %d time(s), then Next."
#~ msgstr ".äàáä ä÷ñéôä øçåá æàå ,úåà÷ñéôä õòá úå/äîø %d äìåò"
@@ -3848,9 +4441,11 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "Moving to `Prev's last menu item."
#~ msgstr ".úîãå÷ ä÷ñéô ìù èéøôúá ïåøçà óéòñì øáåò"
+#, c-format
#~ msgid "Kill node (%s): "
#~ msgstr "Kill node (%s): "
+#, c-format
#~ msgid "Cannot kill node `%s'"
#~ msgstr "`%s' ä÷ñéô ÷ìñì úåøùôà ïéà"
@@ -3881,21 +4476,27 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "--*** Tags out of Date ***"
#~ msgstr "--*** úðëãåòî äðéà Tags úìáè ***-- "
+#, c-format
#~ msgid "-%s---Info: %s, %d lines --%s--"
#~ msgstr "-%s---Info: %s, %d lines --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
#~ msgstr "-%s%s-Info: (%s)%s, %d lines --%s--"
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr " Subfile: %s"
+#, c-format
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n"
+#, c-format
#~ msgid "%s: option `-W %s' is ambiguous\n"
#~ msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n"
+#, c-format
#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
#~ msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n"
@@ -3938,15 +4539,18 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "@sc argument all uppercase, thus no effect"
#~ msgstr "è÷ôà ìë @sc-ì ïéà ïëì ,úåìåãâ úåéúåàá åìåë @sc ìù èðîåâøà"
+#, c-format
#~ msgid "`{' expected, but saw `%c'"
#~ msgstr "%c àöîð êà ,`{' ì\"ö"
#~ msgid "end of file inside verb block"
#~ msgstr "verb êåúá õáå÷ óåñ"
+#, c-format
#~ msgid "`}' expected, but saw `%c'"
#~ msgstr "%c àöîð êà ,`}' ì\"ö"
+#, c-format
#~ msgid "@sp requires a positive numeric argument, not `%s'"
#~ msgstr "`%s' àì ,éáåéç øôñî àåäù èðîåâøà ùøåã @sp"
@@ -3987,12 +4591,15 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "on"
#~ msgstr "on"
+#, c-format
#~ msgid "%s: getwd: %s, %s\n"
#~ msgstr "%s úéðëúá %s-å %s øåáò äàéâù ìò çååéã getwd/getcwd\n"
+#, c-format
#~ msgid "`%c%s' needs an argument `{...}', not just `%s'"
#~ msgstr "`{...}' êåúá úåéäì áééçù ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%s'"
+#, c-format
#~ msgid "No closing brace for footnote `%s'"
#~ msgstr "`}'-á úîééúñî äðéà `%s' íééìåù úøòä"
@@ -4005,12 +4612,15 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "Untitled"
#~ msgstr "úøúåë àìì"
+#, c-format
#~ msgid "Info cannot handle `:' in index entry `%s'"
#~ msgstr "`%s' ñ÷ãðéà èéøôá `:' ììâá ìùëéé Info"
+#, c-format
#~ msgid "Index `%s' already exists"
#~ msgstr "øãâåî øáë `%s' ñ÷ãðéà"
+#, c-format
#~ msgid "Unknown index `%s' and/or `%s' in @synindex"
#~ msgstr "øëåî-éúìá ñ÷ãðéà åðéä @synindex-á `%s' åà `%s'"
@@ -4020,9 +4630,11 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "Enumeration stack overflow"
#~ msgstr "@enumerate-á úéðñçî úùéìâ"
+#, c-format
#~ msgid "lettering overflow, restarting at %c"
#~ msgstr "%c-á ùãçî ìéçúî ,åìöåð úåéúåàä ìë"
+#, c-format
#~ msgid "%s requires letter or digit"
#~ msgstr "äøôñ åà úåà ùøåã %s"
@@ -4032,43 +4644,54 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "@detailmenu seen before first node, creating `Top' node"
#~ msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @detailmenu"
+#, c-format
#~ msgid "`%c%s' needs something after it"
#~ msgstr "åéøçà àåáéù åäùî êéøö `%c%s'"
+#, c-format
#~ msgid "Bad argument to `%s', `%s', using `%s'"
#~ msgstr "`%s'-ì èðîåâøàë íéàúî åðéà `%s'-ù íåùî `%s'-á éúùîúùä"
+#, c-format
#~ msgid "@itemx not meaningful inside `%s' block"
#~ msgstr "`%s' êåúá @itemx-ì úåòîùî ïéà"
+#, c-format
#~ msgid "%c%s found outside of an insertion block"
#~ msgstr "äñðëä ÷åìá ìëì õåçî %c%s àöîð"
+#, c-format
#~ msgid "sorry, encoding `%s' not supported"
#~ msgstr "êîúð åðéà `%s' ãåãé÷ ,íéøòèöî"
+#, c-format
#~ msgid "%s is an invalid ISO code, using %c"
#~ msgstr "éåâù ISO ãå÷ åðéä %s éë %c-á ùîúùî"
+#, c-format
#~ msgid "%c%s expects a single character `i' or `j' as argument"
#~ msgstr "èðîåâøàë `j' åà `i' ãéçé åú ìá÷î %c%s"
+#, c-format
#~ msgid "%cend macro not found"
#~ msgstr "àöîð àì %cend macro"
#~ msgid "@quote-arg only useful for single-argument macros"
#~ msgstr "ãéçé èðîåâøà ìòá åø÷àî êåúá ÷ø éùåîéù @quote-arg"
+#, c-format
#~ msgid "mismatched @end %s with @%s"
#~ msgstr "@end %s úà íàåú åðéà @%s"
# Not translated because Emacs recognizes warningsby this template.
+#, c-format
#~ msgid "%s:%d: warning: "
#~ msgstr "%s:%d: warning: "
#~ msgid "Too many errors! Gave up.\n"
#~ msgstr ".íééãé éúîøä !úàéâù éãî øúåé\n"
+#, c-format
#~ msgid "Couldn't open macro expansion output `%s'"
#~ msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
@@ -4078,19 +4701,23 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "File exists, but is not a directory"
#~ msgstr "äöéçî åððéàù íéé÷ õáå÷ àöîð"
+#, c-format
#~ msgid "No `%s' found in `%s'"
#~ msgstr "`%s' àöîð àì `%s' õáå÷á"
+#, c-format
#~ msgid ""
#~ "%s: Skipping macro expansion to stdout as Info output is going there.\n"
#~ msgstr "%s: .íùì ïååëî èìôù íåùî åèîùåé éð÷ú èìô õåøòì åø÷àî úåáçøä\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing macro output file `%s' due to errors; use --force to "
#~ "preserve.\n"
#~ msgstr ""
#~ "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' åø÷àî úåáçøä õáå÷\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
#~ msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' èìô õáå÷\n"
@@ -4110,27 +4737,34 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "First argument to @inforef may not be empty"
#~ msgstr "÷éø úåéäì ìåëé åðéà @inforef ìù ïåùàø èðîåâøà"
+#, c-format
#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
#~ msgstr "úøçà úîåéñ äðéåö àìå åàöîð àì .jpg-å `%s.png'"
+#, c-format
#~ msgid "@image file `%s' (for text) unreadable: %s"
#~ msgstr "(èñëè øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
+#, c-format
#~ msgid "{No value for `%s'}"
#~ msgstr "{No value for `%s'}"
+#, c-format
#~ msgid "Reached eof before matching @end %s"
#~ msgstr "íàåú @end %s éðôì øîâð èì÷ õáå÷"
+#, c-format
#~ msgid "`%.40s...' is too long for expansion; not expanded"
#~ msgstr "áçøåé àì ;åáéçøäì éãëî êåøà `%.40s...'"
#~ msgid "Missing } in @multitable template"
#~ msgstr "} øñç @multitable ìù úéðáúá"
+#, c-format
#~ msgid "ignoring stray text `%s' after @multitable"
#~ msgstr "@multiline éøçà `%s' øúåéî èñëèî éúîìòúä"
+#, c-format
#~ msgid "Cannot select column #%d in multitable"
#~ msgstr "multitable-á %d 'ñî äãåîò úøéçáá äì÷ú"
@@ -4138,18 +4772,23 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "** Multicolumn output from last row:\n"
#~ msgstr "** Multicolumn output from last row:\n"
+#, c-format
#~ msgid "* column #%d: output = %s\n"
#~ msgstr "* column #%d: output = %s\n"
+#, c-format
#~ msgid "Node `%s' previously defined at line %d"
#~ msgstr "`%s' ä÷ñéô úøãâä øáë %d äøåùá"
+#, c-format
#~ msgid "Formatting node %s...\n"
#~ msgstr "...%s ä÷ñéô ãáòî úòë\n"
+#, c-format
#~ msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
#~ msgstr "`%s' ä÷ñéôá (%c%s ïåâë) ÷åñéô úàøåäá êøåö ùé"
+#, c-format
#~ msgid "Anchor `%s' and node `%s' map to the same file name"
#~ msgstr "õáå÷ íù åúåàì úåîâøåúî `%s' øåùé÷ úéåúå `%s' ä÷ñéô"
@@ -4159,6 +4798,7 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "Rename this anchor or use the `--no-split' option"
#~ msgstr "`--no-split' ïééôàîá ùîúùä åà úéåúä íù äðù"
+#, c-format
#~ msgid "Unexpected string at end of split-HTML file `%s'"
#~ msgstr "`%s' ÷ìåçî HTML õáå÷ íåéñá äéåôö-éúìá úæåøçî"
@@ -4174,6 +4814,7 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "Up:"
#~ msgstr "Up:"
+#, c-format
#~ msgid "Anchors `%s' and `%s' map to the same file name"
#~ msgstr "õáå÷ íù åúåàì úåîâøåúî `%s-å `%s' øåùé÷ úåéåú"
@@ -4186,45 +4827,57 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "Cross"
#~ msgstr "øåùé÷"
+#, c-format
#~ msgid "Next field of node `%s' not pointed to"
#~ msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Next äãùá ä÷ñéôä"
+#, c-format
#~ msgid "This node (%s) has the bad Prev"
#~ msgstr "éåâù Prev äãù úìòá àéä (%s) åæ ä÷ñéô"
#~ msgid "Prev"
#~ msgstr "Prev äãù"
+#, c-format
#~ msgid "Prev field of node `%s' not pointed to"
#~ msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Prev äãùá ä÷ñéôä"
+#, c-format
#~ msgid "This node (%s) has the bad Next"
#~ msgstr "éåâù Next äãù úìòá àéä (%s) åæ ä÷ñéô"
+#, c-format
#~ msgid "`%s' has no Up field"
#~ msgstr "Up äãù ïéà `%s'-ì"
#~ msgid "Up"
#~ msgstr "Up äãù"
+#, c-format
#~ msgid "node `%s' has been referenced %d times"
#~ msgstr "`%s' ä÷ñéôì íéøåùé÷ %d éúøôñ"
+#, c-format
#~ msgid "Appendix %c "
#~ msgstr "Appendix %c "
+#, c-format
#~ msgid "Internal error (search_sectioning) \"%s\"!"
#~ msgstr "!\"%s\" (search_sectioning) úéîéðô äðëåú úì÷ú"
+#, c-format
#~ msgid "%c%s is obsolete; use %c%s instead"
#~ msgstr "%c%s-á ùîúùäì óéãò ;úðùåéî äðéä %c%s äàøåä"
+#, c-format
#~ msgid "Node with %ctop as a section already exists"
#~ msgstr "íãå÷ äøãâåä øáë %ctop íò ä÷ñéô"
+#, c-format
#~ msgid "Here is the %ctop node"
#~ msgstr "%ctop ú÷ñéô ìù íå÷îä åäæ"
+#, c-format
#~ msgid "%ctop used before %cnode, defaulting to %s"
#~ msgstr "éîöòá @node éúôñåä ,%cnode éðôì %ctop-á äùîúùä %s ä÷ñéô"
@@ -4234,12 +4887,15 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "Short Contents"
#~ msgstr "Short Contents"
+#, c-format
#~ msgid "%s: TOC should be here, but it was not found"
#~ msgstr "àöîð àì êà ,%s õáå÷á úåéäì äéä øåîà íéðééðò ïëåú"
+#, c-format
#~ msgid "%s: warning: "
#~ msgstr "%s: warning: "
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
#~ "\n"
@@ -4309,9 +4965,11 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ " .àöå úéðëúä úñøéâ ìò òãéî âöä --version\n"
#~ "\n"
+#, c-format
#~ msgid "%s: Specify the Info directory only once.\n"
#~ msgstr ".ãáìá úçà íòô %s-ì Info úéé÷éú ïééöì ïúéð\n"
+#, c-format
#~ msgid "menu item `%s' already exists, for file `%s'"
#~ msgstr "`%s' óéòñ éùàøä èéøôúá íéé÷ øáë `%s' õáå÷ì"
@@ -4327,12 +4985,14 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ msgid "send output to FILE"
#~ msgstr "FILE õáå÷ì èìô äðôä"
+#, c-format
#~ msgid "Usage: %s [OPTION]... FILE...\n"
#~ msgstr "%s [OPTION]... FILE... :ùåîéùä ïôåà\n"
#~ msgid "Generate a sorted index for each TeX output FILE.\n"
#~ msgstr ".TeX é\"ò áúëðù FILE õáå÷ ìëì ïééåîî ñ÷ãðéà ïëä\n"
+#, c-format
#~ msgid ""
#~ "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
#~ msgstr ".`foo.%c%c' íùá íéàø÷ð `foo.texi' êîñî øåáò FILE éöá÷ ììë êøãá\n"
@@ -4344,14 +5004,18 @@ msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
#~ "\n"
#~ " :íéðééôàî\n"
+#, c-format
#~ msgid "%s: not a texinfo index file"
#~ msgstr "texinfo ìù ñ÷ãðéà õáå÷ åðéà `%s'"
+#, c-format
#~ msgid "failure reopening %s"
#~ msgstr "%s ìù úùãåçî äçéúôá äì÷ú"
+#, c-format
#~ msgid "No page number in %s"
#~ msgstr "ãåîò øôñî ïéà %s-á"
+#, c-format
#~ msgid "entry %s follows an entry with a secondary name"
#~ msgstr "éðùî íù ìòá èéøô úåá÷òá àá %s èéøô"
diff --git a/macros/texinfo/texinfo/po/hr.gmo b/macros/texinfo/texinfo/po/hr.gmo
index d27d18318d..a89ff76a4f 100644
--- a/macros/texinfo/texinfo/po/hr.gmo
+++ b/macros/texinfo/texinfo/po/hr.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/hr.po b/macros/texinfo/texinfo/po/hr.po
index dffbe325f1..e3cf92495c 100644
--- a/macros/texinfo/texinfo/po/hr.po
+++ b/macros/texinfo/texinfo/po/hr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU texinfo-6.5.93\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2019-02-12 18:44-0800\n"
"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -248,7 +248,6 @@ msgid "Insert completion"
msgstr "Dopuni"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Dopune se generiraju..."
@@ -273,7 +272,6 @@ msgid "found file %s"
msgstr "pronađena je datoteka %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Fusnote nije (bilo) moguće prikazati"
@@ -286,7 +284,6 @@ msgid "---------- Footnotes ----------"
msgstr "----------- Fusnote -----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Tražimo stavke indeksa..."
@@ -295,7 +292,6 @@ msgid "Look up a string in the index for this file"
msgstr "Traži string u indeksu ove datoteke"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Nije nađen nijedan indeks."
@@ -304,7 +300,6 @@ msgid "Index entry: "
msgstr "Stavka indeksa: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Nije nađen nijedan indeks."
@@ -320,7 +315,6 @@ msgstr ""
"Na sljedeću podudarnu stavku indeksa od zadnje „\\[index-search]“ naredbe"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Nema prethodnog stringa za pretraživanje indeksa."
@@ -384,7 +378,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Nijedna od dostupnih Info-datoteka nema „%s“ u njihovim indeksima."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Greška pri konverziji kodiranja znakova datoteke."
@@ -399,7 +392,6 @@ msgid "Cannot find node '%s'"
msgstr "Nije moguće pronaći Ävor „%s“."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Trebate navesti ime programa (npr. info -O cp)."
@@ -428,7 +420,7 @@ msgstr "vrijednost %s nije valjana za varijablu %s"
msgid "Try --help for more information.\n"
msgstr "Pokušajte --help za više informacija.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -563,7 +555,7 @@ msgstr ""
" info --subnodes -o out.txt ispiÅ¡i kompletni Emacs priruÄnik u out.txt\n"
" info -f ./foo.info pokaži datoteku ./foo.info"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -873,17 +865,14 @@ msgid "could not open init file %s"
msgstr "nije (bilo) moguće otvoriti inicijalizacijsku datoteku %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "sekvencija tipki je preduga"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "nedostaje sekvencija tipki"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL znak (\\000) nije dopušten"
@@ -893,12 +882,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "NUL znak (^%c) nije dopušten"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "nedostaje ime akcije"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "sekvenciju tipki nije moguće povezati na menu-digit"
@@ -908,7 +895,6 @@ msgid "unknown action `%s'"
msgstr "nepoznata akcija „%s“"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "ime za akciju je predugo"
@@ -918,22 +904,18 @@ msgid "extra characters following action `%s'"
msgstr "suvišni znakovi nakon akcije „%s“"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "nedostaje ime varijable"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "nema znaka „=“ odmah iza imena varijable"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "ime varijable je predugo"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "vrijednost je preduga"
@@ -955,7 +937,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Izvrši specificirane naredbe u eho (echo) retku"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Ovdje nije moguće izvršiti „echo-area“ naredbu"
@@ -1038,7 +1019,6 @@ msgid "Show all matching files"
msgstr "Prikaži sve podudarne datoteke"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Nema indeksne datoteke"
@@ -1350,7 +1330,6 @@ msgid "Select the most recently selected node"
msgstr "Natrag na posljednji posjećeni Ävor"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "U povijesti nema ranijeg Ävora"
@@ -1411,12 +1390,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Promjena uporabe regularnih izraza u pretraživanju"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Za pretraživanje se koristi regularni izraz"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Za pretraživanje se koristi obiÄni tekst"
@@ -1433,8 +1410,7 @@ msgstr "Pretraga se nastavlja od poÄetka dokumenta"
msgid "Searching subfile %s ..."
msgstr "Tražimo poddatoteku %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Traženi string nije (više) pronađen"
@@ -1468,140 +1444,138 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "String za pretraživanje je prekratak"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Vraćanje na zadnje podudaranje od %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Nema više podudaranja"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Traži string u ovom Ävoru i podÄvorovima"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Traži ispod %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Na sljedeći nalaz u Info podstablu"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Nema aktivnog traženja"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Na prethodni nalaz u Info podstablu"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Traži specificirani string (pazite na slova!)"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Traži specificirani string"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Traži unatrag specificirani string"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Ponovi zadnju pretragu u istom smjeru"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Nema stringa od prethodnog traženja"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Ponovi zadnju pretragu u suprotnom smjeru"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Poništi isticanje prikazanih nalaza (rezultata pretraživanja)"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Postupno tražite string dok ga tipkate"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Postupno tražite unatrag regularni izraz: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Postupno tražite unatrag: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Postupno tražite regularni izraz: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Postupno tražite: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "*Nema više podudaranja* "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Poništi aktualnu operaciju"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Napusti(te)"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "IspiÅ¡e inaÄicu od Info programa"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info inaÄica %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Obnovi ovaj prozor"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Prestani(te) rabiti Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Izvrši naredbu povezanu na malo slovo ove tipke"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Nepoznata naredba (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "„%s“ nije valjan"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "„%s“ nije valjan"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Aktualnom brojÄanom argumentu dodajte ovu znamenku"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "ZapoÄni (ili pomnoži s 4) aktualni brojÄani argument"
@@ -1950,12 +1924,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: nije (bilo) moguće Äitati (%s) ni napraviti (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY nema odgovarajući END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY nema odgovarajući START-INFO-DIR-ENTRY"
@@ -1985,13 +1957,11 @@ msgid "excess command line argument `%s'"
msgstr "suvišni argument „%s“ na naredbenom retku"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Nije specificirana ulazna datoteka; pokušajte --help za više informacija."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Nije specificirana „dir“ datoteka; pokušajte --help za više informacija."
@@ -2012,25 +1982,25 @@ msgstr ""
msgid "no entries found for `%s'; nothing deleted"
msgstr "nema pronađenih stavki za „%s“; ništa nije izbrisano"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "nije (bilo) moguće otvoriti %s za pisanje: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"pomaknite svoju @contents naredbu ako želite vidjeti sadržaj nakon naslovne "
"stranice"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2038,289 +2008,244 @@ msgstr ""
"pomaknite svoju @shortcontents i @contents naredbe želi li prikaz sadržaja "
"nakon naslovne stranice"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s nije ispravan jeziÄni kÈd"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s nije ispravan kÈd regije"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s nije valjana mogućnost cijepanja"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "nije (bilo) moguće Äitati %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "greška pri zatvaranju @verbatiminclude datoteke %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: nije (bilo) moguće pronaći %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "nema Ävora koji treba preimenovati"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "Ävorovi bez novog imena na kraju datoteke"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "nije (bilo) moguće otvoriti %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "koriÅ¡tenje datoteke s preimenovanim Ävorovima („%s“) je zastarjela"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "nije (bilo) moguće zaštititi znak „ljestve“ (hash) u @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "prazno ime Ävora nakon Å¡irenja „%s“"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s „%s“ je prethodno definiran"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "ovdje je prethodna definicija kao @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "prazni argument u @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: izlaz nije kompatibilan s razdiobom"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "greška pri zatvaranju %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "nije (bilo) moguće napraviti direktorije „%s“ ili „%s“: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "nije (bilo) moguće napraviti direktorij „%s“: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image datoteka „%s“ nije pronađena, koristimo „%s“"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "nijedan argument nije specificiran za @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image datoteka „%s“ (za HTML) nije pronađena, koristimo „%s“"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "neobrađeni format %s nije pretvoren"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
"nije moguće otvoriti konfiguracijsku datoteku unakrsnih poveznica HTML-a %s: "
"%s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "nema vrste"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "neprepoznata vrsta: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr ""
"greška pri zatvaranju konfiguracijske datoteke unakrsnih poveznica HTML-a "
"%s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "string nije zatvoren u CSS datoteci"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include završava u komentaru"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import nije završen u CSS datoteci"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS datoteka %s nije pronađena"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "nije (bilo) moguće otvoriti --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "greška pri zatvaranju CSS datoteke %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "nije pronađena stavka htmlxref.cnf za „%s“"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "greška pri zatvaranju datoteke okvira %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "greška pri zatvaranju datoteke TOC okvira %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "greška manipulatora %s faze %s prioriteta %s"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "morate navesti naslov naredbom naslova ili @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "greÅ¡ka pri zatvaranju %s (datoteka s preusmjernicama za Ävorove): %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "staro ime za „%s“ je Ävor dokumenta"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "datoteka je prazna za preimenovani Ävor „%s“"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "odrediÅ¡ni Ävor (novo ime za „%s“) nije u dokumentu: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"greÅ¡ka pri zatvaranju %s (datoteka s preusmjernicama od preimovanih Ävorova: "
-"%s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "prazno ime Ävora"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "sintaksa za vanjski Ävor upotrebljena je za „%s“"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "dokument bez Ävorova"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "dokument nema najviÅ¡i (Top) Ävor"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "preimenovanje %s nije uspjelo: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s izvršen je više od jedanput: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s je izvan svih Ävorova"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "@node -- ime ne smije sadržavati „,“: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Stavka u indeksu @%s s(a) : proizvela je nevaljani Info: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "stavka za indeks „%s“ je izvan svih Ävorova"
# tekstualna datoteka slike ili datoteka teksta slike? (TK)
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "greška pri zatvaranju %s (datoteka s tekstualnim opisom slike): %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "nije moguće proÄitati @image datoteku „%s“: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
"nije (bilo) moguće naći ni @image datoteku „%s.txt“ ni alternativni tekst"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2328,301 +2253,327 @@ msgstr ""
"@strong{Bilješka...} proizvodi lažnu Info unakrsnu poveznicu; odaberite "
"drugaÄiju rijeÄ da to izbjegnete"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "@%s -- unakrsna poveznica ne smije sadržavati „:“"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "@%s -- ime Ävora ne smije sadržavati „%s“"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "@%s -- ime Ävora ne smije sadržavati „:“"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "„.“ ili „,“ mora slijediti @xref, a ne %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "„.“ ili „,“ mora slijediti @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "ime Ävora u stavki menÄ«ja ne smije sadržavati „%s“"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "ime Ävora u stavki menÄ«ja ne smije sadržavati „:“"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "ime stavke u menīju ne smije sadržavati „:“"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "nije (bilo) moguće otvoriti %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "višestruki @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "nevaljani ili prazni formalni argument @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "loša sintaksa argumenta @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s zahtijeva ime"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "loše ime za @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s je nađen ispred zatvorene zagrade od @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s je nađen ispred zatvorene zagrade od @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s nema zatvorene zagrade"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s nema zavrÅ¡nih graniÄnika: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx ne smije zapoÄeti @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx mora slijediti @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s ima tekst, ali nema @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "„@end“ oÄekuje „%s“, ali naÄ‘en je „%s“"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s je nađen prije @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "nema odgovarajućeg „%cend %s“"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "krivo mjesto za %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "nespareni „%c%s“"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "makro naredba „%s“ je pokrenuta s previše argumenata"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s nema zatvorene zagrade"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "makro „%s“ je deklariran bez argumenata a pokrenut je s argumentom"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "nakon širenja „\\“ u @%s slijedi „%s“ umjesto imena parametra ili „\\“"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "nema imena za @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "nema kategorije za @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "neoÄekivani argument u @%s retku: %s"
# ? (TK)
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "prazna multi-tablica"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "suvišni argument za @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "nevaljani argument za @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s zahtijeva argument: formater za %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"naredba @%s koja ne prihvaća argument u zagradama ne smije biti u @%s retku"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "dijakritiÄka naredba „@%s“ nije dopuÅ¡tena kao @%s argument"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s nema argumenta"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "nepoznato @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "suvišni argument za @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "loši argument za @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: nije (bilo) moguće otvoriti %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "kodiranje „%s“ nije kanonsko texinfo kodiranje"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "neprepoznati naziv kodiranja „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s nakon prvog elementa"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s ima smisla samo u retku @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@%s should not be associated with @top"
+msgid "@part should not be associated with @top"
+msgstr "@%s ne bi trebao biti povezan s @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node prethodi @%s, ali dijelovi možda nisu povezani sa Ävorovima"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "sintaksa za vanjski Ävor upotrebljena je za „%s“"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "prazno ime stavke menīja u „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "prazno ime Ävora u stavci menÄ«ja"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s ne se smije pojaviti u @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s se smije pojaviti samo na poÄetku retka"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro naredba „%s“ je već ranije definirana"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ovdje je ranija definicija „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "iznova se definira naredba jezika Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s bez pridruženog znaka"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s definiran s nula ili više od jednog argumenata treba pokrenuti s {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2630,347 +2581,360 @@ msgstr ""
"makro poziv je preduboko ugniježđen (postavite MAX_NESTED_MACROS na potrebnu "
"vrijednost; aktualna vrijednost je %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"nije dopušteno rekurzivno pozivanje makro naredbe %s; koristite po potrebi "
"@rmacro"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "bjelina ne smije slijediti dijakritiÄku naredbu „@%s“"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr ""
"koristite vitiÄaste zagrade za specifikaciju naredbe kao argument za @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s oÄekuje „i“ ili „j“ kao argument, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "novi redak ne smije slijediti dijakritiÄku naredbu „@%s“"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s oÄekuje vitiÄaste zagrade"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "nepoznata naredba „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "nedefinirana zastavica: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "loša sintaksa za @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s je zastarjela"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s je zastarjela; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s se smije pojaviti samo na poÄetku retka"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s se smije pojaviti samo u zaglavlju ili podnožju"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s nema smisla unutar „@%s“ bloka"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s u praznoj multi-tablici"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab prije @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "previše stupaca u stavci multi-tablice (maksimum je %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignorira se @tab izvan multi-tablice"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s izvan tablice ili popisa"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s nije dopušten unutar „@%s“ bloka"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s se smije pojaviti samo u stavkama indeksa"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "mora biti nakon „@%s“ da koristite „@%s“"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s nema smisla izvan okružja „@titlepage“ i „@quotation“"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory nakon prvog Ävora"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "podruÄje %s nije dopuÅ¡teno unutar podruÄja %s"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry nakon prvog Ävora"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu nije u valjanom kontekstu"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s je nađen prije prvog @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "možda vaÅ¡ @top Ävor treba biti unutar @ifnottex umjesto @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s se smije pojaviti samo u stavkama indeksa"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s se smije pojaviti samo u matematiÄkom kontekstu"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "neoÄekivani @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s nema smisla izvan okružja „@float“"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s mora biti odmah ispod „@float“"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "ignorira se višestruki @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "naredba @%s ne prihvaća argumente"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "za naredbu @%s nema Ävora ili argumenta vanjskog priruÄnika"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "prazno ime unakrsne poveznice u @%s nakon širenja „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "prazan naslov unakrsne poveznice u @%s nakon širenja „%s“"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image nema, a treba kao argument ime datoteke"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s nema prvog argumenta"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "neheksadecimalne (non-hex) znamenke u argumentu za @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "manje od Äetiri heksadecimalne znamenke u argumentu za @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "argument za @U je veći od unikodnog (Unicode) maksimuma 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "suviÅ¡ni argumenti za Ävor"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "oÄekivan je @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s treba prihvatiti samo @-naredbu kao argument, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "preostali argumenti u @%s retku: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "naredba okoline %s kao argument za @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "prazni @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "dio stupca nije broj: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp argument mora biti broj, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "rezervirano ime indeksa %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "nepoznati izvor indeksa u @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "nepoznato odredište indeksa u @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s uzrokuje spajanje od %s u samog sebe; ignorira se"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "nepoznati indeks „%s“ u @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "printanje indeksa „%s“ spojenog s drugim, „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "naredba za ispis prije poÄetka dokumenta: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "@%s argument mora biti „top“ ili „bottom“, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "S(a) @%s je moguće samo 10 ili 11, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "@%s argument mora biti „separate“ ili „end“, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s argument mora biti „on“, „off“ ili „odd“, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"@paragraphindent argument mora biti: broj, „none“ ili „asis“, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"@firstparagraphindent argument mora biti: „none“ ili „insert“, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "@exampleindent argument mora biti: broj ili „asis“, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "oÄekivan je @%s on ili off, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"@kbdinputstyle argument mora biti: „code“, „example“ ili „distinct“, a ne "
"„%s“"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "@allowcodebreaks argument mora biti: „true“ ili „false“, a ne „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"@urefbreakstyle argument mora biti: „after“, „before“ ili „none“, a ne „%s“"
@@ -3000,7 +2964,7 @@ msgstr "nema naredbe za odlomke pridružene @%s"
msgid "@%s not empty"
msgstr "@%s nije prazan"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s upućuje na nepostojeći Ävor „%s“"
@@ -3010,105 +2974,105 @@ msgstr "%s upućuje na nepostojeći Ävor „%s“"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s ime stavke Ävora „%s“ je razliÄito od %s imena „%s“"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "na Ävoru „%s“ nema poveznice (referencije)"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "Ävor „%s“ je %s za „%s“ u odlomcima, ali ne u menÄ«ju"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "Ävor %s „%s“ u menÄ«ju „%s“ i u odlomcima „%s“ se razlikuje"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "Ävor „%s“ je %s za „%s“ u menÄ«ju, ali ne u odlomcima"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s pokazivaÄ â€ž%s“ (za Ävor „%s“) razlikuje se od %s imena „%s“"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s upućuje na nepostojeći „%s“"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Ävor „%s“ ne sadrži stavku menÄ«ja „%s“ iako je njegov „Up“ cilj"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "za „%s“, gore (up) u menÄ«ju „%s“ i gore (up) „%s“ su razliÄiti"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s na „%s“, razliÄito od %s imena „%s“"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "prazni kljuÄ indeksa u @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: nije (bilo) moguće otvoriti %s za pisanje: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: greška pri zatvaranju %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: nije (bilo) moguće otvoriti latex datoteku %s za pisanje: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: L2H_TMP direktorij sadrži toÄku"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: aktualni direktorij sadrži toÄku"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: naredba nije uspjela: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: slika ima nevaljani sufiks: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: preimenovanje %s u %s nije uspjelo: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: nije (bilo) moguće otvoriti %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: završetak @%s stavke %d nije pronađen"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3117,12 +3081,12 @@ msgstr ""
"latex2html.pm: obrada je napravila %d elemenata u HTML-u; oÄekivano je %d, "
"koliko ih je pronađeno u dokumentu"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: nije (bilo) moguće odrediti fragment %d za @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3131,47 +3095,47 @@ msgstr ""
"l2h: nije (bilo) moguće izdvojiti fragment %d za @%s izlaznim brojilom %d iz "
"HTML-a"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: nije (bilo) moguće uÄitati %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: nije (bilo) moguće otvoriti %s za pisanje: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: nije (bilo) moguće otvoriti %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: promjena direktorija na %s nije uspjela: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: nije moguće vratiti se u poÄetni direktorij: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: nema izlazne datoteke: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: naredba nije uspjela: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: završetak @%s stavke %d nije pronađen"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3180,12 +3144,12 @@ msgstr ""
"tex4ht.pm: obrada je napravila %d elemenata u HTML-u; oÄekivano je %d, "
"koliko ih je pronađeno u dokumentu za @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: izlaz nema element HTML za @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3194,37 +3158,37 @@ msgstr ""
"tex4ht.pm: obrada je dohvatila %d elemenata u HTML-u; oÄekivano je %d, "
"koliko ih je pronađeno u dokumentu za @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "greÅ¡ka pri uÄitavanju %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: nepoznata varijabla %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: nepoznata varijabla %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "nije (bilo) moguće Äitati inicijalizacijsku datoteku %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "ignorira se neprepoznata vrijednost „%s“ za TEXINFO_OUTPUT_FORMAT\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uporaba: %s [OPCIJA]... TEXINFO-DATOTEKA...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3239,7 +3203,7 @@ msgstr ""
"Taj program se normalno instalira kao „makeinfo“ i „texi2any“;\n"
"ponaÅ¡anje im je identiÄno i ne ovisi o instaliranom imenu.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3277,7 +3241,7 @@ msgstr ""
" -v, --verbose objašnjava što se izvršava\n"
" --version informacije o inaÄici ovog programa\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3297,7 +3261,7 @@ msgstr ""
"nakon\n"
" Å¡to provjerite valjanost TEXINFO-DATOTEKE\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3345,7 +3309,7 @@ msgstr ""
" spremi izlazne datoteke;\n"
" InaÄe, ODREDIÅ TE je ime izlazne datoteke\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3383,7 +3347,7 @@ msgstr ""
"uvlaku\n"
" --split-size=BROJ cijepa datoteke na veliÄinu BROJ (zadano: %d)\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3409,7 +3373,7 @@ msgstr ""
" --node-files napravi datoteke preusmjeravanja za Ävorove i\n"
" sidra; zadano samo pri cijepanju\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3417,7 +3381,7 @@ msgstr ""
"Opcije za XML i Docbook:\n"
" --output-indent=VAL nema efekta, zadržano zbog kompatibilnosti\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3426,7 +3390,7 @@ msgstr ""
" --Xopt=OPCIJA proslijedi OPCIJU na texi2dvi; može se "
"ponoviti\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3447,7 +3411,7 @@ msgstr ""
" pretraživanja\n"
" -U VAR briše definiciju varijable VAR, kao s @clear\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3484,7 +3448,7 @@ msgstr ""
" Osim toga, opcije --no-ifFORMAT, također obrađuju odgovarajući\n"
" @ifnotFORMAT tekst.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3501,7 +3465,7 @@ msgstr ""
"iskljuÄeni;\n"
" ako stvaramo XML, --ifxml je ukljuÄen, a ostali su iskljuÄeni.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3534,66 +3498,66 @@ msgstr ""
" makeinfo --no-split foo.texi jedna Info-datoteka bez obzira na "
"veliÄinu\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style argument mora biti: „separate“ ili „end“, a ne „%s“\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent argument mora biti: broj, „none“ ili „asis“, a ne "
"„%s“\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: pri stvaranju %s, opcijom -o smije se navesti samo jedna ulazna "
"DATOTEKA\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "--Xopt opcija bez printanog izlaza"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "nepoznata transformacija stabla %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "cijepanje za format %s se ignorira"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: nema datoteÄnog argumenta.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pokušajte s „%s --help“ za više informacija.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"fill_gaps_in_sectioning transformacija ne vraća rezultat. Nema odlomka?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "greška pri zatvaranju %s, datoteke s makro širenjem: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "nije (bilo) moguće otvoriti %s za pisanje: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3601,21 +3565,322 @@ msgstr ""
"insert_nodes_for_sectioning_commands transformacija ne vraća rezultat. Nema "
"odlomka?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: greška pri zatvaranju %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: greška pri zatvaranju datoteke internih poveznica %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: nije (bilo) moguće otvoriti %s za pisanje: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "nema odgovarajućeg „%cend %s“"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "krivo mjesto za %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "nespareni „%c%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s zahtijeva ime"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "loše ime za @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s zahtijeva ime"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "loše ime za @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s zahtijeva ime"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "loše ime za @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept an @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s treba prihvatiti samo @-naredbu kao argument, a ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "naredba okoline %s kao argument za @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "nevaljani argument za @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "nevaljani argument za @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "prazni argument u @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "loši argument za @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "S(a) @%s je moguće samo 10 ili 11, a ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: --footnote-style argument mora biti: „separate“ ili „end“, a ne „%s“\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "@%s argument mora biti „on“, „off“ ili „odd“, a ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "loši argument za @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"@firstparagraphindent argument mora biti: „none“ ili „insert“, a ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "loši argument za @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s zahtijeva argument: formater za %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "nespareni „%c%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "suvišni argument za @%s %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "loši argument za @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: nije (bilo) moguće pronaći %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: nije (bilo) moguće otvoriti %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "@%s nakon prvog elementa"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s ima smisla samo u retku @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node prethodi @%s, ali dijelovi možda nisu povezani sa Ävorovima"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s nema smisla unutar „@%s“ bloka"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s nije dopušten unutar „@%s“ bloka"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in an index entry"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s se smije pojaviti samo u stavkama indeksa"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s nema smisla izvan okružja „@titlepage“ i „@quotation“"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s zahtijeva ime"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "nevaljani ili prazni formalni argument @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s oÄekuje „i“ ili „j“ kao argument, a ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "nedefinirana zastavica: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s je zastarjela"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s je zastarjela; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s se smije pojaviti samo u matematiÄkom kontekstu"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s bez pridruženog znaka"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s oÄekuje „i“ ili „j“ kao argument, a ne „%s“"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "krivo mjesto za %c"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "nema Ävora koji treba preimenovati"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "Ävorovi bez novog imena na kraju datoteke"
+
+#, perl-format
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr "koriÅ¡tenje datoteke s preimenovanim Ävorovima („%s“) je zastarjela"
+
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "staro ime za „%s“ je Ävor dokumenta"
+
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "datoteka je prazna za preimenovani Ävor „%s“"
+
+#, perl-format
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "odrediÅ¡ni Ävor (novo ime za „%s“) nije u dokumentu: %s"
+
+#, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "greška pri zatvaranju %s (datoteka s preusmjernicama od preimovanih "
+#~ "Ävorova: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "prazno ime Ävora"
+
#~ msgid "can't open %s: %s"
#~ msgstr "nije moguće otvoriti %s: %s"
@@ -3631,9 +3896,6 @@ msgstr "%s: nije (bilo) moguće otvoriti %s za pisanje: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Zastarjela varijabla %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s ne bi trebao biti povezan s @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: zastarjela varijabla %s\n"
diff --git a/macros/texinfo/texinfo/po/hu.gmo b/macros/texinfo/texinfo/po/hu.gmo
index 6146e86f94..28be28ed47 100644
--- a/macros/texinfo/texinfo/po/hu.gmo
+++ b/macros/texinfo/texinfo/po/hu.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/hu.po b/macros/texinfo/texinfo/po/hu.po
index b99f915bd7..28a5cfb1ba 100644
--- a/macros/texinfo/texinfo/po/hu.po
+++ b/macros/texinfo/texinfo/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 4.7.x\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2006-02-18 16:00+0100\n"
"Last-Translator: Máté LABÃDI <labadimate@freemail.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -23,36 +23,43 @@ msgstr ""
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: „%s“ opció félreérthető\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: „%s“ opció félreérthető\n"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: ismeretlen opció „%c%s“\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: Opció „%c%s“ nem fogad argumentumot\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: Option „%s“ argumentumot vár\n"
#: gnulib/lib/getopt.c:621
#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
msgid "%s: invalid option -- '%c'\n"
msgstr "%s: érvénytelen opció -- %c\n"
#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:682
#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: Az opció egy argumentumot vár -- %c\n"
@@ -70,11 +77,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:144
#, fuzzy
+#| msgid "invalid encoded character `%s'"
msgid "Invalid collation character"
msgstr "érvénytelen kódolt karakter: „%s“"
#: gnulib/lib/regcomp.c:147
#, fuzzy
+#| msgid "unlikely character %c in @var"
msgid "Invalid character class name"
msgstr "nem kedvelt karakter %c a @var-ban"
@@ -92,11 +101,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:159
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ( or \\("
msgstr "Pár nélküli }"
#: gnulib/lib/regcomp.c:162
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched \\{"
msgstr "Pár nélküli }"
@@ -126,12 +137,14 @@ msgstr ""
#: gnulib/lib/regcomp.c:183
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ) or \\)"
msgstr "Pár nélküli }"
# keresési feltétel / keresési szöveg / keresett szöveg ? LM
#: gnulib/lib/regcomp.c:676
#, fuzzy
+#| msgid "No previous search string"
msgid "No previous regular expression"
msgstr "Nincs korábbi keresési feltétel"
@@ -238,6 +251,7 @@ msgstr "Egyszerű kiegészítés"
#: info/echo-area.c:1049
#, fuzzy, c-format
+#| msgid "%d completions:\n"
msgid "%d completion:\n"
msgid_plural "%d completions:\n"
msgstr[0] "%d kiegészítés:\n"
@@ -248,7 +262,6 @@ msgid "Insert completion"
msgstr "Kiegészítés beszúrása"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Kiegészítések felépítése ..."
@@ -263,16 +276,17 @@ msgstr ""
#: info/filesys.c:150
#, fuzzy, c-format
+#| msgid "Making %s file `%s' from `%s'.\n"
msgid "looking for file %s in %s"
msgstr "%s fájl („%s“) készítése „%s“-ból.\n"
#: info/filesys.c:236 info/filesys.c:250 info/filesys.c:271
#, fuzzy, c-format
+#| msgid "Find file: "
msgid "found file %s"
msgstr "Fájl keresése: "
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "A lábjegyzetek nem jeleníthetők meg"
@@ -285,7 +299,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Lábjegyzetek ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Tárgymutatóbejegyzések keresése..."
@@ -294,7 +307,8 @@ msgid "Look up a string in the index for this file"
msgstr "Szöveg keresése a fájl tárgymutatójában"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "Nincs tárgymutató."
@@ -303,40 +317,47 @@ msgid "Index entry: "
msgstr "Tárgymutatóbejegyzés: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Nincs tárgymutató."
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr ""
"„%s“ szerepel ebben: %s . (következő keresés „\\[next-index-match]“ alapján.)"
#: info/indices.c:446
#, fuzzy
+#| msgid ""
+#| "Go to the next matching index item from the last `\\[index-search]' "
+#| "command"
msgid ""
"Go to the next matching index item from the last '\\[index-search]' command"
msgstr ""
"Ugrás az előbbi „\\[index-search]“ paranccsal talált tárgymutató bejegyzéshez"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "Nincs korábbi keresési feltétel"
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No more index entries containing '%s'"
msgstr "Nincs %stárgymutató-bejegyzés, ami „%s!H-t tartalmazná."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No index entries containing '%s'"
msgstr "Nincs %stárgymutató-bejegyzés, ami „%s!H-t tartalmazná."
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of `%s'..."
msgid "Scanning indices of '%s'..."
msgstr "„%s“ tárgymutatóinak átnézése..."
@@ -348,11 +369,13 @@ msgstr ""
#: info/indices.c:654 info/indices.c:656
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index apropos"
msgstr "Tárgymutató apropók:"
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "Index entries containing '%s':\n"
msgstr "Nincs %stárgymutató-bejegyzés, ami „%s!H-t tartalmazná."
@@ -371,36 +394,39 @@ msgstr ""
#: info/indices.c:889 info/indices.c:891
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index topic"
msgstr "Tárgymutató apropók:"
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No index entries containing '%s'."
msgstr "Nincs %stárgymutató-bejegyzés, ami „%s!H-t tartalmazná."
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have `%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "Nincs elérhető fájl, amely tárgymutatója tartalmazná „%s“-t."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "Nincs „%s“ menüelem a(z) „%s“ oldalon."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr "A(z) „%s“ oldal nem található."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -421,6 +447,7 @@ msgstr ""
#: info/info.c:828 info/infokey.c:560
#, fuzzy, c-format
+#| msgid "Set the value of an Info variable"
msgid "value %s is not valid for variable %s"
msgstr "Egy Info változó beállítása"
@@ -429,7 +456,7 @@ msgstr "Egy Info változó beállítása"
msgid "Try --help for more information.\n"
msgstr "A --help több információt ad.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -441,6 +468,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "Nincs tárgymutató ehhez: %s\n"
@@ -518,8 +546,13 @@ msgid ""
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Email bug reports to bug-texinfo@gnu.org,\n"
+#| "general questions and discussion to help-texinfo@gnu.org.\n"
+#| "Texinfo home page: http://www.gnu.org/software/texinfo/"
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -533,6 +566,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "A(z) „(%s)%s“ oldal nem található."
@@ -547,6 +581,7 @@ msgstr "A pont nem jelenik meg az ablakon látható oldalon!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "Az utolsó ablak nem törölhető!"
@@ -554,6 +589,7 @@ msgstr "Az utolsó ablak nem törölhető!"
# vagy csak pont? sas
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "Nincs menü ezen az oldalon."
@@ -561,6 +597,7 @@ msgstr "Nincs menü ezen az oldalon."
# vagy csak pont? sas
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "Nincs lábjegyezet ezen az oldalon."
@@ -568,16 +605,19 @@ msgstr "Nincs lábjegyezet ezen az oldalon."
# vagy csak pont? sas
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "Ez az oldal nem tartalmaz kereszthivatkozást."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "Nincs „%s“ utalás ezen az oldalon."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "Ismeretlen Info parancs: „%c“. A „?“ súg."
@@ -585,6 +625,7 @@ msgstr "Ismeretlen Info parancs: „%c“. A „?“ súg."
# sztem fejlett: sas
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "A „%s“ termináltípus nem elég fejlett az Info futtatásához."
@@ -592,6 +633,7 @@ msgstr "A „%s“ termináltípus nem elég fejlett az Info futtatásához."
# talán egy kicsit jobb a magázás itt, de ahogy tetszik, de 1séges legyen - sas
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "Ön már az oldal utolsó lapját látja."
@@ -599,11 +641,13 @@ msgstr "Ön már az oldal utolsó lapját látja."
# talán egy kicsit jobb a magázás itt, de ahogy tetszik, de 1séges legyen - sas
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "Ön már az oldal legelső lapját látja."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "Csak egy ablak."
@@ -613,6 +657,7 @@ msgstr "Csak egy ablak."
# LM
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "Az eredményablak túl kicsi lenne."
@@ -620,6 +665,7 @@ msgstr "Az eredményablak túl kicsi lenne."
# ha lehet, legjobb elkerülni, például be kell zárni egy ablakot, amúgy itt: talán egy kicsit jobb a magázás, de ahogy tetszik, de 1séges legyen - sas
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr "Nincs elég hely súgóablakhoz, kérem zárjon be egy ablakot!."
@@ -629,6 +675,7 @@ msgstr ""
#: info/infodoc.c:40
#, fuzzy
+#| msgid "\\%-10[quit-help] Quit this help.\n"
msgid "\\%-10[quit-help] Close this help window.\n"
msgstr "\\%-10[quit-help] Kilépés e súgóból. \n"
@@ -647,6 +694,7 @@ msgstr "\\%-10[get-info-help-node] Az Info bevezető indítása\n"
# hátra / felfele ? LM
#: info/infodoc.c:44
#, fuzzy
+#| msgid "\\%-10[prev-line] Scroll backward 1 line.\n"
msgid "\\%-10[prev-line] Move up one line.\n"
msgstr "\\%-10[prev-line] Görgetés 1 sorral hátra.\n"
@@ -654,18 +702,21 @@ msgstr "\\%-10[prev-line] Görgetés 1 sorral hátra.\n"
# előre - sas
#: info/infodoc.c:45
#, fuzzy
+#| msgid "\\%-10[next-line] Scroll forward 1 line.\n"
msgid "\\%-10[next-line] Move down one line.\n"
msgstr "\\%-10[next-line] Görgetés 1 sorral előre.\n"
# hátra / felfele ? LM
#: info/infodoc.c:46
#, fuzzy
+#| msgid "\\%-10[scroll-backward] Scroll backward a page.\n"
msgid "\\%-10[scroll-backward] Scroll backward one screenful.\n"
msgstr "\\%-10[scroll-backward] Görgetés egy oldalt hátra.\n"
# előre / lefele ? LM
#: info/infodoc.c:47
#, fuzzy
+#| msgid "\\%-10[scroll-forward] Scroll forward a page.\n"
msgid "\\%-10[scroll-forward] Scroll forward one screenful.\n"
msgstr "\\%-10[scroll-forward] Görgetés egy oldalt előre.\n"
@@ -687,6 +738,9 @@ msgstr ""
#: info/infodoc.c:52
#, fuzzy
+#| msgid ""
+#| "\\%-10[select-reference-this-line] Follow the hypertext link under "
+#| "cursor.\n"
msgid ""
"\\%-10[select-reference-this-line] Follow the hypertext link under the "
"cursor.\n"
@@ -696,6 +750,7 @@ msgstr ""
#: info/infodoc.c:53
#, fuzzy
+#| msgid "\\%-10[history-node] Move to the last node seen in this window.\n"
msgid "\\%-10[history-node] Go back to the last node seen in this window.\n"
msgstr ""
"\\%-10[history-node] Ugrás az ebben az ablakban utoljára látott oldalra.\n"
@@ -703,40 +758,47 @@ msgstr ""
# ATNEZNI LM
#: info/infodoc.c:55
#, fuzzy
+#| msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n"
msgid "\\%-10[global-prev-node] Go to the previous node in the document.\n"
msgstr "\\%-10[prev-node] Ugrás az előző oldalra.\n"
# ATNEZNI LM
#: info/infodoc.c:56
#, fuzzy
+#| msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n"
msgid "\\%-10[global-next-node] Go to the next node in the document.\n"
msgstr "\\%-10[next-node] Ugrás a következő oldalra.\n"
# ATNEZNI LM
#: info/infodoc.c:57
#, fuzzy
+#| msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n"
msgid "\\%-10[prev-node] Go to the previous node on this level.\n"
msgstr "\\%-10[prev-node] Ugrás az előző oldalra.\n"
# ATNEZNI LM
#: info/infodoc.c:58
#, fuzzy
+#| msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n"
msgid "\\%-10[next-node] Go to the next node on this level.\n"
msgstr "\\%-10[next-node] Ugrás a következő oldalra.\n"
# ATNEZNI LM
#: info/infodoc.c:59
#, fuzzy
+#| msgid "\\%-10[up-node] Move \"up\" from this node.\n"
msgid "\\%-10[up-node] Go up one level.\n"
msgstr "\\%-10[up-node] Ugrás a szülőoldalra.\n"
#: info/infodoc.c:60
#, fuzzy
+#| msgid "\\%-10[end-of-node] Go to the end of this node.\n"
msgid "\\%-10[top-node] Go to the top node of this document.\n"
msgstr "\\%-10[end-of-node] Ugrás az oldal végéhez.\n"
#: info/infodoc.c:61
#, fuzzy
+#| msgid "\\%-10[end-of-node] Go to the end of this node.\n"
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
msgstr "\\%-10[end-of-node] Ugrás az oldal végéhez.\n"
@@ -756,11 +818,14 @@ msgstr ""
#: info/infodoc.c:65
#, fuzzy
+#| msgid " %-10s Pick menu item specified by name.\n"
msgid "\\%-10[menu-item] Pick a menu item specified by name.\n"
msgstr " %-10s Menüelem kiválasztása névvel.\n"
#: info/infodoc.c:66
#, fuzzy
+#| msgid ""
+#| "\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n"
msgid "\\%-10[xref-item] Follow a cross reference specified by name.\n"
msgstr ""
"\\%-10[xref-item] Kereszthivatkozás követése. A hivatkozás nevének "
@@ -768,11 +833,13 @@ msgstr ""
#: info/infodoc.c:67
#, fuzzy
+#| msgid " %-10s Move to node specified by name.\n"
msgid "\\%-10[goto-node] Go to a node specified by name.\n"
msgstr " %-10s Ugrás egy névvel megadott oldalra\n"
#: info/infodoc.c:69
#, fuzzy
+#| msgid " %-10s Search backward for a specified string\n"
msgid "\\%-10[search] Search forward for a specified string.\n"
msgstr " %-10s Adott szöveg keresése visszafele\n"
@@ -786,6 +853,11 @@ msgstr ""
#: info/infodoc.c:72
#, fuzzy
+#| msgid ""
+#| "\\%-10[index-search] Search for a specified string in the index entries "
+#| "of this Info\n"
+#| " file, and select the node referenced by the first entry "
+#| "found.\n"
msgid ""
"\\%-10[index-search] Search for a specified string in the index, and\n"
" select the node referenced by the first entry found.\n"
@@ -799,11 +871,13 @@ msgstr ""
#: info/infodoc.c:76
#, fuzzy
+#| msgid "Cancel current operation"
msgid "\\%-10[abort-key] Cancel the current operation.\n"
msgstr "Jelen művelet törlése"
#: info/infodoc.c:195
#, fuzzy, c-format
+#| msgid "This is %s, produced by makeinfo version %s from %s.\n"
msgid "This is GNU Info version %s. "
msgstr "Ez itt %s, ami a makeinfo %s verziójával (%s) lett generálva.\n"
@@ -851,6 +925,7 @@ msgstr "Súgó szöveg megjelenítése"
# node = oldal ? LM
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "Info oldal „(info)Help“ meglátogatása"
@@ -869,6 +944,7 @@ msgstr "Leíró billentyű: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s nincs definiálva."
@@ -886,45 +962,47 @@ msgstr "Hol van a parancs: "
# sztem itt billentyű - sas
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "„%s“ egy billyentyűn sincs"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s csak %s-n át hívható meg."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s meghívható %s-n keresztül."
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr "Nincs „%s“ nevű függvény"
#: info/infomap.c:585
#, fuzzy, c-format
+#| msgid "cannot open input file `%s'"
msgid "could not open init file %s"
msgstr "a(z) „%s“ input fájl nem nyitható meg."
# key sequence = billentyűkombináció ? LM
# valsz inkább egymás után leütendő billentyűsorozoat - sas
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "a billentyűkombináció túl hosszú"
# key sequence = billentyűkombináció ? LM
# lehet, hogy inkább egymás után leütendő billentyűsorozoat - sas
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "hiányzó billentyűkombináció "
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "A NUL karakter (\\000) tilos"
@@ -936,14 +1014,14 @@ msgstr "A NUL karakter (^%c) tilos"
# action=művelet ? LM
# általában az - sas
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "hiányzó műveletnév"
# key sequence = billentyűkombináció ? LM
# valsz inkább egymás után leütendő billentyűsorozoat - sas
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "key sequence too long"
msgid "cannot bind key sequence to menu-digit"
msgstr "a billentyűkombináció túl hosszú"
@@ -955,7 +1033,6 @@ msgid "unknown action `%s'"
msgstr "ismeretlen művelet: „%s“."
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "túl hosszú műveletnév"
@@ -967,17 +1044,14 @@ msgid "extra characters following action `%s'"
msgstr "`%s' művelet utáni extra karakterek"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "hiányzó változónév"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "hiányzó „=“ jel közvetlen egy változónév után"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "túl hosszú változónév"
@@ -985,7 +1059,6 @@ msgstr "túl hosszú változónév"
# long = nagy ? LM
# nagy - kiváló fordítási stílus! - sas
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "túl nagy érték"
@@ -1008,7 +1081,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr ""
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr ""
@@ -1041,6 +1113,11 @@ msgstr "A(z) „%s“ fájl nem módosítható.\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -1093,7 +1170,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr ""
@@ -1102,6 +1178,9 @@ msgstr ""
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1249,6 +1328,7 @@ msgstr "A menüelem kiválasztása"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "Nincs %d elem e menüben."
@@ -1280,6 +1360,7 @@ msgstr "Kereszthiv követése: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "A hivatkozás eltünt! (%s)."
@@ -1314,6 +1395,7 @@ msgstr "A sorban megjelenő hivatkozás vagy menüelem kiválasztása"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr "Nincs menü a(z) „%s“ oldalon."
@@ -1321,6 +1403,7 @@ msgstr "Nincs menü a(z) „%s“ oldalon."
# lelem, találom, nincs - sas
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "Nincs a(z) „%s“ által hivatkozott oldal ebben: „%s“."
@@ -1360,12 +1443,14 @@ msgstr "A fájl első oldala kiválasztása"
# node=oldal ? LM
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "Nincs több oldal e dokumentumban."
# ATNEZNI LM
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "Nincs Előző vagy Fel lehetőség e ponthoz e dokumentumban."
@@ -1408,11 +1493,13 @@ msgstr "Kézikönyv oldal: "
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "Legfelső oldal kiválasztása e fájban"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "A „(dir)“ oldal kiválasztása"
@@ -1425,7 +1512,6 @@ msgid "Select the most recently selected node"
msgstr "A legutóbb választott oldal kiválasztása"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1441,21 +1527,25 @@ msgstr "Fájl keresése: "
# a mondatszerkezet miatt itt jó a nem található - sas
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr "„%s“ nem található."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr "A kimeneti fájl („%s“) nem hozható létre."
#: info/session.c:3727
#, fuzzy, c-format
+#| msgid "error writing to `%s'"
msgid "error writing to %s: %s"
msgstr "hiba „%s“ írásakor."
#: info/session.c:3736
#, fuzzy, c-format
+#| msgid "Removing %s\n"
msgid "closing %s"
msgstr "Törlés: %s\n"
@@ -1463,6 +1553,7 @@ msgstr "Törlés: %s\n"
# írás - sas
#: info/session.c:3785
#, fuzzy, c-format
+#| msgid "Writing node %s..."
msgid "writing node %s..."
msgstr "„%s“ oldal írása..."
@@ -1476,16 +1567,19 @@ msgstr "Ezen oldal tartalmának csőbe irányítása INFO_PRINT_COMMAND -al"
# semmiképen nem pipe - sas
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr "Nem hozható létre cső ehhez: „%s“."
#: info/session.c:3864
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "printing node %s..."
msgstr "%s oldal nyomtatása..."
#: info/session.c:3872
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "finished printing node %s"
msgstr "%s oldal nyomtatása..."
@@ -1494,12 +1588,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr ""
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr ""
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr ""
@@ -1509,6 +1601,7 @@ msgstr ""
#: info/session.c:4117
#, fuzzy
+#| msgid "Kill to the beginning of the line"
msgid "Search continued from the beginning of the document"
msgstr "Törlés a sor elejéig"
@@ -1519,14 +1612,16 @@ msgstr "Törlés a sor elejéig"
msgid "Searching subfile %s ..."
msgstr "„%s“ alállomány keresése..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "A keresés sikertelen volt."
# FORDITANI
#: info/session.c:4192
#, fuzzy, c-format
+#| msgid "%s%sfor string [%s]: "
msgid "%s%s%s [%s]: "
msgstr "%s%sa sztringhez [%s]: "
@@ -1541,11 +1636,13 @@ msgstr "Keresés"
# érzékenyen / érzékenység
#: info/session.c:4194 info/session.c:4200
#, fuzzy
+#| msgid " case-sensitively "
msgid " case-sensitively"
msgstr "kis/nagybetű érzékenyen"
#: info/session.c:4195 info/session.c:4201
#, fuzzy
+#| msgid "Search backward"
msgid " backward"
msgstr "Keresés felfelé"
@@ -1558,151 +1655,155 @@ msgstr ""
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr ""
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
# alállomány ? LM
# passz - sas
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "„%s“ alállomány keresése..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Szöveg beolvasása és keresése kis/nagybetű érzékenyen"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Szöveg beolvasása és keresése "
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Szöveg beolvasása és keresése fel"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Utolsó keresés ismétlése azonos irányba"
# keresési feltétel / keresési szöveg / keresett szöveg ? LM
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Nincs korábbi keresési feltétel"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Utolsó keresés ismétlése ellenirányban"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
# JAVITANI ?
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Egy szöveg interaktív keresése gépeléskor"
-#: info/session.c:4878
+#: info/session.c:4893
#, fuzzy
+#| msgid "I-search backward: "
msgid "Regexp I-search backward: "
msgstr "I.-keresés fel: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I.-keresés fel: "
-#: info/session.c:4881
+#: info/session.c:4896
#, fuzzy
+#| msgid "I-search: "
msgid "Regexp I-search: "
msgstr "I.-keresés: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I.-keresés: "
# checkit
# FORDITANI
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Sikertelen"
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Jelen művelet törlése"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Kilépés"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "kiírja a verzióinformációt és kilép"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Képernyő frissítése"
# rövidebb forma? Kilépés az Info-ból ? LM
# általában NAON.! fontos a RÖV.SÉG, de itt kivételesen szerintem maradhat ez - sas
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Az Info használatának befejezése"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "E karakter kisbetűs változatához rendelt parancs futtatása"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "Ismeretlen parancs (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" érvénytelen"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "`%s' is invalid"
msgid "'%s' is invalid"
msgstr "„%s“ érvénytelen"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Add hozzá ezt a számjegyet az aktuális numerikus argumentumhoz"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Start (vagy szorozd be 4-gyel) az aktuális numerikus argumentumot"
@@ -1754,6 +1855,8 @@ msgstr "„Be“ állapotban az Info elfogadja és kiírja az ISO Latin karakter
#: info/variables.c:111
#, fuzzy
+#| msgid ""
+#| "Controls what happens when scrolling is requested at the end of a node"
msgid ""
"What to do when a scrolling command is issued at the end of the last node"
msgstr "Vezérli, hogy mi történjen, ha a görgetés a lap alján történik"
@@ -1786,6 +1889,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "Ugrás a következő kereszthivatkozásra"
@@ -1846,6 +1950,7 @@ msgstr "%s: üres fájl"
#: install-info/install-info.c:291
#, fuzzy, c-format
+#| msgid " for %s"
msgid "%s for %s"
msgstr " ehhez: %s"
@@ -1856,6 +1961,7 @@ msgstr "\tAz opciók teljes listájához próbálja meg a „%s --help“ paranc
#: install-info/install-info.c:538
#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Használat: %s [OPCIÓK] ... TEXINFO-FÃJL...\n"
@@ -1974,16 +2080,15 @@ msgstr ""
#: install-info/install-info.c:663
#, fuzzy, c-format
+#| msgid "%s: could not read (%s) and could not create (%s)\n"
msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s:nem lehet beolvasni (%s) és nem lehet létrehozni (%s)\n"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY-nek nincs END-INFO-DIR-ENTRY párja"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY-nek nincsSTART-INFO-DIR-ENTRY párja"
@@ -2013,20 +2118,19 @@ msgid "excess command line argument `%s'"
msgstr "felesleges parancssori argumentum: „%s“"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Nem lett input fájl megadva; további információért próbálja meg a --help-t!"
# dir ? LM
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Nem lett dir fájl megadva; további információért próbálja meg a --help-t!"
#: install-info/install-info.c:2301
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not read %s."
msgstr "A kimeneti fájl („%s“) nem hozható létre."
@@ -2041,967 +2145,1051 @@ msgstr "nincs info dir bejegyzés „%s“-ben"
msgid "no entries found for `%s'; nothing deleted"
msgstr "„%s“-hez nem találtam bejegyzést; nincs mit törölni"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open %s for writing: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid language code"
msgstr "%s nem egy ISO 639 szabvány szerinti nyelvkód"
-#: tp/Texinfo/Common.pm:1157
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid region code"
msgstr "%s nem egy ISO 639 szabvány szerinti nyelvkód"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not read %s: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s: could not find %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, fuzzy, perl-format
-msgid "could not open %s: %s"
-msgstr "%s: A CSS fájl nem nyitható meg: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, fuzzy, perl-format
+#| msgid "macro `%s' previously defined"
msgid "@%s `%s' previously defined"
msgstr "a(z) „%s“ makró már korábban definiált lett"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, fuzzy, perl-format
+#| msgid "here is the previous definition of `%s'"
msgid "here is the previous definition as @%s"
msgstr "„%s“ korábbi definíciója"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "empty argument in @%s"
msgstr "Rossz argumentum ide: @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing %s: %s"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directories `%s' or `%s': %s"
msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directory `%s': %s"
msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, fuzzy, perl-format
+#| msgid "@image file `%s' unreadable: %s"
msgid "@image file `%s' not found, using `%s'"
msgstr "@image a(z) „%s“ fájl nem olvasható: %s"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
+#| msgid "No node name specified for `%c%s' command"
msgid "no argument specified for @U"
msgstr "A(z) „%c%s“ parancshoz nem lett oldalnév rendelve"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, fuzzy, perl-format
+#| msgid "@image file `%s' (for HTML) not readable: %s"
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image a(z) „%s“ fájl (HTML) nem olvasható: %s"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open html refs config file %s: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
# action=művelet ? LM
# általában az - sas
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
#, fuzzy
+#| msgid "missing action name"
msgid "missing type"
msgstr "hiányzó műveletnév"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, fuzzy, perl-format
+#| msgid "%s: unrecognized option `--%s'\n"
msgid "unrecognized type: %s"
msgstr "%s: ismeretlen opció „--%s“\n"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing html refs config file %s: %s"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
#, fuzzy
+#| msgid "%s:%d: --css-file ended in comment"
msgid "--css-include ended in comment"
msgstr "%s:%d: --css-file kommenttel végződik"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open --include-file %s: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing CSS file %s: %s"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, fuzzy, perl-format
+#| msgid "no index entries found for `%s'\n"
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "Nincs tárgymutató ehhez: %s\n"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing frame file %s: %s"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing TOC frame file %s: %s"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing redirection node file %s: %s"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-# ATNEZNI LM
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, fuzzy, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "Nincs Előző vagy Fel lehetőség e ponthoz e dokumentumban."
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, fuzzy, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "nem hivatkozott oldal „%s“"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
# node = csomópont? LM
# vagy csak pont? sas
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
#, fuzzy
+#| msgid "No menu in this node."
msgid "document without nodes"
msgstr "Nincs menü ezen az oldalon."
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, fuzzy, perl-format
+#| msgid "(outside of any node)"
msgid "@%s outside of any node"
msgstr "(az oldalakon kívül)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, fuzzy, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, fuzzy, c-format, perl-format
+#| msgid "Entry for index `%s' outside of any node"
msgid "entry for index `%s' outside of any node"
msgstr "A(z) „%s“ tárgymutató bejegyzése az oldalakon kívülre esik"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing image text file %s: %s"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image a(z) „%s“ fájl nem olvasható: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, fuzzy, perl-format
+#| msgid "No %sindex entries containing `%s'."
msgid "@%s node name should not contain `%s'"
msgstr "Nincs %stárgymutató-bejegyzés, ami „%s!H-t tartalmazná."
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:762
+#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "could not open %s: %s"
+msgstr "%s: A CSS fájl nem nyitható meg: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s egy nevet igényel"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad name for @%s"
msgstr "Rossz argumentum ide: @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s hiányzó kapcsos bezárójel"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "„@end“-t vártam „%s“, de „%s“-t találtam"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, fuzzy, perl-format
+#| msgid "No matching `%cend %s'"
msgid "no matching `%cend %s'"
msgstr "Nincs egyező „%cend %s“"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, fuzzy, perl-format
+#| msgid "Misplaced %c"
msgid "misplaced %c"
msgstr "Rossz helyen levő %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, fuzzy, perl-format
+#| msgid "Unmatched `%c%s'"
msgid "unmatched `%c%s'"
msgstr "Nem egyező „%c%s“"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' called with too many args"
msgstr "A(z) „%s“ makró túl sok argumentummal lett meghívva a %d sorban"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s missing close brace"
msgid "@%s missing closing brace"
msgstr "%c%s hiányzó kapcsos bezárójel"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' declared without argument called with an argument"
msgstr "A(z) „%s“ makró túl sok argumentummal lett meghívva a %d sorban"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
# action=művelet ? LM
# általában az - sas
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, fuzzy, c-format, perl-format
+#| msgid "missing action name"
msgid "missing name for @%s"
msgstr "hiányzó műveletnév"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "unexpected argument on @%s line: %s"
msgstr "Rossz argumentum ide: %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
#, fuzzy
+#| msgid "%s: empty file"
msgid "empty multitable"
msgstr "%s: üres fájl"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "superfluous argument to @%s"
msgstr "Rossz argumentum ide: @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad argument to @%s"
msgstr "Rossz argumentum ide: @%s"
# %citem ist ein Texinfo-Befehl
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s egy argumentumot igényel: %citem formázását"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, fuzzy, c-format, perl-format
+#| msgid "%s: option `--%s' doesn't allow an argument\n"
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "%s: Opció „--%s“ nem fogad argumentumot\n"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing argument"
msgstr "%s: hiányzó fájl argumentum.\n"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown @end %s"
msgstr "Ismeretlen tárgymutató „%s“"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, fuzzy, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "superfluous argument to @%s %s: %s"
msgstr "Rossz argumentum ide: %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "bad argument to @%s: %s"
msgstr "Rossz argumentum ide: %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s: could not open %s: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "ismeretlen kódolási név: „%s“"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, fuzzy, perl-format
+#| msgid "@%s not meaningful outside `@titlepage' environment"
msgid "@%s only meaningful on a @multitable line"
msgstr "A(z) @%s -nek nincs értelme a „@titlepage“ környezeten kívül"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, fuzzy, c-format, perl-format
+#| msgid "No menu in node `%s'."
msgid "empty menu entry name in `%s'"
msgstr "Nincs menü a(z) „%s“ oldalon."
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, fuzzy, c-format, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s should not appear in @%s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@end %s should only appear at the beginning of a line"
msgstr "Törlés a sor elejéig"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "a(z) „%s“ makró már korábban definiált lett"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "„%s“ korábbi definíciója"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, fuzzy, c-format, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "use braces to give a command as an argument to @%s"
msgstr "Kapcsos zárójelekkel egy parancsot is megadhat @%s argumentumaként"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, fuzzy, perl-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s „i“-t vagy „j“-t vár argumentumként, nem „%c“-t"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s expected braces"
msgid "@%s expected braces"
msgstr "%c%s kapcsos zárójelpárt vár"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown command `%s'"
msgid "unknown command `%s'"
msgstr "Ismeretlen parancs: „%s“"
# flag ? LM
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "ismeretlen flag: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete."
msgstr "%c%s elavult"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete; %s"
msgstr "%c%s elavult"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@%s should only appear at the beginning of a line"
msgstr "Törlés a sor elejéig"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s -nek nincs jelentése a(z) „@%s“ blokkon belül"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, fuzzy, c-format, perl-format
+#| msgid "%s: empty file"
msgid "@%s in empty multitable"
msgstr "%s: üres fájl"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, fuzzy, c-format, perl-format
+#| msgid "Too many columns in multitable item (max %d)"
msgid "too many columns in multitable item (max %d)"
msgstr "Túl sok oszlop szerepel a multitable elemben (max %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "figyelmen kívül hagyom a multitable-n kívül eső @tab-ot"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, fuzzy, perl-format
+#| msgid "@%s not meaningful inside `@%s' block"
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s -nek nincs jelentése a(z) „@%s“ blokkon belül"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, fuzzy, c-format, perl-format
+#| msgid "Must be in `@%s' environment to use `@%s'"
msgid "must be after `@%s' to use `@%s'"
msgstr "Csak a(z) „@%s“ környezetben használható a(z) „@%s“"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
"A(z) @%s -nek nincs értelme a „@titlepage“ és a „@quotation“ környezeten "
"kívül"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, fuzzy, c-format, perl-format
+#| msgid "Footnotes inside footnotes are not allowed"
msgid "region %s inside region %s is not allowed"
msgstr "Lábjegyzetben nem lehet lábjegyzet"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, fuzzy, c-format, perl-format
+#| msgid "@menu seen before first @node, creating `Top' node"
msgid "@%s seen before first @node"
msgstr ""
"@menu-t találtam az első @node előtt. Létrehozom a „Szülő“ (Top) oldalt"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "esetleg a @top oldalt @ifnottex-be kellene tenni, @ifinfo helyett"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
#, fuzzy
+#| msgid "Expected `%s'"
msgid "unexpected @"
msgstr "„%s“-t várok"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, fuzzy, c-format, perl-format
+#| msgid "@%s not meaningful outside `@float' environment"
msgid "@%s is not meaningful outside `@float' environment"
msgstr "A(z) @%s -nek nincs értelme a „@float“ környezeten kívül"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image hiányzó fájlnév argumentum"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing first argument"
msgstr "%s: hiányzó fájl argumentum.\n"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "non-hex digits in argument for @U: %s"
msgstr "Rossz argumentum ide: %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, fuzzy, c-format, perl-format
+#| msgid "Expected `%s'"
msgid "expected @end %s"
msgstr "„%s“-t várok"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "Kapcsos zárójelekkel egy parancsot is megadhat @%s argumentumaként"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "remaining argument on @%s line: %s"
msgstr "Rossz argumentum ide: %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "environment command %s as argument to @%s"
msgstr "Kapcsos zárójelekkel egy parancsot is megadhat @%s argumentumaként"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: a(z) %s argumentumának numerikusnak kell lennie, „%s“ helyett.\n"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown source index in @%s: %s"
msgstr "Ismeretlen tárgymutató „%s“"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s' in @printindex"
msgid "unknown index `%s' in @printindex"
msgstr "Ismeretlen tárgymutató „%s“ itt: @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: a(z) %s argumentumának numerikusnak kell lennie, „%s“ helyett.\n"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, fuzzy, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: a --footnote-style argumentumának „separate“-nek vagy „end“-nek kell "
"lennie, „%s“ helyett.\n"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, fuzzy, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: a(z) %s argumentumának numerikusnak kell lennie, „%s“ helyett.\n"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"%s: a --paragraph-indent argumentumának numerikusnak, „none“-nak vagy "
"„asis“-nek kell lennie, „%s“ helyett.\n"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, fuzzy, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: a --paragraph-indent argumentumának numerikusnak, „none“-nak vagy "
"„asis“-nek kell lennie, „%s“ helyett.\n"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: a --paragraph-indent argumentumának numerikusnak, „none“-nak vagy "
"„asis“-nek kell lennie, „%s“ helyett.\n"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, fuzzy, c-format, perl-format
+#| msgid "Expected @%s on or off, not `%s'"
msgid "expected @%s on or off, not `%s'"
msgstr "@%s on vagy off-t vártam, „%s“ helyett"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: a --footnote-style argumentumának „separate“-nek vagy „end“-nek kell "
"lennie, „%s“ helyett.\n"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: a --footnote-style argumentumának „separate“-nek vagy „end“-nek kell "
@@ -3032,8 +3220,10 @@ msgstr ""
msgid "@%s not empty"
msgstr ""
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, fuzzy, perl-format
+#| msgid ""
+#| "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s egy nem létező oldalra („%s“) hivatkozik (esetleg hibás szekcionálás?)"
@@ -3043,220 +3233,233 @@ msgstr ""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nem hivatkozott oldal „%s“"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, fuzzy, perl-format
+#| msgid "unreferenced node `%s'"
msgid "%s reference to nonexistent `%s'"
msgstr "nem hivatkozott oldal „%s“"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, fuzzy, perl-format
+#| msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"A(z) „%s“ oldal nem tartalmaz menüelemet „%s“-hez, bár ez uóbbi a szülője"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open %s: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not load %s: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open %s for writing: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "tex4ht.pm: could not open %s: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, fuzzy, perl-format
+#| msgid "error writing to `%s'"
msgid "error loading %s: %s\n"
msgstr "hiba „%s“ írásakor."
# action=művelet ? LM
# általában az - sas
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s"
msgstr "ismeretlen művelet: „%s“."
# action=művelet ? LM
# általában az - sas
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s\n"
msgstr "ismeretlen művelet: „%s“."
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
msgid "could not read init file %s"
msgstr "A kimeneti fájl („%s“) nem hozható létre."
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, fuzzy, perl-format
+#| msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr ""
"%s: Figyelmen kívül hagyom a fel nem ismert TEXINFO_OUTPUT_FORMAT értéket "
"(„%s“).\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Használat: %s [OPCIÓK] ... TEXINFO-FÃJL...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3265,7 +3468,7 @@ msgid ""
"the behavior is identical, and does not depend on the installed name.\n"
msgstr ""
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3284,8 +3487,14 @@ msgid ""
" --version display version information and exit.\n"
msgstr ""
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
+#| msgid ""
+#| "Output format selection (default is to produce Info):\n"
+#| " --docbook output Docbook XML rather than Info.\n"
+#| " --html output HTML rather than Info.\n"
+#| " --xml output Texinfo XML rather than Info.\n"
+#| " --plaintext output plain text rather than Info.\n"
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3301,7 +3510,7 @@ msgstr ""
" --xml Texinfo XML kimenet Info helyett\n"
" --plaintext sima szöveg kimenet Info helyett\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3328,7 +3537,7 @@ msgid ""
" Otherwise, DEST names the output file.\n"
msgstr ""
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3350,7 +3559,7 @@ msgid ""
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3364,19 +3573,19 @@ msgid ""
" anchors; default is set only if split.\n"
msgstr ""
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3387,7 +3596,7 @@ msgid ""
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3407,7 +3616,7 @@ msgid ""
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3417,7 +3626,7 @@ msgid ""
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3434,92 +3643,352 @@ msgid ""
" makeinfo --no-split foo.texi write one Info file however big\n"
msgstr ""
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: a --footnote-style argumentumának „separate“-nek vagy „end“-nek kell "
"lennie, „%s“ helyett.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: a --paragraph-indent argumentumának numerikusnak, „none“-nak vagy "
"„asis“-nek kell lennie, „%s“ helyett.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
# action=művelet ? LM
# általában az - sas
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "unknown tree transformation %s"
msgstr "ismeretlen művelet: „%s“."
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: hiányzó fájl argumentum.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "További információért próbálja meg a „%s --help“-t.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing macro expand file %s: %s\n"
msgstr "hiba a(z) „%s“ output fájl bezárásakor"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open %s for writing: %s\n"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "No matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "Nincs egyező „%cend %s“"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced {"
+msgstr "Rossz helyen levő %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "Nem egyező „%c%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s egy nevet igényel"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s egy nevet igényel"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s egy nevet igényel"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "Kapcsos zárójelekkel egy parancsot is megadhat @%s argumentumaként"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "Kapcsos zárójelekkel egy parancsot is megadhat @%s argumentumaként"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "Rossz argumentum ide: @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "Rossz argumentum ide: @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "Rossz argumentum ide: %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: a --footnote-style argumentumának „separate“-nek vagy „end“-nek kell "
+"lennie, „%s“ helyett.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "Rossz argumentum ide: %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"%s: a --paragraph-indent argumentumának numerikusnak, „none“-nak vagy "
+"„asis“-nek kell lennie, „%s“ helyett.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "Rossz argumentum ide: %s: %s"
+
+# %citem ist ein Texinfo-Befehl
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s egy argumentumot igényel: %citem formázását"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "Nem egyező „%c%s“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "Rossz argumentum ide: %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "Rossz argumentum ide: %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "@include: could not open %s:"
+msgstr "%s: A CSS fájl nem nyitható meg: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s -nek nincs jelentése a(z) „@%s“ blokkon belül"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s -nek nincs jelentése a(z) „@%s“ blokkon belül"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"A(z) @%s -nek nincs értelme a „@titlepage“ és a „@quotation“ környezeten "
+"kívül"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s egy nevet igényel"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s „i“-t vagy „j“-t vár argumentumként, nem „%c“-t"
+
+# flag ? LM
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "ismeretlen flag: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete."
+msgstr "%c%s elavult"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s elavult"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s „i“-t vagy „j“-t vár argumentumként, nem „%c“-t"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced }"
+msgstr "Rossz helyen levő %c"
+
+#, c-format
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: érvénytelen opció -- %c\n"
+#, c-format
#~ msgid "%s: option `-W %s' is ambiguous\n"
#~ msgstr "%s: Option „-W %s“ nem érthető\n"
+#, c-format
#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
#~ msgstr "%s: A „-W %s“ opció nem vár argumentumot\n"
@@ -3538,6 +4007,7 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "CAN'T SEE THIS"
#~ msgstr "EZ NEM LÃTHATÓ"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "* Menu: Nodes whose indices contain `%s':\n"
@@ -3590,23 +4060,29 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ " A névben akár egy fájl is szerepelhet, például "
#~ "(FÃJL)OLDALNEVE.\n"
+#, c-format
#~ msgid " %-10s Quit this help.\n"
#~ msgstr " %-10s Kilépés a súgóból.\n"
# az altogether le legyen forditva ?
+#, c-format
#~ msgid " %-10s Quit Info altogether.\n"
#~ msgstr " %-10s Kilépés az Info-ból.\n"
# tutorial = bemutató?
+#, c-format
#~ msgid " %-10s Invoke the Info tutorial.\n"
#~ msgstr " %-10s Az Info bemutató indítása.\n"
+#, c-format
#~ msgid " %-10s Move to the `next' node of this node.\n"
#~ msgstr " %-10s Ugrás a következő oldalra.\n"
+#, c-format
#~ msgid " %-10s Move to the `previous' node of this node.\n"
#~ msgstr " %-10s Ugrás az előző oldalra.\n"
+#, c-format
#~ msgid " %-10s Move `up' from this node.\n"
#~ msgstr " %-10s Ugrás a szülőoldalra.\n"
@@ -3618,65 +4094,79 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ " A menüelem kiválasztása miatt egy másik oldal lesz "
#~ "meghívva.\n"
+#, c-format
#~ msgid " %-10s Follow a cross reference. Reads name of reference.\n"
#~ msgstr ""
#~ " %-10s Kereszthivatkozás követése. A hivatkozás nevének beolvasása.\n"
+#, c-format
#~ msgid " %-10s Move to the last node seen in this window.\n"
#~ msgstr " %-10s Ugrás az ablakban látható utolsó oldalra.\n"
# hypertext link = ? LM
# link = lánc, hivatkozás - sas
+#, c-format
#~ msgid " %-10s Skip to next hypertext link within this node.\n"
#~ msgstr " %-10s Ugrás az oldalon található következő hypertext linkre.\n"
+#, c-format
#~ msgid " %-10s Follow the hypertext link under cursor.\n"
#~ msgstr " %-10s A kurzor alatti hypertext link követése.\n"
+#, c-format
#~ msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"
#~ msgstr ""
#~ " %-10s Ugrás a „directory“-oldalra. Egyenértékű ezzel: „g (DIR)“.\n"
# top node = legfelső szintű oldal ? LM
# szint nem kell - sas
+#, c-format
#~ msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n"
#~ msgstr " %-10s Ugrás a legfelső oldalra. Egyenértékű ezzel: „g Top“.\n"
# előre / felfele / lefele ? LM
# előre - sas
+#, c-format
#~ msgid " %-10s Scroll forward a page.\n"
#~ msgstr " %-10s Görgetés egy oldalt előre.\n"
# hátra / vissza / felfele / lefele ? LM
# hátra - sas
+#, c-format
#~ msgid " %-10s Scroll backward a page.\n"
#~ msgstr " %-10s Görgetés egy oldalt hátra.\n"
+#, c-format
#~ msgid " %-10s Go to the beginning of this node.\n"
#~ msgstr " %-10s Ugrás az oldal elejére.\n"
+#, c-format
#~ msgid " %-10s Go to the end of this node.\n"
#~ msgstr " %-10s Ugrás az oldal végére.\n"
# előre / felfele / lefele ? LM
# előre - sas
+#, c-format
#~ msgid " %-10s Scroll forward 1 line.\n"
#~ msgstr " %-10s Görgetés 1 sorral előre.\n"
# hátra / vissza / felfele / lefele ? LM
# hátra - sas
+#, c-format
#~ msgid " %-10s Scroll backward 1 line.\n"
#~ msgstr " %-10s Görgetés 1 sorral hátra.\n"
+#, c-format
#~ msgid " %-10s Pick first ... ninth item in node's menu.\n"
#~ msgstr ""
#~ " %-10s Az oldalon található menü első ... kilencedik elemének "
#~ "kiválasztása.\n"
+#, c-format
#~ msgid " %-10s Pick last item in node's menu.\n"
#~ msgstr " %-10s Az oldal utolsó menüelemének kiválasztása.\n"
-#, fuzzy
+#, fuzzy, c-format
#~ msgid ""
#~ " %-10s Search for a specified string in the index entries of this Info\n"
#~ " file, and select the node referenced by the first entry "
@@ -3691,7 +4181,7 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgstr ""
#~ " Az állománynevet is meg lehet adni: (FÃJL)OLDALNEVE.\n"
-#, fuzzy
+#, fuzzy, c-format
#~ msgid ""
#~ " %-10s Search forward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3705,9 +4195,11 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ "--- A kilépéshez használja a(z) „\\[history-node]“-t vagy a(z) „\\[kill-"
#~ "node]“-t ---\n"
+#, c-format
#~ msgid "ESC %s is undefined."
#~ msgstr "ESC %s nincs definiálva."
+#, c-format
#~ msgid "%s is defined to %s."
#~ msgstr "%s %s-ként van definiálva."
@@ -3716,6 +4208,7 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "incorrect number of arguments"
#~ msgstr "érvénytelen számú argumentum"
+#, c-format
#~ msgid "cannot create output file `%s'"
#~ msgstr "a(z) „%s“ output fájl nem hozható létre."
@@ -3725,6 +4218,7 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "section too long"
#~ msgstr "túl hosszú szakasz"
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "Definiálatlan parancs: %s"
@@ -3741,6 +4235,7 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "Selecting Next node..."
#~ msgstr "Következő oldal kiválasztása..."
+#, c-format
#~ msgid "Moving Up %d time(s), then Next."
#~ msgstr "Mozgás %d alkalommal felfele, majd a „Következő“ kiválasztása."
@@ -3758,9 +4253,11 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "Moving to `Prev's last menu item."
#~ msgstr "Ugrás az Előző utolsó menüelemére."
+#, c-format
#~ msgid "Kill node (%s): "
#~ msgstr "Oldal törlése (%s): "
+#, c-format
#~ msgid "Cannot kill node `%s'"
#~ msgstr "A(z) „%s“ oldal nem törölhető"
@@ -3779,23 +4276,28 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "Internally used by \\[universal-argument]"
#~ msgstr "Belső használatra a \\[universal-argument]-nek"
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: Nincs több virtuális memória!\n"
#~ msgid "--*** Tags out of Date ***"
#~ msgstr "--*** lejárt dátumú Tagek ***"
+#, c-format
#~ msgid "-%s---Info: %s, %d lines --%s--"
#~ msgstr "-%s---Info: %s, %d sor --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
#~ msgstr "-%s%s-Info: (%s)%s, %d sor --%s--"
# subfile ? LM
# Passz - sas
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr "Alfájl: %s"
+#, c-format
#~ msgid "arguments to @%s ignored"
#~ msgstr "@%s argumentuma(i) figyelmen kívül lett(ek) hagyva"
@@ -3838,15 +4340,19 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "@sc argument all uppercase, thus no effect"
#~ msgstr "@sc argumentuma végig nagybetűs, így nincs hatása"
+#, c-format
#~ msgid "`{' expected, but saw `%c'"
#~ msgstr "„{“-t vártam, de „%c“-t láttam"
+#, c-format
#~ msgid "`}' expected, but saw `%c'"
#~ msgstr "„}“-t vártam, de „%c“-t láttam"
+#, c-format
#~ msgid "@sp requires a positive numeric argument, not `%s'"
#~ msgstr "@sp egy pozitív szám argumentumot vár, nem „%s“-t"
+#, c-format
#~ msgid "Bad argument to %c%s"
#~ msgstr "Rossz argumentum ide: %c%s"
@@ -3885,12 +4391,15 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "Method"
#~ msgstr "Metódus"
+#, c-format
#~ msgid "%s: getwd: %s, %s\n"
#~ msgstr "%s: getwd: %s, %s\n"
+#, c-format
#~ msgid "`%s' omitted before output filename"
#~ msgstr "„%s“ mellőzve lett a kimeneti fájlnév előtt"
+#, c-format
#~ msgid "`%s' omitted since writing to stdout"
#~ msgstr "„%s“ mellőzve lett, mivel a stdout-ra írok"
@@ -3900,9 +4409,11 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "See "
#~ msgstr "Lásd "
+#, c-format
#~ msgid "`%c%s' needs an argument `{...}', not just `%s'"
#~ msgstr "„%c%s“ argumentumot vár „{...}“, nem csak „%s“-t"
+#, c-format
#~ msgid "No closing brace for footnote `%s'"
#~ msgstr "A(z) „%s“ lábjegyzet záró kapcsoszárójele hiányzik "
@@ -3919,21 +4430,26 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "[unexpected] no html tag to pop"
#~ msgstr "[váratlan] nincs html tag, amit ki lehetne venni"
+#, c-format
#~ msgid "[unexpected] invalid node name: `%s'"
#~ msgstr "[váratlan] érvénytelen oldalnév: „%s“"
+#, c-format
#~ msgid "Info cannot handle `:' in index entry `%s'"
#~ msgstr "Az Info nem tudja a „:“-t kezelni a „%s“ tárgymutatóbejegyzésben"
+#, c-format
#~ msgid "Index `%s' already exists"
#~ msgstr "„%s“ tárgymutató már létezik"
+#, c-format
#~ msgid "Unknown index `%s' and/or `%s' in @synindex"
#~ msgstr "Ismeretlen tárgymutató „%s“ és/vagy „%s“ itt: @synindex"
#~ msgid "(line )"
#~ msgstr "(sor )"
+#, c-format
#~ msgid "(line %*d)"
#~ msgstr "(%*d sor)"
@@ -3941,9 +4457,11 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgstr "@item nem szerepelhet az @itemize argumentumaként"
# %cfloat ist ein Texinfo-Befehl
+#, c-format
#~ msgid "%cfloat environments cannot be nested"
#~ msgstr "A %cfloat környezetet nem lehet beágyazni"
+#, c-format
#~ msgid "%s requires letter or digit"
#~ msgstr "%s betűt vagy számjegyet tartalmazhat"
@@ -3955,53 +4473,68 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ "@detailmenu-t találtam az első @node előtt. Létrehozom a „Szülő“ (Top) "
#~ "oldalt"
+#, c-format
#~ msgid "`%c%s' needs something after it"
#~ msgstr "„%c%s“ után még írni kell valamit"
+#, c-format
#~ msgid "Bad argument `%s' to `@%s', using `%s'"
#~ msgstr "„%s“ rossz argument ehhez:: „@%s“, „%s“-t használom"
+#, c-format
#~ msgid "@itemx not meaningful inside `%s' block"
#~ msgstr "@itemx -nek nincs jelentése a(z) „%s“ blokkon belül"
# checkit
+#, c-format
#~ msgid "%c%s found outside of an insertion block"
#~ msgstr "%c%s egy beszúrási blokkon kívül található "
+#, c-format
#~ msgid "sorry, encoding `%s' not supported"
#~ msgstr "bocsánat, de a(z) „%s“ kódolás nem támogatott"
+#, c-format
#~ msgid "%c%s expects a single character `i' or `j' as argument"
#~ msgstr "%c%s egy „i“ vagy „j“ karakter vár argumentumként"
+#, c-format
#~ msgid "%cend macro not found"
#~ msgstr "%cend makró nem található"
+#, c-format
#~ msgid "Too many errors! Gave up.\n"
#~ msgstr "Túl sok hiba! Feladom.\n"
+#, c-format
#~ msgid "%s:%d: warning: "
#~ msgstr "%s:%d: figyelem: "
+#, c-format
#~ msgid "%s: could not open macro expansion output `%s'"
#~ msgstr "%s: nem tudom a makrókiterjesztés „%s“ kimenetét megnyitni"
+#, c-format
#~ msgid "%s: ignoring second macro expansion output `%s'.\n"
#~ msgstr ""
#~ "%s: a második makrókiterjesztés „%s“ kimenetét figyelmen kívül hagyom.\n"
+#, c-format
#~ msgid "Multiline command %c%s used improperly"
#~ msgstr "A többsoros %c%s parancs helytelenül van használva"
+#, c-format
#~ msgid "No `%s' found in `%s'"
#~ msgstr "Nem található „%s“ ebben: „%s“"
+#, c-format
#~ msgid ""
#~ "%s: Skipping macro expansion to stdout as Info output is going there.\n"
#~ msgstr ""
#~ "%s: A makrókiterjesztést átirányítom a stdout-ra, mivel az Info kimete "
#~ "oda megy.\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing macro output file `%s' due to errors; use --force to "
#~ "preserve.\n"
@@ -4009,6 +4542,7 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ "%s: A fellépett hibák miatt eltávolítom a(z) „%s“ makró kimeneti "
#~ "állományt; a megtartásához használja --force opciót.\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
#~ msgstr ""
@@ -4018,49 +4552,61 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "NO_NAME!"
#~ msgstr "NINCS_NÉV!"
+#, c-format
#~ msgid "No such file `%s'"
#~ msgstr "Nincs ilyen fájl: „%s“"
+#, c-format
#~ msgid "@image file `%s' (for text) unreadable: %s"
#~ msgstr "@image a(z) „%s“ fájl (szöveges) nem olvasható: %s"
# checkit
+#, c-format
#~ msgid "{No value for `%s'}"
#~ msgstr "{„%s“-hoz nincs érték}"
# AATNEZNI ? LM
+#, c-format
#~ msgid "Reached eof before matching @end %s"
#~ msgstr "Korábban találtam fájl vége jelet, mint @end-t %s "
#~ msgid "Missing } in @multitable template"
#~ msgstr "Hiányzó } a @multitable sablonban"
+#, c-format
#~ msgid "ignoring stray text `%s' after @multitable"
#~ msgstr ""
#~ "figyelmen kívül hagyom a @multitable után álló felesleges „%s“ szöveget"
+#, c-format
#~ msgid "[unexpected] cannot select column #%d in multitable"
#~ msgstr ""
#~ "[váratlan] nem lehet a(z) %d. oszlopot a multitable-ben kiválasztani"
# ATNEZNI ? LM
+#, c-format
#~ msgid "** Multicolumn output from last row:\n"
#~ msgstr "** Multicolumn kimenet az utolsó sortól:\n"
+#, c-format
#~ msgid "* column #%d: output = %s\n"
#~ msgstr "* %d. oszlop: kimenet = %s\n"
+#, c-format
#~ msgid "Node `%s' previously defined at line %d"
#~ msgstr "A(z) „%s“ oldal korábban már definiálva lett a(z) %d. sorban"
+#, c-format
#~ msgid "Formatting node %s...\n"
#~ msgstr "A(z) %s oldal formázása...\n"
+#, c-format
#~ msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
#~ msgstr ""
#~ "A(z) „%s“ oldalon szerepelnie kell szekcionálás (sectioning) parancsnak "
#~ "(pl. %c%s)"
+#, c-format
#~ msgid "Anchor `%s' and node `%s' map to the same file name"
#~ msgstr "A(z) „%s“ horgony és a(z) „%s“ oldal ugyanarra a fájlnévre mutatnak"
@@ -4073,6 +4619,7 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgstr "Nevezze át ezt a horgonyt vagy használja a „--no-split“ opciót"
# split-HTML ? LM
+#, c-format
#~ msgid "Unexpected string at end of split-HTML file `%s'"
#~ msgstr "Nem várt szöveg a(z) „%s“ split-HTML fájl végén"
@@ -4087,6 +4634,7 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "Up:"
#~ msgstr "Fel:"
+#, c-format
#~ msgid "Anchors `%s' and `%s' map to the same file name"
#~ msgstr "A(z) „%s“ és „%s“ horgonyok ugyanarra a fájlnévre mutatnak"
@@ -4103,12 +4651,14 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgstr "Kereszt"
# ATNEZNI ? LM
+#, c-format
#~ msgid ""
#~ "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
#~ msgstr ""
#~ "A(z) „%s“ oldalnak a Következő (Next) mezője nem mutat sehova (esetleg "
#~ "hibás szekcionálás?)"
+#, c-format
#~ msgid "This node (%s) has the bad Prev"
#~ msgstr "Ennek az oldalnak (%s) hibás az Előző (Prev) mezője"
@@ -4116,39 +4666,50 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgstr "Előző"
# ATNEZNI ? LM
+#, c-format
#~ msgid "Prev field of node `%s' not pointed to"
#~ msgstr "A(z) „%s“ oldalnak az Előző (Prev) mezője nem mutat sehova"
+#, c-format
#~ msgid "This node (%s) has the bad Next"
#~ msgstr "Ennek az oldalnak (%s) hibás a Következő (Next) mezője"
+#, c-format
#~ msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
#~ msgstr "„%s“-nek nincs Szülő (Up) mezője (esetleg hibás szekcionálás?)"
#~ msgid "Up"
#~ msgstr "Fel"
+#, c-format
#~ msgid "Can't remove file `%s': %s"
#~ msgstr "Nem törölhető fájl: `%s': %s"
+#, c-format
#~ msgid "Appendix %c"
#~ msgstr "Függelék: %c"
+#, c-format
#~ msgid "Internal error (search_sectioning) `%s'!"
#~ msgstr "Belső hiba (search_sectioning) „%s“!"
+#, c-format
#~ msgid "Internal error (search_sectioning) \"%s\"!"
#~ msgstr "Belső hiba (search_sectioning) „%s“!"
+#, c-format
#~ msgid "%c%s is obsolete; use %c%s instead"
#~ msgstr "%c%s már elavult; használja %c%s-t helyette"
+#, c-format
#~ msgid "Node with %ctop as a section already exists"
#~ msgstr "Olyan oldal már létezik, amelynek szekciója %ctop"
+#, c-format
#~ msgid "Here is the %ctop node"
#~ msgstr "Ãme a %ctop oldal"
+#, c-format
#~ msgid "%ctop used before %cnode, defaulting to %s"
#~ msgstr ""
#~ "%ctop korábban szerepel, mint %cnode, az alapértelmezett %s-t használom"
@@ -4170,9 +4731,11 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "for cross-references in parentheses, use @pxref"
#~ msgstr "Ez az oldal nem tartalmaz kereszthivatkozást."
+#, c-format
#~ msgid "%s: warning: "
#~ msgstr "%s: figyelem: "
+#, c-format
#~ msgid "menu item `%s' already exists, for file `%s'"
#~ msgstr "A(z) „%s“ menüelem már létezik a „%s“ fájlhoz"
@@ -4182,17 +4745,21 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ msgid "send output to FILE"
#~ msgstr "kimenet átirányítása FILE-ba"
+#, c-format
#~ msgid "Usage: %s [OPTION]... FILE...\n"
#~ msgstr "Használat: %s [OPCIÓK]... FÃJL...\n"
+#, c-format
#~ msgid "Generate a sorted index for each TeX output FILE.\n"
#~ msgstr "Rendezett tárgymutató generálása minden TeX kimeneti fájlhoz.\n"
+#, c-format
#~ msgid ""
#~ "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
#~ msgstr ""
#~ "FÃJL... általában „foo.%c%c“ alakú egy „foo.texi“ dokumentum esetén.\n"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "Options:\n"
@@ -4200,15 +4767,19 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
#~ "\n"
#~ "Opciók:\n"
+#, c-format
#~ msgid "failure reopening %s"
#~ msgstr "Hiba történt „%s“ újbóli megnyitásakor"
+#, c-format
#~ msgid "%s: not a texinfo index file"
#~ msgstr "%s: nem Texinfo tárgymutatófájl"
+#, c-format
#~ msgid "No page number in %s"
#~ msgstr "Nem található oldalszám ebben: %s"
+#, c-format
#~ msgid "entry %s follows an entry with a secondary name"
#~ msgstr "a(z) %s bejegyzés egy másodlagos névvel rendelkező bejegyzést követ"
diff --git a/macros/texinfo/texinfo/po/id.gmo b/macros/texinfo/texinfo/po/id.gmo
index 15ff76f1c9..d91fcf2e01 100644
--- a/macros/texinfo/texinfo/po/id.gmo
+++ b/macros/texinfo/texinfo/po/id.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/id.po b/macros/texinfo/texinfo/po/id.po
index f71782ee1f..fd24492bcd 100644
--- a/macros/texinfo/texinfo/po/id.po
+++ b/macros/texinfo/texinfo/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 5.1.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2014-08-11 17:30+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -24,26 +24,31 @@ msgstr "Sistem error tidak diketahui"
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option '-W %s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: opsi '-W %s' adalah ambigu\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: opsi `%s' adalah ambigu"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: opsi tidak dikenal '%c%s'\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: opsi '%c%s' tidak mengijinkan sebuah argumen\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: opsi '--%s' membutuhkan sebuah argumen\n"
@@ -87,6 +92,7 @@ msgstr "Invalid back reference"
#: gnulib/lib/regcomp.c:156
#, fuzzy
+#| msgid "Unmatched [ or [^"
msgid "Unmatched [, [^, [:, [., or [="
msgstr "Tidak cocok [ atau [^"
@@ -242,7 +248,6 @@ msgid "Insert completion"
msgstr "Masukan komplesi"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Buat komplesi..."
@@ -266,7 +271,6 @@ msgid "found file %s"
msgstr "Cari berkas: %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Catatan kaki tidak dapat ditampilkan"
@@ -280,7 +284,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Catatan kaki ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Mencari masukan indeks..."
@@ -289,7 +292,8 @@ msgid "Look up a string in the index for this file"
msgstr "Mencari sebuah string dalam indeks untuk berkas ini"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "Tidak ada indices ditemukan."
@@ -298,18 +302,21 @@ msgid "Index entry: "
msgstr "Masukan indeks: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Tidak ada indices ditemukan."
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr ""
"Ditemukan `%s' dalam %s. (`\\[next-index-match]' mencoba untuk mencari next.)"
#: info/indices.c:446
#, fuzzy
+#| msgid ""
+#| "Go to the next matching index item from the last `\\[index-search]' "
+#| "command"
msgid ""
"Go to the next matching index item from the last '\\[index-search]' command"
msgstr ""
@@ -317,22 +324,26 @@ msgstr ""
"search]'"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "Tidak ada indeks pencarian string sebelumnya."
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No more index entries containing `%s'."
msgid "No more index entries containing '%s'"
msgstr "Tidak ada masukan indeks yang berisi `%s'."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "No index entries containing '%s'"
msgstr "Tidak ada masukan indeks yang berisi `%s'."
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of `%s'..."
msgid "Scanning indices of '%s'..."
msgstr "Menscan indices dari `%s'..."
@@ -344,11 +355,13 @@ msgstr ""
#: info/indices.c:654 info/indices.c:656
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index apropos"
msgstr "Indeks apropos: "
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "Index entries containing '%s':\n"
msgstr "Tidak ada masukan indeks yang berisi `%s'."
@@ -367,36 +380,39 @@ msgstr "List all matches of a string in the index"
#: info/indices.c:889 info/indices.c:891
#, fuzzy
+#| msgid "Index topic: "
msgid "Index topic"
msgstr "Indeks apropos: "
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "No index entries containing '%s'."
msgstr "Tidak ada masukan indeks yang berisi `%s'."
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have `%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "Info berkas tidak tersedia memiliki `%s' dalam indicesnya."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "Tidak ada menu item `%s' dalam titik `%s'."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr "Tidak dapat menemukan titik `%s'."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -425,7 +441,7 @@ msgstr "Set nilai %s dari sebuah variabel Info %s"
msgid "Try --help for more information.\n"
msgstr "Coba --help untuk informasi lebih lanjut.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -444,6 +460,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "tidak ada masukan indeks ditemukan untuk `%s'\n"
@@ -460,6 +477,14 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -a, --all use all matching manuals.\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILE remember user keystrokes in FILENAME.\n"
+#| " -f, --file=MANUAL specify Info manual to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -477,6 +502,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILE output selected nodes to FILE."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -496,11 +526,21 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr " -b, --speech-friendly jadi ramah untuk berbicara synthesizer."
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --strict-node-location (for debugging) use Info file pointers as-"
+#| "is.\n"
+#| " --subnodes recursively output menu items.\n"
+#| " -v, --variable VAR=VALUE assign VALUE to Info variable VAR.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file.\n"
+#| " -x, --debug=NUMBER set debugging level (-1 for all).\n"
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -518,6 +558,14 @@ msgstr ""
#: info/info.c:1122
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The first non-option argument, if present, is the menu entry to start "
+#| "from;\n"
+#| "it is searched for in all `dir' files along INFOPATH.\n"
+#| "If it is not present, info merges all `dir' files and shows the result.\n"
+#| "Any remaining arguments are treated as the names of menu\n"
+#| "items relative to the initial node visited."
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -537,6 +585,9 @@ msgstr ""
#: info/info.c:1129
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "For a summary of key bindings, type h within Info."
msgid ""
"\n"
"For a summary of key bindings, type H within Info."
@@ -546,6 +597,19 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers start at buffers node within emacs manual\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -574,7 +638,7 @@ msgstr ""
" info --subnodes -o out.txt emacs dump seluruh manual ke out.txt\n"
" info -f ./foo.info tampilkan berkas ./foo.info, bukan mencari dir"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -586,6 +650,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "Tidak dapat menemukan titik `(%s)%s'."
@@ -599,61 +664,73 @@ msgstr "Titik tidak kelihatan didalam titik jendela ini!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "Tidak dapat menghapus jendela terakhir."
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "Tidak ada menu di titik ini."
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "Tidak ada catatan kaki di titik ini."
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "Tidak ada referensi silang di titik ini."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "Tidak ada `%s' penunjuk untuk titik ini."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "Perintah Info `%c' tidak diketahui; coba `?' untuk bantuan."
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "Tipe terminal `%s' tidak cukup pintar untuk menjalankan Info."
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "Anda telah berada di akhir halaman dari titik ini."
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "Anda telah berada di halaman pertama dari titik ini."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "Hanya satu jendela."
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "Menghasilkan jendela yang akan terlalu kecil."
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr ""
"Tidak cukup ruang untuk sebuah jendela bantuan, mohon hapus sebuah jendela."
@@ -741,6 +818,7 @@ msgstr "\\%-10[top-node] Pergi ke titik paling atas dari dokumen ini.\n"
#: info/infodoc.c:61
#, fuzzy
+#| msgid "\\%-10[dir-node] Go to the main `directory' node.\n"
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
msgstr "\\%-10[dir-node] Pergi ke titik `directory' utama.\n"
@@ -845,6 +923,7 @@ msgstr "Tampilkan pesan bantuan"
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "Kunjungi titik Info `(info)Help'"
@@ -859,6 +938,7 @@ msgstr "Jelaskan kunci: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s tidak terdefinisi."
@@ -873,41 +953,43 @@ msgstr "Dimana perintahnya: "
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "`%s' tidak di kunci apapun"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s hanya dapat dipanggil melalui %s."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s dapat dipanggil melalui %s."
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr "Tidak ada fungsi yang bernama `%s'"
#: info/infomap.c:585
#, fuzzy, c-format
+#| msgid "could not read init file %s"
msgid "could not open init file %s"
msgstr "Tidak dapat membuat berkas keluaran `%s'."
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "urutan kunci terlalu panjang"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "hilang urutan kunci"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "karakter NULL (\\000) tidak diijinkan"
@@ -917,12 +999,12 @@ msgid "NUL character (^%c) not permitted"
msgstr "karakter NULL (^%c) tidak diijinkan"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "hilang nama aksi"
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "key sequence too long"
msgid "cannot bind key sequence to menu-digit"
msgstr "urutan kunci terlalu panjang"
@@ -932,7 +1014,6 @@ msgid "unknown action `%s'"
msgstr "aksi `%s' tidak dikenal"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nama aksi terlalu panjang"
@@ -942,22 +1023,18 @@ msgid "extra characters following action `%s'"
msgstr "karakter ekstra mengikuti aksi `%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "hilang nama variabel"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "hilang `=' langsung setelah nama variabel"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nama variabel terlalu panjang"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "nilai terlalu panjang"
@@ -979,7 +1056,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Baca sebuah nama perintah dalam daerah echo dan jalankan itu"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an `echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "Tidak dapat menjalankan sebuah perintah `echo-area' disini."
@@ -1010,6 +1088,11 @@ msgstr "Tidak dapat memanipulasi berkas %s.\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -1024,6 +1107,9 @@ msgstr ""
#: info/nodemenu.c:185
#, fuzzy
+#| msgid ""
+#| "Here is the menu of nodes you have recently visited.\n"
+#| "Select one from this menu, or use `\\[history-node]' in another window.\n"
msgid ""
"Here is the menu of nodes you have recently visited.\n"
"Select one from this menu, or use '\\[history-node]' in another window.\n"
@@ -1067,7 +1153,6 @@ msgid "Show all matching files"
msgstr "Show all matching files"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "No file index"
@@ -1076,6 +1161,9 @@ msgstr "No file index"
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1216,6 +1304,8 @@ msgstr "Pilih menu item ini"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There isn't %d item in this menu."
+#| msgid_plural "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "Disana tidak ada %d item dalam menu ini."
@@ -1245,6 +1335,7 @@ msgstr "Mengikuti xref: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "Referensi menghilang! (%s)."
@@ -1278,11 +1369,13 @@ msgstr "Pilih referensi atau menu item muncul dalam baris ini"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr "Tidak ada menu dalam titik `%s'."
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "Tidak dapat menemukan titik direferensikan oleh `%s' dalam `%s'."
@@ -1320,11 +1413,13 @@ msgstr "Pilih titik pertama dalam berkas ini"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "Tidak ada titik lagi didalam dokumen ini."
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "Tidak ada `Prev' atau `Up' untuk titik ini didalam dokumen ini."
@@ -1363,11 +1458,13 @@ msgstr "Dapatkan Halaman manual: "
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "Pilih titik `Top' dalam berkas ini"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "Pilih titik `(dir)'"
@@ -1380,7 +1477,6 @@ msgid "Select the most recently selected node"
msgstr "Pilih titik yang dipilih paling baru"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1394,11 +1490,13 @@ msgstr "Cari berkas: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr "Tidak dapat menemukan `%s'."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr "Tidak dapat membuat berkas keluaran `%s'."
@@ -1423,6 +1521,7 @@ msgstr "Pipe isi dari titik ini melalui INFO_PRINT_COMMAND"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr "Tidak dapat membuka pipe ke `%s'."
@@ -1441,22 +1540,26 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Toggle penggunaan dari ekspresi regular dalam pencarian"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Using regular expressions for searches"
msgstr "Menggunakan ekspresi regular untuk pencarian."
#: info/session.c:3909
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches."
msgid "Using literal strings for searches"
msgstr "Menggunakan string literal untuk pencarian."
#: info/session.c:4112
#, fuzzy
+#| msgid "Search continued from the end of the document."
msgid "Search continued from the end of the document"
msgstr "Pencarian dilanjutkan dari akhir dari dokumen."
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the beginning of the document."
msgid "Search continued from the beginning of the document"
msgstr "Pencarian dilanjutkan dari awal dari dokumen."
@@ -1465,8 +1568,9 @@ msgstr "Pencarian dilanjutkan dari awal dari dokumen."
msgid "Searching subfile %s ..."
msgstr "Pencarian subfile %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "Pencarian gagal."
@@ -1493,6 +1597,7 @@ msgstr " kebelakang"
#: info/session.c:4198
#, fuzzy, c-format
+#| msgid "%s%s%s [%s]: "
msgid "%s%s%s: "
msgstr "%s%s%s [%s]: "
@@ -1500,142 +1605,146 @@ msgstr "%s%s%s [%s]: "
msgid "Search string too short"
msgstr "Search string too short"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "No match"
msgid "No more matches"
msgstr "No match"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "Pencarian subfile %s ..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Baca sebuah string dan cari itu dengan tidak membedakan besar huruf"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Baca sebuah string dan cari itu"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Baca sebuah string dan cari kebelakang untuk itu"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Ulangi pencarian terakhir dalam arah yang sama"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Tidak ada string pencarian sebelumnya"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Ulangi pencarian terakhir dalam arah terbalik"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr ""
"Pencarian secara interaktif untuk sebuah string seperti anda mengetikkannya"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Regexp I-search kebelakang: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-search kebelakang: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Regexp I-search: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-search: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Menggagalkan "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Batalkan operasi sekarang"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Berhenti"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "tampilkan informasi versi dan keluar"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Gambar kembali tampilan"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Berhenti menggunakan Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Jalankan perintah terikat variasi kunci huruf kecil ini"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "Perintah (%s) tidak diketahui."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" tidak valid"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "`%s' is invalid"
msgid "'%s' is invalid"
msgstr "`%s' tidak valid"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Tambahkan digit ini ke argumen numerik sekarang"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Awal (atau kelipatan dari 4) argumen numerik sekarang"
@@ -1724,6 +1833,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "Pindah ke referensi silang selanjutnya"
@@ -1826,6 +1936,17 @@ msgstr ""
#: install-info/install-info.c:552
#, fuzzy
+#| msgid ""
+#| " --debug report what is being done.\n"
+#| " --delete delete existing entries for INFO-FILE from DIR-"
+#| "FILE;\n"
+#| " don't insert any new entries.\n"
+#| " --description=TEXT the description of the entry is TEXT; used with\n"
+#| " the --name option to become synonymous with the\n"
+#| " --entry option.\n"
+#| " --dir-file=NAME specify file name of Info directory file;\n"
+#| " equivalent to using the DIR-FILE argument.\n"
+#| " --dry-run same as --test."
msgid ""
" --debug report what is being done.\n"
" --delete delete existing entries for INFO-FILE from DIR-FILE;\n"
@@ -1913,6 +2034,21 @@ msgstr ""
#: install-info/install-info.c:590
#, fuzzy
+#| msgid ""
+#| " --regex=R put this file's entries in all sections that match "
+#| "the\n"
+#| " regular expression R (ignoring case).\n"
+#| " --remove same as --delete.\n"
+#| " --remove-exactly only remove if the info file name matches exactly;\n"
+#| " suffixes such as .info and .gz are not ignored.\n"
+#| " --section=SEC put entries in section SEC of the directory.\n"
+#| " If you specify more than one section, all the "
+#| "entries\n"
+#| " are added in each of the sections.\n"
+#| " If you don't specify any sections, they are "
+#| "determined\n"
+#| " from information in the Info file itself.\n"
+#| " --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1957,6 +2093,23 @@ msgstr ""
#: install-info/install-info.c:639
#, fuzzy, c-format
+#| msgid ""
+#| "This is the file .../info/dir, which contains the\n"
+#| "topmost node of the Info hierarchy, called (dir)Top.\n"
+#| "The first time you invoke Info you start off looking at this node.\n"
+#| "%c\n"
+#| "%s\tThis is the top of the INFO tree\n"
+#| "\n"
+#| " This (the Directory node) gives a menu of major topics.\n"
+#| " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+#| " \"h\" gives a primer for first-timers,\n"
+#| " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+#| "\n"
+#| " In Emacs, you can click mouse button 2 on a menu item or cross "
+#| "reference\n"
+#| " to select it.\n"
+#| "\n"
+#| "%s\n"
msgid ""
"This is the file .../info/dir, which contains the\n"
"topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -1998,12 +2151,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: tidak dapat membaca (%s) dan tidak dapat membuat (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY tanpat pasangan END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY tanpa pasangan START-INFO-DIR-ENTRY"
@@ -2033,14 +2184,12 @@ msgid "excess command line argument `%s'"
msgstr "kelebihan argumen baris perintah `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Tidak ada berkas masukan dispesifikasikan; coba --help untuk informasi lebih "
"lanjut."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Tidak ada berkas direktori dispesifikasikan; coba --help untuk informasi "
@@ -2048,6 +2197,7 @@ msgstr ""
#: install-info/install-info.c:2301
#, fuzzy, c-format
+#| msgid "could not read %s: %s"
msgid "Could not read %s."
msgstr "%s: tidak dapat membuka --css-file: %s"
@@ -2061,304 +2211,262 @@ msgstr "tidak ada masukan direktori info dalam `%s'"
msgid "no entries found for `%s'; nothing deleted"
msgstr "tidak ada masukan ditemukan untuk `%s'; tidak ada yang dihapus"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "tidak dapat membuka %s --css-file: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s is not a valid split possibility"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "error menutup berkas keluaran `%s' : %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "no node to be renamed"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "nodes without a new name at the end of file"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "%s: tidak dapat membuka --css-file: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "could not protect hash character in @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "empty node name after expansion `%s'"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s makro `%s' telah didefinisikan sebelumnya"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "disini adalah definisi sebelumnya dari `%s'"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "Argumen ke @%s buruk"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "error menutup berkas keluaran `%s': %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "Tidak dapat membuat direktori `%s' atau `%s': %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "Tidak dapat membuat direktori `%s': %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image berkas `%s' tidak dapat dibaca: %s"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
+#| msgid "No node name specified for `%c%s' command"
msgid "no argument specified for @U"
msgstr "Tidak nama titik dispesifikasikan untuk perintah `%c%s'"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image berkas `%s' (untuk HTML) tidak dapat dibaca: %s"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "raw format %s is not converted"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "tidak dapat membuka --css-file: %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "hilang nama aksi"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "opsi tidak dikenal %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "error menutup berkas keluaran `%s': %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "string not closed in css file"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-file berakhir dalam komentar"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import not finished in css file"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS file %s not found"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "tidak dapat membuka --css-file: %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "error menutup berkas keluaran `%s': %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "tidak ada masukan indeks ditemukan untuk `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "error menutup berkas keluaran `%s': %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "error menutup berkas keluaran `%s': %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "handler %s of stage %s priority %s failed"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "must specify a title with a title command or @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "error menutup berkas keluaran `%s': %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "Tidak ada `%s' untuk titik ini didalam dokumen ini."
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "titik `%s' tidak tereferensi"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "target node (new name for `%s') not in document: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "error on closing renamed node redirection file %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "empty node name"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "syntax for an external node used for `%s'"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "Tidak ada menu di titik ini."
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "document without Top node"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "rename %s failed: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s output more than once: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s (diluar dari titik apapun)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "@node name should not contain `,': %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "Masukan untuk indeks `%s' diluar dari titik apapun"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "error menutup berkas keluaran `%s': %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image berkas `%s' tidak dapat dibaca: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "could not find @image file `%s.txt' nor alternate text"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2366,300 +2474,329 @@ msgstr ""
"@strong{Note...} menghasilkan sebuah referensi silang spurious dalam Info; "
"reword ke untuk menghindari"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "@%s cross-reference name should not contain `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "@%s masukan indeks yang berisi `%s'."
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "@%s node name should not contain `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' atau `,' harus mengikuti, bukan `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "`.' atau `,' harus mengikuti"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "menu entry node name should not contain `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "menu entry node name should not contain `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "menu entry name should not contain `:'"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "%s: tidak dapat membuka --css-file: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "multiple @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "bad or empty @%s formal argument: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "bad syntax for @%s argument: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s membutuhkan sebuah nama"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "Argumen ke @%s buruk"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s seen before @%s closing brace"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s seen before @%s closing brace"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s hilang kurung penutup"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s missing closing delimiter sequence: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx should not begin @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx must follow @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s has text but no @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' diduga `%s', tetapi terlihat `%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s seen before @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "Tidak cocok `%cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "Salah tempat %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "Tidak cocok `%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "Makro `%s' dipanggil di baris dengan terlalu banyak args"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
+#| msgid "@%s missing close brace"
msgid "@%s missing closing brace"
msgstr "@%s hilang kurung penutup"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "Makro `%s' dipanggil di baris dengan terlalu banyak args"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ dalam @%s ekspansi makro diikuti oleh `%s' daripada nama parameter \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "hilang nama aksi @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "missing category for @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "Argumen ke @%s: %s buruk"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "berkas kosong"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "Argumen ke @%s buruk"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "Argumen ke @%s buruk"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s membutuhkan sebuah argumen: peformat untuk %c item"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr "command @%s not accepting argument in brace should not be on @%s line"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "%s: opsi `--%s' tidak mengijinkan sebuah argumen"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "%s: hilang argumen berkas."
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "Indeks `%s' tidak diketahui"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "Argumen ke @%s: %s buruk %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "Argumen ke @%s: %s buruk"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "%s: tidak dapat membuka --css-file: %s %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "encoding `%s' is not a canonical texinfo encoding"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nama pengkodean `%s' tidak diketahui"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s after the first element"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s tidak berarti diluar lingkungan `@titlepage'"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@%s should not be associated with @top"
+msgid "@part should not be associated with @top"
+msgstr "@%s should not be associated with @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node precedes @%s, but parts may not be associated with nodes"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "syntax for an external node used for `%s'"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "Tidak ada menu dalam titik `%s'."
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "empty node name in menu entry"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "@end %s should only appear at a line beginning"
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s should only appear at a line beginning"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro `%s' telah didefinisikan sebelumnya"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "disini adalah definisi sebelumnya dari `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "redefining Texinfo language command: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s without associated character"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s defined with zero or more than one argument should be invoked with {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2667,346 +2804,364 @@ msgstr ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr "recursive call of macro %s is not allowed; use @rmacro if needed"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "accent command `@%s' must not be followed by whitespace"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr ""
"Gunakan kurung untuk memberi sebuah perintah sebagai sebuah argumen ke @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s diduga `i' atau `j' sebagai sebuah argumen, bukan `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "accent command `@%s' must not be followed by new line"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s diduga kurung"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "Perintah `%s' tidak diketahui"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "opsi tidak terdefinisi: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "bad syntax for @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s sudah ditinggalkan"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s sudah ditinggalkan %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear at a line beginning"
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s should only appear at a line beginning"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s should only appear in heading or footing"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s tidak berarti didalam blok `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s: berkas kosong"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab before @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "Terlalu banyak kolom dalam multitable item (maksimal %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "mengabaikan @tab diluar dari multitabel"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s outside of table or list"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s tidak berarti didalam blok `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear in math context"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s should only appear in math context"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "Harus berada dalam lingkungan `@%s' untuk menggunakan `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s tidak berarti diluar lingkunga `@titlepage' dan `@quotation'"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory after first node"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "Catatan %s kaki didalam catatan kaki %s tidak diijinkan"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry after first node"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s terlihat sebelum @node pertama, membuat titik `Top'"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"mungkin titik @top anda seharusnya wrapped dalam @ifnottex daripada @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s should only appear in math context"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s should only appear in math context"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "Diduga @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s tidak berarti diluar lingkungan `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s should be right below `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "ignoring multiple @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "command @%s does not accept arguments"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "command @%s missing a node or external manual argument"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "in @%s empty cross reference name after expansion `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "in @%s empty cross reference title after expansion `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image hilang argumen nama berkas"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s: hilang argumen berkas."
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, fuzzy, c-format, perl-format
+#| msgid "bad argument to @%s: %s"
msgid "non-hex digits in argument for @U: %s"
msgstr "Argumen ke @%s: %s buruk"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "superfluous arguments for node"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "Diduga `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr ""
"@%s Gunakan kurung untuk memberi sebuah perintah sebagai sebuah argumen ke @"
"%s"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "Argumen ke @%s: %s buruk"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr ""
"Gunakan kurung untuk %s memberi sebuah perintah sebagai sebuah argumen ke @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "empty @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "column fraction not a number: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp arg harus berupa numerik, bukan `%s'."
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "reserved index name %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "Indeks `%s' tidak diketahui %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "unknown destination index in @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s leads to a merging of %s in itself, ignoring"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "Indeks `%s' tidak diketahui dalam @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, fuzzy, c-format, perl-format
+#| msgid "printing an index `%s' merged in another one `%s'"
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "printing an index `%s' merged in another one `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex before document beginning: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "@%s arg harus berupa numerik, bukan `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Hanya @%s 10 atau 11 yang didukung, bukan `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"@%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'."
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s arg harus berupa numerik, bukan `%s'."
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "--paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'."
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "--paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'."
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "--paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'."
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "Diduga @%s on atau off, bukan `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "--footnote-style arg harus berupa `separate' atau `end', bukan `%s'."
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "--footnote-style arg harus berupa `separate' atau `end', bukan `%s'."
@@ -3032,10 +3187,11 @@ msgstr "no sectioning command associated with @%s"
#: tp/Texinfo/Structuring.pm:329
#, fuzzy, perl-format
+#| msgid "@%s in empty multitable"
msgid "@%s not empty"
msgstr "@%s: berkas kosong"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
@@ -3046,105 +3202,105 @@ msgstr ""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s entry node name `%s' different from %s name `%s'"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "titik `%s' tidak tereferensi"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "node `%s' is %s for `%s' in sectioning but not in menu"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "node %s `%s' in menu `%s' and in sectioning `%s' differ"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "node `%s' is %s for `%s' in menu but not in sectioning"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s pointer `%s' (for node `%s') different from %s name `%s'"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "titik `%s' tidak tereferensi `%s'"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Titik `%s' kurang item menu untuk `%s' dariapda target Up nya"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "for `%s', up in menu `%s' and up `%s' don't match"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s to `%s', different from %s name `%s'"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "empty index key in @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "tidak dapat membuka %s: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: error on closing %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "tidak dapat membuka --css-file: %s %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: L2H_TMP directory contains a dot"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: current directory contains a dot"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: command did not succeed: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: image has invalid extension: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: rename %s as %s failed: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "tidak dapat membuka --css-file: %s %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: end of @%s item %d not found"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3153,12 +3309,12 @@ msgstr ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: could not determine the fragment %d for @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3167,47 +3323,47 @@ msgstr ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "tidak dapat membuka --css-file: %s %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "tidak dapat membuka --css-file: %s %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tidak dapat membuka --css-file: %s %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: chdir %s failed: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: unable to return to initial directory: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: output file missing: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: command failed: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: end of @%s item %d not found"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3216,12 +3372,12 @@ msgstr ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: output has no HTML item for @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3230,38 +3386,44 @@ msgstr ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "error menulis ke `%s': %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "aksi `%s' tidak dikenal %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "aksi `%s' tidak dikenal %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "Tidak dapat membuat berkas keluaran `%s'."
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "Mengabaikan nilai TEXINFO_OUTPUT_FORMAT tidak dikenal `%s'.\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, fuzzy, perl-format
+#| msgid "Usage: %s [OPTION]... FILE...\n"
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Penggunaan: %s [OPSI]... BERKAS...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
#, fuzzy
+#| msgid ""
+#| "Translate Texinfo source documentation to various other formats, by "
+#| "default\n"
+#| "Info files suitable for reading online with Emacs or standalone GNU "
+#| "Info.\n"
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3273,8 +3435,26 @@ msgstr ""
"Berkas info yang sesuai untuk pembacaan online dengan Emacs atau standalone "
"GNU Info.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, fuzzy, perl-format
+#| msgid ""
+#| "General options:\n"
+#| " --document-language=STR locale to use in translating Texinfo "
+#| "keywords\n"
+#| " for the output document (default C).\n"
+#| " --error-limit=NUM quit after NUM errors (default %d).\n"
+#| " --force preserve output even if errors.\n"
+#| " --help display this help and exit.\n"
+#| " --no-validate suppress node cross-reference validation.\n"
+#| " --no-warn suppress warnings (but not errors).\n"
+#| " --conf-dir=DIR search also for initialization files in "
+#| "DIR.\n"
+#| " --init-file=FILE load FILE to modify the default behavior.\n"
+#| " -c, --set-customization-variable VAR=VAL set customization variable "
+#| "VAR \n"
+#| " to VAL.\n"
+#| " -v, --verbose explain what is being done.\n"
+#| " --version display version information and exit.\n"
msgid ""
"General options:\n"
" --document-language=STR locale to use in translating Texinfo keywords\n"
@@ -3303,8 +3483,16 @@ msgstr ""
" -v, --verbose jelaskan apa yang sedang dilakukan.\n"
" --version tampilkan informasi versi dan keluar.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
+#| msgid ""
+#| "Output format selection (default is to produce Info):\n"
+#| " --docbook output Docbook XML rather than Info.\n"
+#| " --html output HTML rather than Info.\n"
+#| " --plaintext output plain text rather than Info.\n"
+#| " --xml output Texinfo XML rather than Info.\n"
+#| " --dvi, --dvipdf, --ps, --pdf call texi2dvi to generate given "
+#| "output.\n"
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3320,8 +3508,33 @@ msgstr ""
" --xml keluarkan Texinfo XML daripada Info.\n"
" --plaintext keluarkan plain teks daripada Info.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
#, fuzzy
+#| msgid ""
+#| "General output options:\n"
+#| " -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
+#| " ignoring any @setfilename.\n"
+#| " --no-headers suppress node separators, Node: lines, and "
+#| "menus\n"
+#| " from Info output (thus producing plain "
+#| "text)\n"
+#| " or from HTML (thus producing shorter "
+#| "output).\n"
+#| " Also, if producing Info, write to\n"
+#| " standard output by default \n"
+#| " --no-split suppress any splitting of the output;\n"
+#| " generate only one output file.\n"
+#| " --[no-]number-sections output chapter and sectioning numbers;\n"
+#| " default is on.\n"
+#| " -o, --output=DEST output to DEST.\n"
+#| " With split output, create DEST as a "
+#| "directory\n"
+#| " and put the output files there.\n"
+#| " With non-split output, if DEST is "
+#| "already\n"
+#| " a directory or ends with a /,\n"
+#| " put the output file there.\n"
+#| " Otherwise, DEST names the output file.\n"
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3362,7 +3575,7 @@ msgstr ""
" -o, --output=BERKAS keluarkan ke BERKAS (atau direktori jika split "
"HTML).\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3404,7 +3617,7 @@ msgstr ""
" `asis', jaga indentasi yang sudah ada.\n"
" --split-size=NUM pisah berkas Info di ukuran NUM (baku %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3427,7 +3640,7 @@ msgstr ""
" hasilkan nama berkas dalam transliterasi "
"ASCII.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3435,7 +3648,7 @@ msgstr ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3443,8 +3656,17 @@ msgstr ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
#, fuzzy
+#| msgid ""
+#| "Input file options:\n"
+#| " --commands-in-node-names does nothing, retained for "
+#| "compatibility.\n"
+#| " -D VAR define the variable VAR, as with @set.\n"
+#| " -I DIR append DIR to the @include search path.\n"
+#| " -P DIR prepend DIR to the @include search path.\n"
+#| " -U VAR undefine the variable VAR, as with "
+#| "@clear.\n"
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3462,7 +3684,7 @@ msgstr ""
" -U VAR tidak definisikan variabel VAR, sama dengan "
"@clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3500,7 +3722,7 @@ msgstr ""
"\n"
" Juga, untuk opsi --no-ifFORMAT, jangan proses @ifnotFORMAT teks.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3516,7 +3738,7 @@ msgstr ""
"off;\n"
" jika menghasilkan XML, --ifxml adalah on dan yang lain adalah off.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3545,62 +3767,62 @@ msgstr ""
" makeinfo --no-split foo.texi tulis satu berkas Info walaupun "
"besar\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr "%s: when generating %s, only one input FILE may be specified with -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "--Xopt option without printed output"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "aksi `%s' tidak dikenal"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "ignoring splitting for format %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: hilang argumen berkas.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr "fill_gaps_in_sectioning transformation return no result. No section?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "error menutup berkas keluaran `%s': %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "%s: tidak dapat membuka --css-file: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3608,42 +3830,320 @@ msgstr ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: error on closing %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: mengabaikan keluaran link internal kedua `%s'. %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "Tidak cocok `%cend %s'"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "Salah tempat %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "Tidak cocok `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s membutuhkan sebuah nama"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "Argumen ke @%s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s membutuhkan sebuah nama"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "Argumen ke @%s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s membutuhkan sebuah nama"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "Argumen ke @%s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+"@%s Gunakan kurung untuk memberi sebuah perintah sebagai sebuah argumen ke @"
+"%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr ""
+"Gunakan kurung untuk %s memberi sebuah perintah sebagai sebuah argumen ke @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "Argumen ke @%s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "Argumen ke @%s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "Argumen ke @%s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "Argumen ke @%s: %s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Hanya @%s 10 atau 11 yang didukung, bukan `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "@%s arg harus berupa numerik, bukan `%s'."
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "Argumen ke @%s: %s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "--paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'."
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "Argumen ke @%s: %s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s membutuhkan sebuah argumen: peformat untuk %c item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "Tidak cocok `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "Argumen ke @%s: %s buruk %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "Argumen ke @%s: %s buruk"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "%s: tidak dapat membuka --css-file: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "%s: tidak dapat membuka --css-file: %s %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "@%s after the first element"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s tidak berarti diluar lingkungan `@titlepage'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node precedes @%s, but parts may not be associated with nodes"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s tidak berarti didalam blok `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s tidak berarti didalam blok `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s should only appear in math context"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s tidak berarti diluar lingkunga `@titlepage' dan `@quotation'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s membutuhkan sebuah nama"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "bad or empty @%s formal argument: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s diduga `i' atau `j' sebagai sebuah argumen, bukan `%s'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "opsi tidak terdefinisi: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s sudah ditinggalkan"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s sudah ditinggalkan %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s should only appear in math context"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s without associated character"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s diduga `i' atau `j' sebagai sebuah argumen, bukan `%s'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "Salah tempat %c"
+
+#, c-format
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
#~ msgstr "%s: opsi '--%s' tidak mengijinkan sebuah argumen\n"
+#, c-format
#~ msgid "%s: unrecognized option '--%s'\n"
#~ msgstr "%s: opsi tidak dikenal '--%s'\n"
+#, c-format
#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
#~ msgstr "%s: opsi '-W %s' tidak mengijinkan sebuah argumen\n"
+#, c-format
#~ msgid "%s: option '-W %s' requires an argument\n"
#~ msgstr "%s: opsi '-W %s' membutuhkan sebuah argumen\n"
#~ msgid "Insert this character"
#~ msgstr "Masukan karakter ini"
+#, c-format
#~ msgid "No index entries."
#~ msgstr "Tidak ada masukan indeks."
#~ msgid "CAN'T SEE THIS"
#~ msgstr "TIDAK DAPAT MELIHAT INI"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "* Menu: Nodes whose indices contain `%s':\n"
@@ -3651,18 +4151,23 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ "\n"
#~ "* Menu: Titik yang indices berisi `%s':\n"
+#, c-format
#~ msgid "No index"
#~ msgstr "Tidak ada masukan indeks."
+#, c-format
#~ msgid "Index for `%s'"
#~ msgstr " untuk %s"
+#, c-format
#~ msgid "File names matching `%s'"
#~ msgstr "Tidak cocok `%s'"
+#, c-format
#~ msgid "can't open %s: %s"
#~ msgstr "Tidak dapat menghapus berkas `%s': %s"
+#, c-format
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "debugging output diverted to \"%s\""
@@ -3696,24 +4201,31 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ "Perintah Dasar dalam Jendela Info\n"
#~ "*********************************\n"
+#, c-format
#~ msgid " %-10s Quit this help.\n"
#~ msgstr " %-10s Keluar dari bantuan ini.\n"
+#, c-format
#~ msgid " %-10s Quit Info altogether.\n"
#~ msgstr " %-10s Keluar dari Info sekaligus.\n"
+#, c-format
#~ msgid " %-10s Invoke the Info tutorial.\n"
#~ msgstr " %-10s Menjalankan tutorial Info.\n"
+#, c-format
#~ msgid " %-10s Move to the `next' node of this node.\n"
#~ msgstr " %-10s Pindah ke titik `next' dari titik ini.\n"
+#, c-format
#~ msgid " %-10s Move to the `previous' node of this node.\n"
#~ msgstr " %-10s Pindah ke titik `previous' dari titik ini.\n"
+#, c-format
#~ msgid " %-10s Move `up' from this node.\n"
#~ msgstr " %-10s Pindah `up' dari titik ini.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Pick menu item specified by name.\n"
#~ " Picking a menu item causes another node to be selected.\n"
@@ -3722,21 +4234,27 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ " Memilih sebuah item menu menyebabkan titik lain untuk "
#~ "dipilih.\n"
+#, c-format
#~ msgid " %-10s Follow a cross reference. Reads name of reference.\n"
#~ msgstr " %-10s Ikuti sebuah referensi silang. Baca nama dari referensi.\n"
+#, c-format
#~ msgid " %-10s Move to the last node seen in this window.\n"
#~ msgstr " %-10s Pindah ke titik terakhir yang terlihat di jendela ini.\n"
+#, c-format
#~ msgid " %-10s Skip to next hypertext link within this node.\n"
#~ msgstr " %-10s Lewati ke link hypertext selanjutnya dalam titik ini.\n"
+#, c-format
#~ msgid " %-10s Follow the hypertext link under cursor.\n"
#~ msgstr " %-10s Ikuti link hypertext dibawah kursor.\n"
+#, c-format
#~ msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"
#~ msgstr " %-10s Pindah ke titik `directory'. Sama dengan `g (DIR)'.\n"
+#, c-format
#~ msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n"
#~ msgstr " %-10s Pindah ke titik Top. Sama dengan `g Top'.\n"
@@ -3747,21 +4265,27 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ "Pindah dalam sebuah titik:\n"
#~ "--------------------------\n"
+#, c-format
#~ msgid " %-10s Scroll forward a page.\n"
#~ msgstr " %-10s Scroll kedepan satu halaman.\n"
+#, c-format
#~ msgid " %-10s Scroll backward a page.\n"
#~ msgstr " %-10s Scroll kebelakang satu halaman.\n"
+#, c-format
#~ msgid " %-10s Go to the beginning of this node.\n"
#~ msgstr " %-10s Pergi ke awal dari titik ini.\n"
+#, c-format
#~ msgid " %-10s Go to the end of this node.\n"
#~ msgstr " %-10s Pergi ke akhir dari titik ini.\n"
+#, c-format
#~ msgid " %-10s Scroll forward 1 line.\n"
#~ msgstr " %-10s Scroll kedepan 1 baris.\n"
+#, c-format
#~ msgid " %-10s Scroll backward 1 line.\n"
#~ msgstr " %-10s Scroll kebelakang 1 baris.\n"
@@ -3772,12 +4296,15 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ "Perintah lain:\n"
#~ "--------------\n"
+#, c-format
#~ msgid " %-10s Pick first...ninth item in node's menu.\n"
#~ msgstr " %-10s Pilih pertama...ke sembilan item dalam titik menu.\n"
+#, c-format
#~ msgid " %-10s Pick last item in node's menu.\n"
#~ msgstr " %-10s Pilih item terakhir dalam titik menu.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search for a specified string in the index entries of this Info\n"
#~ " file, and select the node referenced by the first entry "
@@ -3788,6 +4315,7 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ " berkas Info ini, dan pilih titik yang direferensikan oleh "
#~ "masukan pertama yang ditemukan.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Move to node specified by name.\n"
#~ " You may include a filename as well, as in "
@@ -3797,6 +4325,7 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ " Anda boleh memasukan sebuah nama berkas juga, sama dalam "
#~ "(NAMA BERKAS) NAMA TITIK.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search forward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3804,6 +4333,7 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ " %-10s Cari kedepan untuk string yang dispesifikasikan,\n"
#~ " dan pilih titik dimana kejadian selanjutnya ditemukan.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search backward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3811,9 +4341,11 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ " %-10s Cari kebelakang untuk string yang dispesifikasikan,\n"
#~ " dan pilih titik dimana kejadian selanjutnya ditemukan.\n"
+#, c-format
#~ msgid "ESC %s is undefined."
#~ msgstr "ESC %s tidak terdefinisi."
+#, c-format
#~ msgid "%s is defined to %s."
#~ msgstr "%s didefinisikan ke %s."
@@ -3824,24 +4356,31 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ "Memilih titik lain:\n"
#~ "-------------------\n"
+#, c-format
#~ msgid "incorrect number of arguments"
#~ msgstr "jumlah dari argumen tidak benar"
+#, c-format
#~ msgid "cannot open input file `%s'"
#~ msgstr "tidak dapat membuka berkas masukan `%s'"
+#, c-format
#~ msgid "cannot create output file `%s'"
#~ msgstr "tidak dapat membuat berkas keluaran `%s'"
+#, c-format
#~ msgid "error writing to `%s'"
#~ msgstr "error menulis ke `%s'"
+#, c-format
#~ msgid "error closing output file `%s'"
#~ msgstr "error menutup berkas keluaran `%s'"
+#, c-format
#~ msgid "section too long"
#~ msgstr "daerah terlalu panjang"
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INPUT-FILE]\n"
#~ "\n"
@@ -3866,32 +4405,39 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ " --help tampilkan bantuan ini dan keluar.\n"
#~ " --version tampilkan informasi versi dan keluar.\n"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too small"
#~ msgstr "Mengabaikan berkas infokey `%s' tidak valid - terlalu kecil"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too big"
#~ msgstr "Mengabaikan berkas infokey `%s' tidak valid - terlalu besar"
+#, c-format
#~ msgid "Error reading infokey file `%s' - short read"
#~ msgstr "Error membaca berkas infokey `%s' - baca pendek"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
#~ msgstr ""
#~ "Berkas infokey `%s' tidak valid (nomor magik buruk) -- jalankan infokey "
#~ "untuk mengupdatenya"
+#, c-format
#~ msgid "Your infokey file `%s' is out of date -- run infokey to update it"
#~ msgstr ""
#~ "Berkas infokey `%s' anda sudah kadaluarsa -- jalankan infokey untuk "
#~ "mengupdatenya"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
#~ msgstr ""
#~ "Berkas infokey `%s' tidak valid (panjang daerah buruk) -- jalankan "
#~ "infokey untuk mengupdatenya"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
#~ msgstr ""
@@ -3905,6 +4451,7 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ msgstr ""
#~ "Data buruk dalam berkas infokey -- beberapa konfigurasi var diabaikan"
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "Perintah: %s tidak terdefinisi"
@@ -3914,9 +4461,11 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ msgid "No `Prev' for this node."
#~ msgstr "Tidak ada `Prev' untuk titik ini."
+#, c-format
#~ msgid "Kill node (%s): "
#~ msgstr "Bunuh titik (%s): "
+#, c-format
#~ msgid "Cannot kill node `%s'"
#~ msgstr "Tidak dapat membunuh titik `%s'"
@@ -3926,27 +4475,33 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ msgid "Kill this node"
#~ msgstr "Bunuh titik ini"
+#, c-format
#~ msgid "writing file %s"
#~ msgstr "Menulis titik %s..."
+#, c-format
#~ msgid "closing file %s"
#~ msgstr "error menutup berkas keluaran `%s'"
#~ msgid "Internally used by \\[universal-argument]"
#~ msgstr "Secara internal digunakan oleh \\[argumen-universal]"
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: Kehabisan memori virtual!\n"
#~ msgid "--*** Tags out of Date ***"
#~ msgstr "--*** Tags sudah kadaluarsa ***"
+#, c-format
#~ msgid "-%s---Info: %s, %d lines --%s--"
#~ msgstr "-%s---Info: %s, %d baris --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
#~ msgstr "--%s%s-Info: (%s)%s, %d baris --%s--"
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr " Subfile: %s"
@@ -3956,18 +4511,44 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ msgid "arguments are quoted by default"
#~ msgstr "@quote-arg sudah ditinggalkan; argumen telah diquote secara baku"
+#~ msgid "no node to be renamed"
+#~ msgstr "no node to be renamed"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "nodes without a new name at the end of file"
+
+#, perl-format
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Set variabel: %s\n"
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "Tidak ada `%s' untuk titik ini didalam dokumen ini."
+
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "titik `%s' tidak tereferensi"
+
+#, perl-format
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "target node (new name for `%s') not in document: %s"
+
+#, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "error on closing renamed node redirection file %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "empty node name"
+
+#, perl-format
#~ msgid "@%s should only appear at beginning or end of document"
#~ msgstr "@%s should only appear at beginning or end of document"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s should not be associated with @top"
-
+#, perl-format
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s Set variabel: %s\n"
+#, perl-format
#~ msgid "obsolete variable %s\n"
#~ msgstr "Set variabel: %s\n"
@@ -3983,15 +4564,18 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ msgid "send output to FILE"
#~ msgstr "kirim keluaran ke BERKAS"
+#, c-format
#~ msgid "Generate a sorted index for each TeX output FILE.\n"
#~ msgstr "Buat sebuah indeks terurut untuk setiap BERKAS keluaran Tex.\n"
+#, c-format
#~ msgid ""
#~ "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
#~ msgstr ""
#~ "Biasanya BERKAS... dispesifikasikan sebagai `foo.%c%c' untuk sebuah "
#~ "dokumen `foo.texi'.\n"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "Options:\n"
@@ -3999,15 +4583,19 @@ msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
#~ "\n"
#~ "Opsi:\n"
+#, c-format
#~ msgid "failure reopening %s"
#~ msgstr "gagal membuka kembali %s"
+#, c-format
#~ msgid "%s: not a texinfo index file"
#~ msgstr "%s: bukan sebuah berkas indeks texinfo"
+#, c-format
#~ msgid "No page number in %s"
#~ msgstr "Tidak ada nomor halaman dalam %s"
+#, c-format
#~ msgid "entry %s follows an entry with a secondary name"
#~ msgstr "masukan %s mengikuti sebuah masukan dengan nama cadangan"
diff --git a/macros/texinfo/texinfo/po/insert-header.sin b/macros/texinfo/texinfo/po/insert-header.sin
index b26de01f6c..ceeebb937a 100644
--- a/macros/texinfo/texinfo/po/insert-header.sin
+++ b/macros/texinfo/texinfo/po/insert-header.sin
@@ -1,5 +1,10 @@
# Sed script that inserts the file called HEADER before the header entry.
#
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Written by Bruno Haible <bruno@clisp.org>, 2001.
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to use, copy, distribute, and modify it.
+#
# At each occurrence of a line starting with "msgid ", we execute the following
# commands. At the first occurrence, insert the file. At the following
# occurrences, do nothing. The distinction between the first and the following
diff --git a/macros/texinfo/texinfo/po/it.gmo b/macros/texinfo/texinfo/po/it.gmo
index 7883bc8639..c41129bcb7 100644
--- a/macros/texinfo/texinfo/po/it.gmo
+++ b/macros/texinfo/texinfo/po/it.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/it.po b/macros/texinfo/texinfo/po/it.po
index b8333a3369..5d7ed6fcef 100644
--- a/macros/texinfo/texinfo/po/it.po
+++ b/macros/texinfo/texinfo/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 5.1.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2013-09-20 13:31+0200\n"
"Last-Translator: Francesco Groccia <frgroccia@gmail.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -24,26 +24,31 @@ msgstr "Errore di sistema sconosciuto"
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option '-W %s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: l'opzione «-W %s» è ambigua\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: l'opzione «%s» è ambigua; possibilità:"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: opzione non riconosciuta «%c%s»\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: l'opzione «%c%s» non accetta argomenti\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: l'opzione «%s» richiede un argomento\n"
@@ -87,6 +92,7 @@ msgstr "Riferimento indietro non valido"
#: gnulib/lib/regcomp.c:156
#, fuzzy
+#| msgid "Unmatched [ or [^"
msgid "Unmatched [, [^, [:, [., or [="
msgstr "[ o [^ non accoppiate"
@@ -242,7 +248,6 @@ msgid "Insert completion"
msgstr "Inserisci completamento"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Creazione dei completamenti..."
@@ -266,7 +271,6 @@ msgid "found file %s"
msgstr "file %s trovato"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Le note a piè di pagina non possono essere visualizzate"
@@ -280,7 +284,6 @@ msgid "---------- Footnotes ----------"
msgstr "---- Note a piè di pagina ----"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Ricerca delle voci dell'indice..."
@@ -289,7 +292,8 @@ msgid "Look up a string in the index for this file"
msgstr "Cerca un testo nell'indice di questo file"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "Nessun indice trovato."
@@ -298,12 +302,12 @@ msgid "Index entry: "
msgstr "Voce dell'indice: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Nessun indice trovato."
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr ""
"«%s» trovato in %s. «\\[next-index-match]» tenta di cercare il prossimo."
@@ -318,22 +322,26 @@ msgstr ""
"«\\[index-search]»"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "Nessun precedente testo di ricerca dell'indice."
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No more index entries containing `%s'."
msgid "No more index entries containing '%s'"
msgstr "Nessun'altra voce dell'indice contiene «%s»."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "No index entries containing '%s'"
msgstr "Nessuna voce dell'indice contiene «%s»."
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of `%s'..."
msgid "Scanning indices of '%s'..."
msgstr "Scansione indici di «%s»..."
@@ -343,11 +351,13 @@ msgstr "Trova un testo in tutti i file Info disponibili e genera il menù"
#: info/indices.c:654 info/indices.c:656
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index apropos"
msgstr "Apropos indice: "
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "Index entries containing '%s':\n"
msgstr "Nessuna voce dell'indice contiene «%s»."
@@ -366,36 +376,39 @@ msgstr "Elenca tutte le occorrenze di una stringa nell'indice"
#: info/indices.c:889 info/indices.c:891
#, fuzzy
+#| msgid "Index topic: "
msgid "Index topic"
msgstr "Argomento indice: "
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "No index entries containing '%s'."
msgstr "Nessuna voce dell'indice contiene «%s»."
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have `%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "Nessun file Info disponibile ha «%s» negli indici."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "Nessuna voce di menù «%s» nel nodo «%s»."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr "Impossibile trovare il nodo «%s»."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -424,7 +437,7 @@ msgstr "il valore %s non è valido per la variabile %s"
msgid "Try --help for more information.\n"
msgstr "Usare «--help» per maggiori informazioni.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -441,6 +454,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "nessuna voce dell'indice trovata per «%s»\n"
@@ -457,6 +471,14 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -a, --all use all matching manuals.\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILE remember user keystrokes in FILENAME.\n"
+#| " -f, --file=MANUAL specify Info manual to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -476,6 +498,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILE output selected nodes to FILE."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -495,12 +522,22 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr ""
" -b, --speech-friendly compatibilità con il sintetizzatore vocale."
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --strict-node-location (for debugging) use Info file pointers as-"
+#| "is.\n"
+#| " --subnodes recursively output menu items.\n"
+#| " -v, --variable VAR=VALUE assign VALUE to Info variable VAR.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file.\n"
+#| " -x, --debug=NUMBER set debugging level (-1 for all).\n"
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -520,6 +557,14 @@ msgstr ""
#: info/info.c:1122
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The first non-option argument, if present, is the menu entry to start "
+#| "from;\n"
+#| "it is searched for in all `dir' files along INFOPATH.\n"
+#| "If it is not present, info merges all `dir' files and shows the result.\n"
+#| "Any remaining arguments are treated as the names of menu\n"
+#| "items relative to the initial node visited."
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -539,6 +584,9 @@ msgstr ""
#: info/info.c:1129
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "For a summary of key bindings, type h within Info."
msgid ""
"\n"
"For a summary of key bindings, type H within Info."
@@ -549,6 +597,19 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers start at buffers node within emacs manual\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -578,7 +639,7 @@ msgstr ""
" info -f ./foo.info mostra il file «./foo.info» senza cercare la "
"cartella"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -590,6 +651,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "Impossibile trovare il nodo «(%s)%s»."
@@ -603,61 +665,73 @@ msgstr "Il cursore non appare nel nodo di questa finestra!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "Impossibile eliminare l'ultima finestra."
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "Nessun menù in questo nodo."
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "Nessun piè di pagina in questo nodo."
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "Nessun riferimento incrociato in questo nodo."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "Nessun puntatore a «%s» per questo nodo."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "Comando Info «%c» sconosciuto; usare «?» per l'aiuto."
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "Il tipo di terminale «%s» non è in grado di avviare il programma Info."
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "Sei già all'ultima pagina di questo nodo."
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "Questa è già la prima pagina del nodo corrente."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "Solo una finestra."
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "La finestra risultante sarebbe troppo piccola."
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr ""
"Non c'è abbastanza spazio per visualizzare una finestra di aiuto. Eliminare "
@@ -747,6 +821,7 @@ msgstr "\\%-10[top-node] Vai al nodo superiore di questo documento.\n"
#: info/infodoc.c:61
#, fuzzy
+#| msgid "\\%-10[dir-node] Go to the main `directory' node.\n"
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
msgstr "\\%-10[dir-node] Vai al nodo principale o «cartella».\n"
@@ -848,6 +923,7 @@ msgstr "Visualizza il messaggio di aiuto"
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "Visita il nodo Info «(info)Help»"
@@ -862,6 +938,7 @@ msgstr "Descrizione della chiave: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s non è stato definito."
@@ -875,41 +952,43 @@ msgstr "Dov'è il comando: "
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "«%s» non è su alcun tasto"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s può essere invocato solo mediante %s."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s può essere invocato mediante %s."
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr "Non esiste una funzione di nome «%s»"
#: info/infomap.c:585
#, fuzzy, c-format
+#| msgid "could not read init file %s"
msgid "could not open init file %s"
msgstr "impossibile leggere il file di inizializzazione %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "sequenza di tasti troppo lunga"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "sequenza di tasti mancante"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "carattere NUL (\\000) non permesso"
@@ -919,12 +998,12 @@ msgid "NUL character (^%c) not permitted"
msgstr "carattere NUL (^%c) non permesso"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "nome dell'azione assente"
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "key sequence too long"
msgid "cannot bind key sequence to menu-digit"
msgstr "sequenza di tasti troppo lunga"
@@ -934,7 +1013,6 @@ msgid "unknown action `%s'"
msgstr "azione «%s» sconosciuta"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nome azione troppo lungo"
@@ -944,22 +1022,18 @@ msgid "extra characters following action `%s'"
msgstr "caratteri in più dopo il nome dell'azione «%s»"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "nome variabile assente"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "carattere «=» assente dopo il nome della variabile"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nome variabile troppo lungo"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "valore troppo lungo"
@@ -981,7 +1055,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Leggi il nome di un comando nell'area echo ed eseguilo"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an `echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "Impossibile eseguire un comando «echo-area» qui."
@@ -1012,6 +1087,11 @@ msgstr "Il file %s non può essere manipolato.\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -1026,6 +1106,9 @@ msgstr ""
#: info/nodemenu.c:185
#, fuzzy
+#| msgid ""
+#| "Here is the menu of nodes you have recently visited.\n"
+#| "Select one from this menu, or use `\\[history-node]' in another window.\n"
msgid ""
"Here is the menu of nodes you have recently visited.\n"
"Select one from this menu, or use '\\[history-node]' in another window.\n"
@@ -1067,7 +1150,6 @@ msgid "Show all matching files"
msgstr "Mostra tutti i file corrispondenti"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Nessun file indice"
@@ -1076,6 +1158,9 @@ msgstr "Nessun file indice"
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1220,6 +1305,8 @@ msgstr "Seleziona questa voce di menù"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There isn't %d item in this menu."
+#| msgid_plural "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "Non c'è %d voce in questo menù."
@@ -1249,6 +1336,7 @@ msgstr "Segui collegamento: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "Il riferimento è scomparso! (%s)."
@@ -1284,11 +1372,13 @@ msgstr "Seleziona il riferimento o la voce di menù in questa riga"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr "Nessun menù nel nodo «%s»."
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "Impossibile trovare il nodo referenziato da «%s» in «%s»."
@@ -1326,11 +1416,13 @@ msgstr "Seleziona il primo nodo in questo file"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "Nessun altro nodo in questo documento."
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "Questo nodo non contiene nessun «Prev» o «Up» in questo documento."
@@ -1369,11 +1461,13 @@ msgstr "Cerca pagina di manuale: "
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "Seleziona il nodo «Principale» in questo file"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "Seleziona il nodo «(dir)»"
@@ -1386,7 +1480,6 @@ msgid "Select the most recently selected node"
msgstr "Seleziona il nodo selezionato più recentemente"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1400,11 +1493,13 @@ msgstr "Cerca un file: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr "Impossibile trovare «%s»."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr "Impossibile creare il file «%s»."
@@ -1429,6 +1524,7 @@ msgstr "Incanala i contenuti di questo nodo mediante INFO_PRINT_COMMAND"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr "Impossibile incanalare su «%s»."
@@ -1447,22 +1543,26 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Attiva o disattiva l'uso delle espressioni regolari nelle ricerche"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Using regular expressions for searches"
msgstr "Usa le espressioni regolari nelle ricerche."
#: info/session.c:3909
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches."
msgid "Using literal strings for searches"
msgstr "Usa il testo letterale nelle ricerche."
#: info/session.c:4112
#, fuzzy
+#| msgid "Search continued from the end of the document."
msgid "Search continued from the end of the document"
msgstr "Ricerca continuata a partire dalla fine del documento."
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the beginning of the document."
msgid "Search continued from the beginning of the document"
msgstr "Ricerca continuata a partire dall'inizio del documento."
@@ -1471,8 +1571,9 @@ msgstr "Ricerca continuata a partire dall'inizio del documento."
msgid "Searching subfile %s ..."
msgstr "Cerca il subfile %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "Ricerca fallita."
@@ -1499,6 +1600,7 @@ msgstr " indietro"
#: info/session.c:4198
#, fuzzy, c-format
+#| msgid "%s%s%s [%s]: "
msgid "%s%s%s: "
msgstr "%s%s%s [%s]: "
@@ -1506,141 +1608,145 @@ msgstr "%s%s%s [%s]: "
msgid "Search string too short"
msgstr "Stringa di ricerca troppo breve"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "No match"
msgid "No more matches"
msgstr "Nessuna corrispondenza"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "Cerca il subfile %s ..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Leggi e cerca un testo (distinguendo le lettere maiuscole/minuscole)"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Leggi e cerca un testo"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Leggi un testo e cerca all'indietro"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Ripeti l'ultima ricerca nella stessa direzione"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Nessun testo di ricerca precedente"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Ripeti l'ultima ricerca nella direzione opposta"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Cerca interattivamente un testo durante la digitazione"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Ricerca incrementale all'indietro mediante espressione regolare: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Ricerca incrementale all'indietro: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Ricerca incrementale mediante espressione regolare: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Ricerca incrementale: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Fallita "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Annulla l'operazione corrente"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Esci"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "mostra le informazioni di versione ed esce"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Ridisegna lo schermo"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Esci dal programma Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Esegui il comando associato alla variante minuscola di questo tasto"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "Comando sconosciuto (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" non è valido"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "`%s' is invalid"
msgid "'%s' is invalid"
msgstr "«%s» non è valido"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Aggiungi questa cifra all'argomento numerico attuale"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Inizia (o moltiplica per quattro) l'argomento numerico attuale"
@@ -1733,6 +1839,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "Vai al riferimento incrociato successivo"
@@ -1837,6 +1944,17 @@ msgstr ""
#: install-info/install-info.c:552
#, fuzzy
+#| msgid ""
+#| " --debug report what is being done.\n"
+#| " --delete delete existing entries for INFO-FILE from DIR-"
+#| "FILE;\n"
+#| " don't insert any new entries.\n"
+#| " --description=TEXT the description of the entry is TEXT; used with\n"
+#| " the --name option to become synonymous with the\n"
+#| " --entry option.\n"
+#| " --dir-file=NAME specify file name of Info directory file;\n"
+#| " equivalent to using the DIR-FILE argument.\n"
+#| " --dry-run same as --test."
msgid ""
" --debug report what is being done.\n"
" --delete delete existing entries for INFO-FILE from DIR-FILE;\n"
@@ -1917,6 +2035,21 @@ msgstr ""
#: install-info/install-info.c:590
#, fuzzy
+#| msgid ""
+#| " --regex=R put this file's entries in all sections that match "
+#| "the\n"
+#| " regular expression R (ignoring case).\n"
+#| " --remove same as --delete.\n"
+#| " --remove-exactly only remove if the info file name matches exactly;\n"
+#| " suffixes such as .info and .gz are not ignored.\n"
+#| " --section=SEC put entries in section SEC of the directory.\n"
+#| " If you specify more than one section, all the "
+#| "entries\n"
+#| " are added in each of the sections.\n"
+#| " If you don't specify any sections, they are "
+#| "determined\n"
+#| " from information in the Info file itself.\n"
+#| " --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1964,6 +2097,23 @@ msgstr ""
#: install-info/install-info.c:639
#, fuzzy, c-format
+#| msgid ""
+#| "This is the file .../info/dir, which contains the\n"
+#| "topmost node of the Info hierarchy, called (dir)Top.\n"
+#| "The first time you invoke Info you start off looking at this node.\n"
+#| "%c\n"
+#| "%s\tThis is the top of the INFO tree\n"
+#| "\n"
+#| " This (the Directory node) gives a menu of major topics.\n"
+#| " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+#| " \"h\" gives a primer for first-timers,\n"
+#| " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+#| "\n"
+#| " In Emacs, you can click mouse button 2 on a menu item or cross "
+#| "reference\n"
+#| " to select it.\n"
+#| "\n"
+#| "%s\n"
msgid ""
"This is the file .../info/dir, which contains the\n"
"topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -2007,12 +2157,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: impossibile leggere (%s) e creare (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY senza la corrispondente END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY senza la corrispondente START-INFO-DIR-ENTRY"
@@ -2042,19 +2190,18 @@ msgid "excess command line argument `%s'"
msgstr "troppi argomenti sulla riga di comando «%s»"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Nessun file in entrata specificato; usare «--help» per maggiori informazioni."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"File di indice non specificato; usare «--help» per maggiori informazioni."
#: install-info/install-info.c:2301
#, fuzzy, c-format
+#| msgid "could not read %s: %s"
msgid "Could not read %s."
msgstr "impossibile leggere %s: %s"
@@ -2068,309 +2215,267 @@ msgstr "nessuna voce dell'indice in «%s»"
msgid "no entries found for `%s'; nothing deleted"
msgstr "nessuna voce trovata per «%s»; nulla da eliminare"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "impossibile aprire %s per la scrittura: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s non è un codice di lingua valido"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s non è un codice di regione valido"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s non è una valida possibilità di divisione"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "impossibile leggere %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "errore durante la chiusura del file @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: impossibile trovare %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "nessun nodo da rinominare"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "nodi senza un nuovo nome alla fine del file"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "impossibile aprire %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "impossibile proteggere il carattere hash in @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "nome del nodo vuoto dopo l'espansione «%s»"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s «%s» già definita precedentemente"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "ecco la definizione precedente come @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "argomento vuoto in @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "errore durante la chiusura di %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "impossibile creare le directory «%s» o «%s»: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "impossibile creare le directory «%s»: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "file @image «%s» non trovato, verrà usato «%s»"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
+#| msgid "No node name specified for `%c%s' command"
msgid "no argument specified for @U"
msgstr "Nessun nome di nodo specificato per il comando «%c%s»"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "file immagine «%s» (per il formato HTML) non trovato, verrà usato «%s»"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "il formato grezzo %s non è convertito"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
"impossibile aprire il file di configurazione dei riferimenti HTML %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "tipo mancante"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "tipo non riconosciuto: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr ""
"errore durante la chiusura del file di configurazione dei riferimenti HTML "
"%s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "stringa non chiusa nel file CSS"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "l'opzione «--css-include» termina con un commento"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import non terminato nel file CSS"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "file CSS %s non trovato"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "impossibile aprire --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "errore durante la chiusura del file CSS %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "nessuna voce htmlxref.cnf trovata per «%s»"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "errore durante la chiusura del file frame %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "errore durante la chiusura del file TOC frame %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "gestore %s dello stage %s con priorità %s fallito"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "è necessario specificare un titolo con un comando «title» o @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "errore durante la chiusura del file del nodo di redirezione %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "il vecchio nome per «%s» è un nodo del documento"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "file vuoto per il nodo rinominato «%s»"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "il nodo di riferimento (nuovo nome per «%s») non è nel documento: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "errore durante la chiusura del file dei nodi rinominato %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "nome del nodo vuoto"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "sintassi per un nodo esterno usata per «%s»"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "documento senza nodi"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "documento senza il nodo «Top»"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "rinomina di %s fallita: %s"
# # non ancora tradotta
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, fuzzy, perl-format
msgid "@%s output more than once: %s"
msgstr "output di @%s %s più di una volta"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s non presente in alcun nodo"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "il nome @node non dovrebbe contenere «,»: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "voce per l'indice «%s» non presente in alcun nodo"
# # non ancora tradotta
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
msgid "error on closing image text file %s: %s"
msgstr "errore durante la chiusura del file testo dell'immagine %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "file @image «%s» non leggibile: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "impossibile trovare il file @image «%s.txt» né testo alternativo"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2378,308 +2483,337 @@ msgstr ""
"@strong{Nota...} produce un riferimento falso; riscrivilo per evitare che "
"non succeda"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "nome del riferimento incrociato @%s non dovrebbe contenere «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "il nome del nodo @%s non dovrebbe contenere «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "il nome del nodo @%s non dovrebbe contenere «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "«.» o «,» devono seguire @xref, non %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "«.» o «,» devono seguire @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "il nome del nodo della voce del menù non dovrebbe contenere «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "il nome del nodo della voce del menù non dovrebbe contenere «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "il nome della voce del menù non dovrebbe contenere «:»"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "impossibile aprire %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "@%s multiplo"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "argomento formale @%s errato o vuoto: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "sintassi errata per l'argomento @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s richiede un nome"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "nome errato per @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s visto prima delle parentesi di chiusura @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s visto prima delle parentesi di chiusura @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s parentesi di chiusura mancante"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "sequenza di delimitazione di chiusura mancante in @%s: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx non dovrebbe iniziare @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx deve seguire @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s ha testo ma non @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr ""
"«@end» si aspettava il carattere «%s», ma è stato letto il carattere «%s»"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s visto prima di @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "nessun corrispondente «%cend %s»"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "%c fuori luogo"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "«%c%s» senza corrispondenza"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "macro «%s» chiamata con troppi argomenti"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
+#| msgid "@%s missing close brace"
msgid "@%s missing closing brace"
msgstr "@%s parentesi di chiusura mancante"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr ""
"la macro «%s» dichiarata senza argomenti è stata chiamata con un argomento"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ nell'espansione della macro @%s seguita da «%s» anziché dal nome del "
"parametro oppure \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "nome mancante per @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "categoria mancante per @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "argomento inaspettato nella riga @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "multitabella vuota"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "argomento superfluo per @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "argomento errato per @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s richiede un argomento: formattatore per %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"il comando @%s che non accetta argomento in parentesi graffe, non dovrebbe "
"essere sulla riga @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr ""
"il comando per accentare «@%s» non è stato accettato come argomento @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "argomento mancante per @%s"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "@end %s sconosciuto"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "argomento superfluo per @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "argomento errato per @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: impossibile aprire %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "la codifica «%s» non è una codifica texinfo canonica"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "il nome «%s» non corrisponde ad alcun nome di codifica"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s dopo il primo elemento"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s ha senso solo su una riga @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@%s should not be associated with @top"
+msgid "@part should not be associated with @top"
+msgstr "@%s non dovrebbe essere associato con @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
"@node precede @%s, ma alcune parti potrebbero non essere associati con dei "
"nodi"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "sintassi per un nodo esterno usata per «%s»"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "nome della voce del menù vuoto in «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "nome nodo vuoto nella voce di menù"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s non dovrebbe apparire in @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "@end %s should only appear at a line beginning"
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s dovrebbe apparire solo a inizio riga"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro «%s» già definita precedentemente"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ecco la definizione precedente di «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "ridefinizione del comando del linguaggio Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s senza carattere associato"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s definito con zero o più di un argomento dovrebbe essere invocato con {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2687,349 +2821,367 @@ msgstr ""
"troppe chiamate a macro annidate (impostare MAX_NESTED_MACROS per ignorare; "
"valore attuale %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"chiamata ricorsiva della macro %s non accettata; usare @rmacro se necessario"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "il comando per accentare «@%s» non deve essere seguito da spazi"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "usa le parentesi graffe per dare un comando come argomento a @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s si aspettava «i» o «j» come argomento, non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
"il comando per accentare «@%s» non deve essere seguito da una nuova riga"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s si aspettava le parentesi graffe"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "comando «%s» sconosciuto"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "indicatore non definito: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "sintassi errata per @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s è obsoleto."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s è obsoleto; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear at a line beginning"
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s dovrebbe apparire solo a inizio riga"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s dovrebbe apparire solo in intestazione o a piè di pagina"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s è privo di significato all'interno del blocco «@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s nella multitabella vuota"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab prima di @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "troppe colonne nell'elemento multitabella (massimo %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignora @tab fuori della multitabella"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s fuori da tabella o lista"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s non accettato all'interno del blocco «@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear in math context"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s dovrebbe apparire solo in contesti matematici"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "deve essere dopo «@%s» per usare «@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
"@%s è privo di significato al difuori degli ambienti «@titlepage» e "
"«@quotation»"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory dopo il primo nodo"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "regione %s all'interno della regione %s non permessa"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry dopo il primo nodo"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s visto prima del primo @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"forse, il nodo @top dovrebbe essere sotto un blocco @ifnottex piuttosto che "
"sotto @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s dovrebbe apparire solo in contesti matematici"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s dovrebbe apparire solo in contesti matematici"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "@ inaspettato"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s non è significativo al difuori dell'ambiente «@float»"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s dovrebbe essere subito sotto «@float»"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "@%s multipli ignorati"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "il comando @%s non accetta argomenti"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "nodo o argomento manuale esterno mancante per il comando @%s"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "nome del riferimento incrociato vuoto in @%s dopo l'espansione «%s»"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "titolo del riferimento incrociato vuoto in @%s dopo l'espansione «%s»"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image non ha riferimento ad alcun file"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "primo argomento mancante per @%s"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, fuzzy, c-format, perl-format
+#| msgid "bad argument to @%s: %s"
msgid "non-hex digits in argument for @U: %s"
msgstr "argomento errato per @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "argomenti superflui per il nodo"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "si aspettava @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s dovrebbe accettare solo un @-comando come argomento, non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "argomento restante sulla riga @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "comando d'ambiente %s come argomento per @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "@%s vuoto"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "la frazione di colonna non è un numero: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "l'argomento @sp deve essere un numero, non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "nome indice %s riservato"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "indice sorgente sconosciuto in @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "indice di destinazione sconosciuto in @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s porta %s a unirsi in se stesso, ignorato"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "indice «%s» sconosciuto in @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, fuzzy, c-format, perl-format
+#| msgid "printing an index `%s' merged in another one `%s'"
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "stampa di un indice «%s» unito in un altro indice «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex prima dell'inizio del documento: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "l'argomento @%s deve essere «top» o «bottom», non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Solo @%s \"10\" o \"11\" è supportata, non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "l'argomento @%s deve essere «separate» o «end», non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "l'argomento @%s deve essere «on», «off» oppure «odd», non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"l'argomento @paragraphindent deve essere numerico/«none»/«asis», non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"l'argomento @firstparagraphindent deve essere «none» o «insert», non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "l'argomento @exampleindent deve essere numerico/«asis», non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "si aspettava la lettura @%s \"on\" oppure \"off\", non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"l'argomento @kbdinputstyle deve essere «code»/«example»/«distinct», non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "l'argomento @allowcodebreaks deve essere «true» o «false», non «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"l'argomento @urefbreakstyle deve essere «after»/«before»/«none», non «%s»"
@@ -3058,10 +3210,11 @@ msgstr "nessun comando di sezionamento associato con @%s"
#: tp/Texinfo/Structuring.pm:329
#, fuzzy, perl-format
+#| msgid "@%s in empty multitable"
msgid "@%s not empty"
msgstr "@%s nella multitabella vuota"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s si riferisce al nodo inesistente «%s»"
@@ -3071,107 +3224,107 @@ msgstr "%s si riferisce al nodo inesistente «%s»"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s nome del nodo della voce di menù «%s» diverso dal nome %s «%s»"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nodo «%s» non referenziato"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "il nodo «%s» è %s per «%s» nel sezionamento, ma non nel menù"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "i nodi %s «%s» nel menù «%s» e nel sezionamento «%s» sono diversi"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "il nodo «%s» è %s per «%s» nel menù, ma non nel sezionamento"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "il puntatore %s «%s» (per il nodo «%s») è diverso dal nome %s «%s»"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s si riferisce all'inesistente «%s»"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"il nodo «%s» non ha alcuna voce di menù per «%s», nonostante sia destinata "
"ad «Up»"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "per «%s», «Up» nel menù «%s» e «%s» «Up» non coincidono"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s a «%s», diverso dal nome %s «%s»"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "chiave indice vuota in @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: impossibile aprire %s per la scrittura: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: errore durante la chiusura di %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: impossibile aprire il file latex %s per la scrittura: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: la directory L2H_TMP contiene un punto"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: la directory corrente contiene un punto"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: comando non riuscito: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: l'immagine ha un'estensione non valida: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: rinomina di %s come %s fallita: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: impossibile aprire %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: fine dell'elemento @%s %d non trovata"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3180,12 +3333,12 @@ msgstr ""
"latex2html.pm: l'elaborazione ha prodotto %d voci in HTML; si aspettava %d, "
"il numero di voci trovate nel documento"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: impossibile determinare il frammento %d per @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3194,47 +3347,47 @@ msgstr ""
"l2h: impossibile estrarre il frammento %d per @%s con il contatore "
"dell'output %d dall'HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: impossibile caricare %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: impossibile aprire %s per la scrittura: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: impossibile aprire %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: chdir di %s fallita: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: impossibile ritornare alla directory iniziale: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: file output mancante: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: comando fallito: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: fine dell'elemento @%s %d non trovata"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3243,12 +3396,12 @@ msgstr ""
"tex4ht.pm: l'elaborazione ha prodotto %d voci in HTML; si aspettava %d, il "
"numero di voci trovate nel documento per @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: l'output non ha nessuna voce HTML per @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3257,38 +3410,44 @@ msgstr ""
"tex4ht.pm: l'elaborazione ha recuperato %d voci in HTML; si aspettava %d, il "
"numero di voci trovate nel documento per @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "errore durante il caricamento di %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: variabile %s sconosciuta"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: variabile %s sconosciuta\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "impossibile leggere il file di inizializzazione %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "ignora il valore sconosciuto di TEXINFO_OUTPUT_FORMAT «%s»\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, fuzzy, perl-format
+#| msgid "Usage: %s [OPTION]... FILE...\n"
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uso: %s [OPZIONE]... FILE...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
#, fuzzy
+#| msgid ""
+#| "Translate Texinfo source documentation to various other formats, by "
+#| "default\n"
+#| "Info files suitable for reading online with Emacs or standalone GNU "
+#| "Info.\n"
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3300,8 +3459,26 @@ msgstr ""
"per impostazione predefinita i file Info sono adatti alla lettura con Emacs\n"
"oppure con GNU Info.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, fuzzy, perl-format
+#| msgid ""
+#| "General options:\n"
+#| " --document-language=STR locale to use in translating Texinfo "
+#| "keywords\n"
+#| " for the output document (default C).\n"
+#| " --error-limit=NUM quit after NUM errors (default %d).\n"
+#| " --force preserve output even if errors.\n"
+#| " --help display this help and exit.\n"
+#| " --no-validate suppress node cross-reference validation.\n"
+#| " --no-warn suppress warnings (but not errors).\n"
+#| " --conf-dir=DIR search also for initialization files in "
+#| "DIR.\n"
+#| " --init-file=FILE load FILE to modify the default behavior.\n"
+#| " -c, --set-customization-variable VAR=VAL set customization variable "
+#| "VAR \n"
+#| " to VAL.\n"
+#| " -v, --verbose explain what is being done.\n"
+#| " --version display version information and exit.\n"
msgid ""
"General options:\n"
" --document-language=STR locale to use in translating Texinfo keywords\n"
@@ -3340,8 +3517,16 @@ msgstr ""
" -v, --verbose spiega cosa sta facendo.\n"
" --version mostra le informazioni di versione ed esce.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
+#| msgid ""
+#| "Output format selection (default is to produce Info):\n"
+#| " --docbook output Docbook XML rather than Info.\n"
+#| " --html output HTML rather than Info.\n"
+#| " --plaintext output plain text rather than Info.\n"
+#| " --xml output Texinfo XML rather than Info.\n"
+#| " --dvi, --dvipdf, --ps, --pdf call texi2dvi to generate given "
+#| "output.\n"
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3359,8 +3544,33 @@ msgstr ""
" --dvi, --dvipdf, --ps, --pdf chiama texi2dvi per generare l'output "
"passato.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
#, fuzzy
+#| msgid ""
+#| "General output options:\n"
+#| " -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
+#| " ignoring any @setfilename.\n"
+#| " --no-headers suppress node separators, Node: lines, and "
+#| "menus\n"
+#| " from Info output (thus producing plain "
+#| "text)\n"
+#| " or from HTML (thus producing shorter "
+#| "output).\n"
+#| " Also, if producing Info, write to\n"
+#| " standard output by default \n"
+#| " --no-split suppress any splitting of the output;\n"
+#| " generate only one output file.\n"
+#| " --[no-]number-sections output chapter and sectioning numbers;\n"
+#| " default is on.\n"
+#| " -o, --output=DEST output to DEST.\n"
+#| " With split output, create DEST as a "
+#| "directory\n"
+#| " and put the output files there.\n"
+#| " With non-split output, if DEST is "
+#| "already\n"
+#| " a directory or ends with a /,\n"
+#| " put the output file there.\n"
+#| " Otherwise, DEST names the output file.\n"
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3413,7 +3623,7 @@ msgstr ""
" Altrimenti, DEST dà il nome al file\n"
" di output.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3456,7 +3666,7 @@ msgstr ""
" --split-size=NUM genera un documento multipagina di dimensioni "
"NUM (predefinito %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3484,7 +3694,7 @@ msgstr ""
" ancore; in modo predefinito\n"
" è abilitato solo con l'opzione «--split».\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3492,7 +3702,7 @@ msgstr ""
"Opzioni per XML e Docbook:\n"
" --output-indent=VAL non fare nulla, mantenuto per compatibilità.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3500,8 +3710,17 @@ msgstr ""
"Opzioni per DVI/PS/PDF:\n"
" --Xopt=OPZ passa OPZ a texi2dvi; può essere ripetuto.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
#, fuzzy
+#| msgid ""
+#| "Input file options:\n"
+#| " --commands-in-node-names does nothing, retained for "
+#| "compatibility.\n"
+#| " -D VAR define the variable VAR, as with @set.\n"
+#| " -I DIR append DIR to the @include search path.\n"
+#| " -P DIR prepend DIR to the @include search path.\n"
+#| " -U VAR undefine the variable VAR, as with "
+#| "@clear.\n"
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3522,7 +3741,7 @@ msgstr ""
" -U VAR rimuovi la definizione della variabile VAR, "
"simile a @clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3560,7 +3779,7 @@ msgstr ""
"\n"
" Inoltre, per le opzioni «--no-ifFORMAT» elebora il testo @ifnotFORMAT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3577,7 +3796,7 @@ msgstr ""
" se è testo semplice, --ifplaintext è attiva e tutte le altre no;\n"
" se è XML, --ifxml è attiva e tutte le altre no;\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3613,67 +3832,67 @@ msgstr ""
"sezioni numerate\n"
" makeinfo --no-split foo.texi scrive in un solo file Info\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: l'argomento --footnote-style deve essere «separate» o «end», non «%s».\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: l'argomento --paragraph-indent deve essere numerico/«none»/«asis», non "
"«%s».\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: quando si produce %s, può essere specificato con l'opzione «-o» un solo "
"FILE di input\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "opzione «--Xopt» senza stampa dell'output"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "trasformazione albero %s sconosciuta"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "scrittura multipagina per il formato %s ignorata"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: nome file mancante.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Usare «%s --help» per maggiori informazioni.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"La trasformazione fill_gaps_in_sectioning non ha restituito alcun risultato. "
"Nessuna sezione?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "errore durante la chiusura del file di espansione della macro %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "Impossibile aprire %s per la scrittura: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3681,43 +3900,323 @@ msgstr ""
"La trasformazione insert_nodes_for_sectioning_commands non ha restituito "
"alcun risultato. Nessuna sezione?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: errore durante la chiusura %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr ""
"%s: errore durante la chiusura del file dei collegamenti interni %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "nessun corrispondente «%cend %s»"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "%c fuori luogo"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "«%c%s» senza corrispondenza"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s richiede un nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "nome errato per @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s richiede un nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "nome errato per @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s richiede un nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "nome errato per @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s dovrebbe accettare solo un @-comando come argomento, non «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "comando d'ambiente %s come argomento per @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "argomento errato per @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "argomento errato per @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "argomento vuoto in @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "argomento errato per @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Solo @%s \"10\" o \"11\" è supportata, non «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: l'argomento --footnote-style deve essere «separate» o «end», non «%s».\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "l'argomento @%s deve essere «on», «off» oppure «odd», non «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "argomento errato per @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"l'argomento @firstparagraphindent deve essere «none» o «insert», non «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "argomento errato per @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s richiede un argomento: formattatore per %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "«%c%s» senza corrispondenza"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "argomento superfluo per @%s %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "argomento errato per @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: impossibile trovare %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: impossibile aprire %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "@%s dopo il primo elemento"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s ha senso solo su una riga @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+"@node precede @%s, ma alcune parti potrebbero non essere associati con dei "
+"nodi"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s è privo di significato all'interno del blocco «@%s»"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s non accettato all'interno del blocco «@%s»"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s dovrebbe apparire solo in contesti matematici"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@%s è privo di significato al difuori degli ambienti «@titlepage» e "
+"«@quotation»"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s richiede un nome"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "argomento formale @%s errato o vuoto: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s si aspettava «i» o «j» come argomento, non «%s»"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "indicatore non definito: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s è obsoleto."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s è obsoleto; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s dovrebbe apparire solo in contesti matematici"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s senza carattere associato"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s si aspettava «i» o «j» come argomento, non «%s»"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "%c fuori luogo"
+
+#, c-format
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
#~ msgstr "%s: l'opzione «--%s» non accetta argomenti\n"
+#, c-format
#~ msgid "%s: unrecognized option '--%s'\n"
#~ msgstr "%s: opzione non riconosciuta «--%s»\n"
+#, c-format
#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
#~ msgstr "%s: l'opzione «-W %s» non accetta argomenti\n"
+#, c-format
#~ msgid "%s: option '-W %s' requires an argument\n"
#~ msgstr "%s: l'opzione «-W %s» richiede un argomento\n"
#~ msgid "Insert this character"
#~ msgstr "Inserisci questo carattere"
+#, c-format
#~ msgid "No index entries."
#~ msgstr "Nessuna voce dell'indice."
#~ msgid "CAN'T SEE THIS"
#~ msgstr "NON PUOI VEDERE QUESTO"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "* Menu: Nodes whose indices contain `%s':\n"
@@ -3725,18 +4224,23 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ "\n"
#~ "* Menù: nodi i cui indici contengono «%s»:\n"
+#, c-format
#~ msgid "No index"
#~ msgstr "Nessun indice"
+#, c-format
#~ msgid "Index for `%s'"
#~ msgstr "Indice per «%s»"
+#, c-format
#~ msgid "File names matching `%s'"
#~ msgstr "Nomi dei file corrispondenti a «%s»"
+#, c-format
#~ msgid "can't open %s: %s"
#~ msgstr "impossibile aprire %s: %s"
+#, c-format
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "output di debug deviato su «%s»"
@@ -3773,24 +4277,31 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ "Comandi di base per Info\n"
#~ "************************\n"
+#, c-format
#~ msgid " %-10s Quit this help.\n"
#~ msgstr " %-10s Esci da questa schermata di aiuto.\n"
+#, c-format
#~ msgid " %-10s Quit Info altogether.\n"
#~ msgstr " %-10s Esci completamente da Info.\n"
+#, c-format
#~ msgid " %-10s Invoke the Info tutorial.\n"
#~ msgstr " %-10s Invoca il tutorial di Info.\n"
+#, c-format
#~ msgid " %-10s Move to the `next' node of this node.\n"
#~ msgstr " %-10s Vai al successivo nodo di questo file.\n"
+#, c-format
#~ msgid " %-10s Move to the `previous' node of this node.\n"
#~ msgstr " %-10s Vai al precedente nodo di questo file.\n"
+#, c-format
#~ msgid " %-10s Move `up' from this node.\n"
#~ msgstr " %-10s Vai su rispetto a questo nodo.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Pick menu item specified by name.\n"
#~ " Picking a menu item causes another node to be selected.\n"
@@ -3799,25 +4310,31 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ " La scelta di una voce di menù potrebbe selezionare un altro "
#~ "nodo.\n"
+#, c-format
#~ msgid " %-10s Follow a cross reference. Reads name of reference.\n"
#~ msgstr ""
#~ " %-10s Segui il riferimento incrociato. Legge il nome di riferimento.\n"
+#, c-format
#~ msgid " %-10s Move to the last node seen in this window.\n"
#~ msgstr " %-10s Vai all'ultimo nodo visitato in questa finestra.\n"
+#, c-format
#~ msgid " %-10s Skip to next hypertext link within this node.\n"
#~ msgstr ""
#~ " %-10s Salta al successivo collegamento ipertestuale all'interno di "
#~ "questo nodo.\n"
+#, c-format
#~ msgid " %-10s Follow the hypertext link under cursor.\n"
#~ msgstr " %-10s Segui il collegamento sotto il cursore.\n"
+#, c-format
#~ msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"
#~ msgstr ""
#~ " %-10s Vai al nodo principale o «elenco». Equivalente a «g (DIR)».\n"
+#, c-format
#~ msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n"
#~ msgstr " %-10s Vai al nodo superiore. Equivalente a «g Top».\n"
@@ -3828,21 +4345,27 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ "Spostamento all'interno di un nodo:\n"
#~ "-----------------------------------\n"
+#, c-format
#~ msgid " %-10s Scroll forward a page.\n"
#~ msgstr " %-10s Avanti di una pagina.\n"
+#, c-format
#~ msgid " %-10s Scroll backward a page.\n"
#~ msgstr " %-10s Indietro di una pagina.\n"
+#, c-format
#~ msgid " %-10s Go to the beginning of this node.\n"
#~ msgstr " %-10s Vai all'inizio di questo nodo.\n"
+#, c-format
#~ msgid " %-10s Go to the end of this node.\n"
#~ msgstr " %-10s Vai alla fine di questo nodo.\n"
+#, c-format
#~ msgid " %-10s Scroll forward 1 line.\n"
#~ msgstr " %-10s Avanti di una riga.\n"
+#, c-format
#~ msgid " %-10s Scroll backward 1 line.\n"
#~ msgstr " %-10s Indietro di una riga.\n"
@@ -3853,12 +4376,15 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ "Altri comandi:\n"
#~ "--------------\n"
+#, c-format
#~ msgid " %-10s Pick first...ninth item in node's menu.\n"
#~ msgstr " %-10s Seleziona la prima...nona voce di menù di questo nodo.\n"
+#, c-format
#~ msgid " %-10s Pick last item in node's menu.\n"
#~ msgstr " %-10s Seleziona l'ultima voce di menù di questo nodo.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search for a specified string in the index entries of this Info\n"
#~ " file, and select the node referenced by the first entry "
@@ -3867,6 +4393,7 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ " %-10s Cerca un testo specificato nell'indice di questo file Info e\n"
#~ " seleziona il nodo riferito dalla prima voce trovata.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Move to node specified by name.\n"
#~ " You may include a filename as well, as in "
@@ -3876,6 +4403,7 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ " Puoi anche includere un file Info, per esempio "
#~ "(NOMEFILE)NOMENODO.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search forward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3883,6 +4411,7 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ " %-10s Cerca in avanti il testo specificato,\n"
#~ " e seleziona il nodo in cui viene trovata l'occorrenza.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search backward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3890,9 +4419,11 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ " %-10s Cerca indietro il testo specificato,\n"
#~ " e seleziona il nodo in cui viene trovata l'occorrenza.\n"
+#, c-format
#~ msgid "ESC %s is undefined."
#~ msgstr "ESC %s non è stato definito."
+#, c-format
#~ msgid "%s is defined to %s."
#~ msgstr "%s è stato definito come %s."
@@ -3903,24 +4434,31 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ "Selezionare altri nodi:\n"
#~ "-----------------------\n"
+#, c-format
#~ msgid "incorrect number of arguments"
#~ msgstr "numero di argomenti errato"
+#, c-format
#~ msgid "cannot open input file `%s'"
#~ msgstr "impossibile aprire il file di input «%s»"
+#, c-format
#~ msgid "cannot create output file `%s'"
#~ msgstr "impossibile creare il file di output «%s»"
+#, c-format
#~ msgid "error writing to `%s'"
#~ msgstr "errore durante la scrittura del file «%s»"
+#, c-format
#~ msgid "error closing output file `%s'"
#~ msgstr "errore durante la chiusura del file di output «%s»"
+#, c-format
#~ msgid "section too long"
#~ msgstr "sezione troppo lunga"
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INPUT-FILE]\n"
#~ "\n"
@@ -3945,32 +4483,39 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ " --help mostra questa guida ed esce.\n"
#~ " --version mostra le informazioni di versione ed esce.\n"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too small"
#~ msgstr "Ignora il file Info sorgente «%s» non valido - troppo piccolo"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too big"
#~ msgstr "Ignora il file infokey «%s» non valido - troppo grande"
+#, c-format
#~ msgid "Error reading infokey file `%s' - short read"
#~ msgstr "Errore durante la lettura del file infokey «%s» - lettura breve"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
#~ msgstr ""
#~ "File infokey «%s» non valido (sequenza di identificazione errata) -- "
#~ "eseguire infokey per aggiornarlo"
+#, c-format
#~ msgid "Your infokey file `%s' is out of date -- run infokey to update it"
#~ msgstr ""
#~ "Il proprio file infokey «%s» non è aggiornato -- eseguire infokey per "
#~ "aggiornarlo"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
#~ msgstr ""
#~ "File infokey «%s» non valido (lunghezza di sezione errata) -- eseguire "
#~ "infokey per aggiornarlo"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
#~ msgstr ""
@@ -3987,6 +4532,7 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ "Dati errati nel file infokey -- alcune impostazioni delle variabili "
#~ "dichiarate saranno ignorate"
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "Comando %s inesistente"
@@ -3996,9 +4542,11 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ msgid "No `Prev' for this node."
#~ msgstr "Nessun «Prev» nodo."
+#, c-format
#~ msgid "Kill node (%s): "
#~ msgstr "Elimina nodo (%s): "
+#, c-format
#~ msgid "Cannot kill node `%s'"
#~ msgstr "Impossibile eliminare il nodo «%s»"
@@ -4008,27 +4556,33 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ msgid "Kill this node"
#~ msgstr "Elimina questo nodo"
+#, c-format
#~ msgid "writing file %s"
#~ msgstr "scrittura del file %s"
+#, c-format
#~ msgid "closing file %s"
#~ msgstr "chiusura del file %s"
#~ msgid "Internally used by \\[universal-argument]"
#~ msgstr "Usato internamente da \\[universal-argument]"
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: Memoria virtuale esaurita!\n"
#~ msgid "--*** Tags out of Date ***"
#~ msgstr "--*** Etichette non aggiornate ***"
+#, c-format
#~ msgid "-%s---Info: %s, %d lines --%s--"
#~ msgstr "-%s---Info: %s, %d righe --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
#~ msgstr "-%s%s-Info: (%s)%s, %d righe --%s--"
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr " Subfile: %s"
@@ -4038,18 +4592,45 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ msgid "arguments are quoted by default"
#~ msgstr "gli argomenti vengono quotati come predefinito"
+#~ msgid "no node to be renamed"
+#~ msgstr "nessun nodo da rinominare"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "nodi senza un nuovo nome alla fine del file"
+
+#, perl-format
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Variabile %s obsoleta\n"
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "il vecchio nome per «%s» è un nodo del documento"
+
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "file vuoto per il nodo rinominato «%s»"
+
+#, perl-format
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr ""
+#~ "il nodo di riferimento (nuovo nome per «%s») non è nel documento: %s"
+
+#, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "errore durante la chiusura del file dei nodi rinominato %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "nome del nodo vuoto"
+
+#, perl-format
#~ msgid "@%s should only appear at beginning or end of document"
#~ msgstr "@%s dovrebbe apparire solo all'inizio o alla fine del documento"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s non dovrebbe essere associato con @top"
-
+#, perl-format
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: variabile %s obsoleta\n"
+#, perl-format
#~ msgid "obsolete variable %s\n"
#~ msgstr "variabile %s obsoleta\n"
@@ -4065,15 +4646,18 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ msgid "send output to FILE"
#~ msgstr "invia l'output al file FILE"
+#, c-format
#~ msgid "Generate a sorted index for each TeX output FILE.\n"
#~ msgstr "Genera un indice ordinato per ogni file TeX di uscita.\n"
+#, c-format
#~ msgid ""
#~ "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
#~ msgstr ""
#~ "Solitamente FILE... viene indicato come «foo.%c%c» per un documento «foo."
#~ "texi».\n"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "Options:\n"
@@ -4081,15 +4665,19 @@ msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
#~ "\n"
#~ "Opzioni:\n"
+#, c-format
#~ msgid "failure reopening %s"
#~ msgstr "riapertura di %s fallita"
+#, c-format
#~ msgid "%s: not a texinfo index file"
#~ msgstr "%s: non è un file indice texinfo"
+#, c-format
#~ msgid "No page number in %s"
#~ msgstr "Nessun numero di pagina in %s"
+#, c-format
#~ msgid "entry %s follows an entry with a secondary name"
#~ msgstr "la voce %s segue un elemento con un nome secondario"
diff --git a/macros/texinfo/texinfo/po/ja.gmo b/macros/texinfo/texinfo/po/ja.gmo
index 75bee36334..906ed6b4d1 100644
--- a/macros/texinfo/texinfo/po/ja.gmo
+++ b/macros/texinfo/texinfo/po/ja.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/ja.po b/macros/texinfo/texinfo/po/ja.po
index 421a7ef0bf..e439336514 100644
--- a/macros/texinfo/texinfo/po/ja.po
+++ b/macros/texinfo/texinfo/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 5.1.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2014-11-07 08:03+0000\n"
"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -30,26 +30,31 @@ msgstr "ä¸æ˜Žãªã‚·ã‚¹ãƒ†ãƒ ã‚¨ãƒ©ãƒ¼"
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option '-W %s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: オプション '-W %s' ã¯æ›–昧ã§ã™\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™:次ã®ã‚‚ã®ãŒå¯èƒ½ã§ã™:"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: オプション '%c%s' ã‚’èªè­˜ã§ãã¾ã›ã‚“\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: オプション '%c%s' ã¯å¼•æ•°ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: オプション '--%s' ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n"
@@ -93,6 +98,7 @@ msgstr "無効ãªå‰æ–¹å‚ç…§ã§ã™"
#: gnulib/lib/regcomp.c:156
#, fuzzy
+#| msgid "Unmatched [ or [^"
msgid "Unmatched [, [^, [:, [., or [="
msgstr "[ ã¾ãŸã¯ [^ ãŒä¸ä¸€è‡´ã§ã™"
@@ -247,7 +253,6 @@ msgid "Insert completion"
msgstr "補完を挿入"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "補完リストを作æˆä¸­..."
@@ -271,7 +276,6 @@ msgid "found file %s"
msgstr "ファイル %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "脚注を表示ã§ãã¾ã›ã‚“"
@@ -284,7 +288,6 @@ msgid "---------- Footnotes ----------"
msgstr "------------ 脚注 ------------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "見出ã—項目を見ã¤ã‘ã¦ã„ã¾ã™"
@@ -293,7 +296,8 @@ msgid "Look up a string in the index for this file"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®è¦‹å‡ºã—ã‹ã‚‰æ–‡å­—列を検索ã™ã‚‹"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "é …ç›®ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
@@ -302,39 +306,46 @@ msgid "Index entry: "
msgstr "見出ã—é …ç›®: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "é …ç›®ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr ""
"%2$s ã®ä¸­ã§ `%1$s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚(`\\[next-index-match]' ã§æ¬¡ã‚’探ã—ã¾ã™)"
#: info/indices.c:446
#, fuzzy
+#| msgid ""
+#| "Go to the next matching index item from the last `\\[index-search]' "
+#| "command"
msgid ""
"Go to the next matching index item from the last '\\[index-search]' command"
msgstr "ç›´å‰ã® `\\[index-search]' コマンドã¨ä¸€è‡´ã—ãŸè¦‹å‡ºã—アイテムを辿る"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "以å‰ã®è¦‹å‡ºã—検索文字列ãŒã‚ã‚Šã¾ã›ã‚“"
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No more index entries containing `%s'."
msgid "No more index entries containing '%s'"
msgstr "%s ã‚’å«ã‚€è¦‹å‡ºã—é …ç›®ã¯ã“れ以上ã‚ã‚Šã¾ã›ã‚“。"
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "No index entries containing '%s'"
msgstr "%s ã‚’å«ã‚€è¦‹å‡ºã—é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“。"
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of `%s'..."
msgid "Scanning indices of '%s'..."
msgstr "`%s' ã®è¦‹å‡ºã—を調ã¹ã¦ã„ã¾ã™..."
@@ -344,11 +355,13 @@ msgstr "å…¨ã¦ã® info ファイル文字列ã‹ã‚‰è¦‹å‡ºã—を走査ã—ã€ãƒ¡ãƒ‹
#: info/indices.c:654 info/indices.c:656
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index apropos"
msgstr "語å¥ã‚’å«ã‚€é …目を検索: "
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "Index entries containing '%s':\n"
msgstr "%s ã‚’å«ã‚€è¦‹å‡ºã—é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -372,31 +385,33 @@ msgstr "終了インデックス"
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No index entries containing `%s'."
msgid "No index entries containing '%s'."
msgstr "%s ã‚’å«ã‚€è¦‹å‡ºã—é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“。"
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have `%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "見出ã—㌠`%s' ã® info ファイルãŒç”¨æ„ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "メニューアイテム `%s' ã¯ãƒŽãƒ¼ãƒ‰ `%s' 中ã«ã¯ã‚ã‚Šã¾ã›ã‚“"
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr "`%s' ノードãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -425,7 +440,7 @@ msgstr "変数 %s ã¯å¤‰æ•° %s ã®å€¤ã¨ã—ã¦ã¯ç„¡åŠ¹ã§ã™"
msgid "Try --help for more information.\n"
msgstr "詳ã—ã㯠--help オプションを試ã—ã¦ã¿ã¦ãã ã•ã„。\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -442,6 +457,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "`%s' ã«å¯¾ã™ã‚‹é …ç›®ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n"
@@ -458,6 +474,14 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -a, --all use all matching manuals.\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILE remember user keystrokes in FILENAME.\n"
+#| " -f, --file=MANUAL specify Info manual to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -475,6 +499,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILE output selected nodes to FILE."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -492,11 +521,21 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr " -b, --speech-friendly 音声åˆæˆå™¨ã«å¯¾ã™ã‚‹è¦ªå’Œæ€§ã‚’高ã‚る。"
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --strict-node-location (for debugging) use Info file pointers as-"
+#| "is.\n"
+#| " --subnodes recursively output menu items.\n"
+#| " -v, --variable VAR=VALUE assign VALUE to Info variable VAR.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file.\n"
+#| " -x, --debug=NUMBER set debugging level (-1 for all).\n"
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -515,6 +554,14 @@ msgstr ""
#: info/info.c:1122
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The first non-option argument, if present, is the menu entry to start "
+#| "from;\n"
+#| "it is searched for in all `dir' files along INFOPATH.\n"
+#| "If it is not present, info merges all `dir' files and shows the result.\n"
+#| "Any remaining arguments are treated as the names of menu\n"
+#| "items relative to the initial node visited."
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -532,6 +579,9 @@ msgstr ""
#: info/info.c:1129
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "For a summary of key bindings, type h within Info."
msgid ""
"\n"
"For a summary of key bindings, type H within Info."
@@ -541,6 +591,19 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers start at buffers node within emacs manual\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -570,7 +633,7 @@ msgstr ""
" info -f ./foo.info dir を検索ã™ã‚‹ä»£ã‚ã‚Šã« ./foo.info ファイルを表示"
"ã™ã‚‹"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -584,6 +647,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "`(%s)%s' ノードãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
@@ -597,61 +661,73 @@ msgstr "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒŽãƒ¼ãƒ‰å†…ã«ãƒã‚¤ãƒ³ãƒˆãŒç¾ã‚Œã¾ã›ã‚“ï¼"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "最後ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯å‰Šé™¤ã§ãã¾ã›ã‚“"
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "ã“ã®ãƒŽãƒ¼ãƒ‰ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "ã“ã®ãƒŽãƒ¼ãƒ‰ã«è„šæ³¨ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "ã“ã®ãƒŽãƒ¼ãƒ‰ã«ç›¸äº’å‚ç…§ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "ã“ã®ãƒŽãƒ¼ãƒ‰ã® `%s' ãƒã‚¤ãƒ³ã‚¿ãŒã‚ã‚Šã¾ã›ã‚“。"
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "ä¸æ˜Žãª Info コマンド `%c' ã§ã™ã€‚`?' ã§ãƒ˜ãƒ«ãƒ—ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "端末タイプ `%s' 㯠Info ãŒå‹•ä½œã™ã‚‹ãŸã‚ã®æ©Ÿèƒ½ãŒã‚ã‚Šã¾ã›ã‚“。"
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "ã“ã“ã¯ã‚‚ã†ã€ã“ã®ãƒŽãƒ¼ãƒ‰ã®æœ€çµ‚ページã§ã™ã€‚"
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "ã“ã“ã¯ã‚‚ã†ã€ã“ã®ãƒŽãƒ¼ãƒ‰ã®æœ€åˆã®ãƒšãƒ¼ã‚¸ã§ã™ã€‚"
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "唯一ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§ã™ã€‚"
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "çµæžœã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒå°ã•ã™ãŽã¾ã™ã€‚"
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr ""
"ヘルプウィンドウ用ã®å ´æ‰€ãŒè¶³ã‚Šã¾ã›ã‚“ã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’一ã¤å‰Šé™¤ã—ã¦ãã ã•ã„。"
@@ -737,6 +813,7 @@ msgstr "\\%-10[top-node] ã“ã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã®å…ˆé ­ãƒŽãƒ¼ãƒ‰ã«ç§»å‹•ã™
#: info/infodoc.c:61
#, fuzzy
+#| msgid "\\%-10[dir-node] Go to the main `directory' node.\n"
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
msgstr "\\%-10[dir-node] メイン `directory' ノードã«ç§»å‹•ã™ã‚‹ã€‚\n"
@@ -832,6 +909,7 @@ msgstr "使ã„方を表示ã™ã‚‹"
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "`(info)Help' ノードã«ç§»å‹•ã™ã‚‹"
@@ -846,6 +924,7 @@ msgstr "キーã®èª¬æ˜Ž: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s ã¯å®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -859,21 +938,25 @@ msgstr ""
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "`%s' ã¯ã‚­ãƒ¼å‰²ã‚Šå½“ã¦ã•ã‚Œã¦ã„ã¾ã›ã‚“"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s 㯠%s を通ã˜ã¦ã®ã¿å‘¼ã³å‡ºã›ã¾ã™ã€‚"
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s 㯠%s を通ã˜ã¦å‘¼ã³å‡ºã›ã¾ã™"
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr "`%s' ã¨ã„ã†æ©Ÿèƒ½ã¯ã‚ã‚Šã¾ã›ã‚“"
@@ -883,17 +966,14 @@ msgid "could not open init file %s"
msgstr " @FILE オプションを FILE ã‹ã‚‰èª­ã¿è¾¼ã‚€\n"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "キー入力列ãŒé•·ã™ãŽã¾ã™"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "キー入力列を欠ã„ã¦ã„ã¾ã™"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL 文字 (\\000) ã¯ä½¿ãˆã¾ã›ã‚“"
@@ -903,12 +983,12 @@ msgid "NUL character (^%c) not permitted"
msgstr "NUL 文字 (^%c) ã¯ä½¿ãˆã¾ã›ã‚“"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "アクションåãŒã‚ã‚Šã¾ã›ã‚“"
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "key sequence too long"
msgid "cannot bind key sequence to menu-digit"
msgstr "キー入力列ãŒé•·ã™ãŽã¾ã™"
@@ -918,7 +998,6 @@ msgid "unknown action `%s'"
msgstr "ä¸æ˜Žãªã‚¢ã‚¯ã‚·ãƒ§ãƒ³ `%s' ã§ã™"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "アクションåãŒé•·ã™ãŽã¾ã™"
@@ -928,22 +1007,18 @@ msgid "extra characters following action `%s'"
msgstr "アクション `%s' ã«ä½™åˆ†ãªæ–‡å­—ãŒç¶šã„ã¦ã„ã¾ã™"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "変数åãŒã‚ã‚Šã¾ã›ã‚“"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "変数åã®ç›´å¾Œã® `=' ãŒã‚ã‚Šã¾ã›ã‚“"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "変数åãŒé•·ã™ãŽã¾ã™"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "値ãŒé•·ã™ãŽã¾ã™"
@@ -965,7 +1040,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "エコー領域ã§ã‚³ãƒžãƒ³ãƒ‰åを読ã¿ã€å®Ÿè¡Œã™ã‚‹"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an `echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "ã“ã“ã§ã¯ `echo-area' コマンドを実行ã§ãã¾ã›ã‚“。"
@@ -996,6 +1072,11 @@ msgstr "ファイル %s を処ç†ã§ãã¾ã›ã‚“。\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -1010,6 +1091,9 @@ msgstr ""
#: info/nodemenu.c:185
#, fuzzy
+#| msgid ""
+#| "Here is the menu of nodes you have recently visited.\n"
+#| "Select one from this menu, or use `\\[history-node]' in another window.\n"
msgid ""
"Here is the menu of nodes you have recently visited.\n"
"Select one from this menu, or use '\\[history-node]' in another window.\n"
@@ -1051,7 +1135,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "ファイル見出ã—ãŒã‚ã‚Šã¾ã›ã‚“"
@@ -1060,6 +1143,9 @@ msgstr "ファイル見出ã—ãŒã‚ã‚Šã¾ã›ã‚“"
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1201,6 +1287,8 @@ msgstr "ã“ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼é …目をé¸æŠž"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There isn't %d item in this menu."
+#| msgid_plural "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "ã“ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã« %d 個ã®é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -1229,6 +1317,7 @@ msgstr "å‚照先: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "ãã®å‚ç…§ã¯æ¶ˆãˆã¾ã—ãŸ! (%s)。"
@@ -1262,11 +1351,13 @@ msgstr "å‚ç…§ã¾ãŸã¯ã€ã“ã®è¡Œã«ç¾ã‚ŒãŸãƒ¡ãƒ‹ãƒ¥ãƒ¼é …目をé¸æŠž"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr "ノード `%s' ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãŒã‚ã‚Šã¾ã›ã‚“。"
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "`%s' ã‹ã‚‰å‚ç…§ã•ã‚Œã¦ã„るノードを見ã¤ã‘られã¾ã›ã‚“(`%s' 中)"
@@ -1304,11 +1395,13 @@ msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®æœ€åˆã®ãƒŽãƒ¼ãƒ‰ã‚’é¸æŠžã™ã‚‹"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "ã“ã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã«ã¯ã€ã“れ以上ã®ãƒŽãƒ¼ãƒ‰ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "ã“ã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã§ã¯ã€ã“ã®ãƒŽãƒ¼ãƒ‰ã® `å‰' ã‚„ `上' ã¯ã‚ã‚Šã¾ã›ã‚“。"
@@ -1347,11 +1440,13 @@ msgstr "Man ページを表示: "
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã® `先頭' ノードをé¸æŠž"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "`(dir)'ノードをé¸æŠžã™ã‚‹"
@@ -1364,7 +1459,6 @@ msgid "Select the most recently selected node"
msgstr "最後ã«é¸æŠžã•ã‚ŒãŸãƒŽãƒ¼ãƒ‰ã‚’é¸æŠžã™ã‚‹"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1378,11 +1472,13 @@ msgstr "ファイルを探ã™: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr "`%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr "出力ファイル `%s' を作æˆã§ãã¾ã›ã‚“。"
@@ -1407,6 +1503,7 @@ msgstr "INFO_PRINT_COMMAND ã«ã‚ˆã£ã¦ã“ã®ãƒŽãƒ¼ãƒ‰ã®å†…容をパイプã™ã‚
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr "`%s' ã¸ã®ãƒ‘イプを開ã‘ã¾ã›ã‚“。"
@@ -1425,22 +1522,26 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "検索ã§æ­£è¦è¡¨ç¾ã‚’使用ã™ã‚‹ã‹ã©ã†ã‹ã‚’切り替ãˆã‚‹"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Using regular expressions for searches"
msgstr "検索ã§æ­£è¦è¡¨ç¾ã‚’使用ã™ã‚‹ã€‚"
#: info/session.c:3909
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches."
msgid "Using literal strings for searches"
msgstr "検索ã§æ–‡å­—列リテラルãã®ã‚‚ã®ã‚’使用ã™ã‚‹ã€‚"
#: info/session.c:4112
#, fuzzy
+#| msgid "Search continued from the end of the document."
msgid "Search continued from the end of the document"
msgstr "文書ã®æœ€å¾Œã‹ã‚‰æ¤œç´¢ã‚’継続ã™ã‚‹ã€‚"
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the beginning of the document."
msgid "Search continued from the beginning of the document"
msgstr "文書ã®æœ€åˆã‹ã‚‰æ¤œç´¢ã‚’継続ã™ã‚‹ã€‚"
@@ -1449,8 +1550,9 @@ msgstr "文書ã®æœ€åˆã‹ã‚‰æ¤œç´¢ã‚’継続ã™ã‚‹ã€‚"
msgid "Searching subfile %s ..."
msgstr "副ファイル %s を探ã—ã¦ã„ã¾ã™ ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "検索ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
@@ -1477,6 +1579,7 @@ msgstr "後方"
#: info/session.c:4198
#, fuzzy, c-format
+#| msgid "%s%s%s [%s]: "
msgid "%s%s%s: "
msgstr "%s%s%s [%s]: "
@@ -1484,141 +1587,145 @@ msgstr "%s%s%s [%s]: "
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "No match"
msgid "No more matches"
msgstr "一致ã—ã¾ã›ã‚“"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "副ファイル %s を探ã—ã¦ã„ã¾ã™ ..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "文字列を読ã¿ã€å¤§æ–‡å­—å°æ–‡å­—ã®åŒºåˆ¥ã‚’ã¤ã‘ã¦æ¤œç´¢ã™ã‚‹"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "文字列を読んã§æ¤œç´¢ã™ã‚‹"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "文字列を読んã§å¾Œæ–¹æ¤œç´¢ã™ã‚‹"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "åŒä¸€æ–¹å‘ã§æœ€å¾Œã®æ¤œç´¢ã‚’ç¹°ã‚Šè¿”ã™"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "å‰ã®æ¤œç´¢æ–‡å­—列ãŒã‚ã‚Šã¾ã›ã‚“"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "逆方å‘ã§æœ€å¾Œã®æ¤œç´¢ã‚’ç¹°ã‚Šè¿”ã™"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "入力ã—ãŸæ–‡å­—列ã®å¯¾è©±çš„ãªæ¤œç´¢"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "æ­£è¦è¡¨ç¾é€æ¬¡å¾Œæ–¹æ¤œç´¢: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "é€æ¬¡å¾Œæ–¹æ¤œç´¢: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "æ­£è¦è¡¨ç¾é€æ¬¡æ¤œç´¢: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "é€æ¬¡æ¤œç´¢: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "失敗 "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "ç¾åœ¨ã®æ“作を中止ã™ã‚‹"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "終了"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "ç”»é¢ã‚’å†æç”»ã™ã‚‹"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Info ã®ä½¿ç”¨ã‚’終了ã™ã‚‹"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "ã“ã®ã‚­ãƒ¼ã®å°æ–‡å­—ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰ (%s) ã§ã™ã€‚"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" ã¯ç„¡åŠ¹ã§ã™"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "`%s' is invalid"
msgid "'%s' is invalid"
msgstr "`%s' ã¯ç„¡åŠ¹ã§ã™"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "ç¾åœ¨ã®æ•°å€¤å¼•æ•°ã«ã“ã®æ•°å€¤ã‚’加ãˆã‚‹"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "ç¾åœ¨ã®æ•°å€¤å¼•æ•°ã‚’開始(ã¾ãŸã¯ 4 å€ã™ã‚‹)"
@@ -1700,6 +1807,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "次ã®ç›¸äº’å‚ç…§ã«ç§»å‹•"
@@ -1892,6 +2000,21 @@ msgstr ""
#: install-info/install-info.c:590
#, fuzzy
+#| msgid ""
+#| " --regex=R put this file's entries in all sections that match "
+#| "the\n"
+#| " regular expression R (ignoring case).\n"
+#| " --remove same as --delete.\n"
+#| " --remove-exactly only remove if the info file name matches exactly;\n"
+#| " suffixes such as .info and .gz are not ignored.\n"
+#| " --section=SEC put entries in section SEC of the directory.\n"
+#| " If you specify more than one section, all the "
+#| "entries\n"
+#| " are added in each of the sections.\n"
+#| " If you don't specify any sections, they are "
+#| "determined\n"
+#| " from information in the Info file itself.\n"
+#| " --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1979,12 +2102,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: (%s) を読ã¿è¾¼ã‚€ã“ã¨ãŒã§ããšã€(%s) を作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY ã«å¯¾å¿œã™ã‚‹ END-INFO-DIR-ENTRY ãŒã‚ã‚Šã¾ã›ã‚“"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY ã«å¯¾å¿œã™ã‚‹ START-INFO-DIR-ENTRY ãŒã‚ã‚Šã¾ã›ã‚“"
@@ -2014,13 +2135,11 @@ msgid "excess command line argument `%s'"
msgstr "コマンドライン引数ãŒå¤šã™ãŽã¾ã™ `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"入力ファイルãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ -- 詳ã—ã㯠--help 付ã§å®Ÿè¡Œã—ã¦ãã ã•ã„。"
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"dir ファイルãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ -- 詳ã—ã㯠--help 付ã§å®Ÿè¡Œã—ã¦ä¸‹ã•ã„。"
@@ -2040,309 +2159,265 @@ msgstr "`%s' ã« Info dir 用ã®é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“"
msgid "no entries found for `%s'; nothing deleted"
msgstr "`%s' é …ç›®ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ -- 何も削除ã—ã¾ã›ã‚“ã§ã—ãŸ"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, fuzzy, perl-format
msgid "could not open %s for writing: %s"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s ã¯æœ‰åŠ¹ãªè¨€èªžã‚³ãƒ¼ãƒ‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s ã¯æœ‰åŠ¹ãªåœ°åŸŸã‚³ãƒ¼ãƒ‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, fuzzy, perl-format
msgid "%s is not a valid split possibility"
msgstr "%u ã¯å¦¥å½“ãªé€šçŸ¥ ID ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, fuzzy, perl-format
msgid "could not read %s: %s"
msgstr " @FILE オプションを FILE ã‹ã‚‰èª­ã¿è¾¼ã‚€\n"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, fuzzy, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, fuzzy, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: `%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, fuzzy, perl-format
-msgid "could not open %s: %s"
-msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, fuzzy, perl-format
msgid "empty node name after expansion `%s'"
msgstr "ノード `%s' ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s `%s' ã¯ä»¥å‰ã«å®šç¾©ã•ã‚Œã¦ã„ã¾ã™"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, fuzzy, perl-format
msgid "here is the previous definition as @%s"
msgstr "ã“ã“ã¯ã€`%s' ã®å‰ã®å®šç¾©ã§ã™"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, fuzzy, c-format, perl-format
msgid "empty argument in @%s"
msgstr "コメント内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, fuzzy, perl-format
msgid "error on closing %s: %s"
msgstr "%(service)s on %(device)s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, fuzzy, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "ディレクトリ `%s' ã¾ãŸã¯ `%s'を作æˆã§ãã¾ã›ã‚“: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, fuzzy, perl-format
msgid "could not create directory `%s': %s"
msgstr "%s/linux シンボリックリンクを作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ!"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, fuzzy, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image ファイル `%s' ãŒèª­ã‚ã¾ã›ã‚“: %s"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, fuzzy, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image ファイル `%s' (HTML 用) ãŒèª­ã‚ã¾ã›ã‚“: %s"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, fuzzy, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "ファイル `%s' を削除ã§ãã¾ã›ã‚“: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
#, fuzzy
msgid "missing type"
msgstr "設定ファイルã®æ¬ è½ã€‚"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, fuzzy, perl-format
msgid "unrecognized type: %s"
msgstr "èªè­˜ã§ããªã„åž‹ã§ã™: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, fuzzy, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "ファイル `%s' を削除ã§ãã¾ã›ã‚“: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
#, fuzzy
msgid "string not closed in css file"
msgstr "文字列ã®æ¯”較ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
#, fuzzy
msgid "--css-include ended in comment"
msgstr "%s:%d: --css-include ãŒã‚³ãƒ¡ãƒ³ãƒˆå†…ã§çµ‚了ã—ã¦ã„ã¾ã™"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, fuzzy, perl-format
msgid "CSS file %s not found"
msgstr "css ファイル %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, fuzzy, perl-format
msgid "could not open --include-file %s: %s"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, fuzzy, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "ファイルクローズエラー"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, fuzzy, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "`%s' ã«å¯¾ã™ã‚‹é …ç›®ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, fuzzy, perl-format
msgid "error on closing frame file %s: %s"
msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, fuzzy, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, fuzzy, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, fuzzy, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "ã“ã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã§ã¯ã€ã“ã®ãƒŽãƒ¼ãƒ‰ã® `å‰' ã‚„ `上' ã¯ã‚ã‚Šã¾ã›ã‚“。"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, fuzzy, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "å‚ç…§ã•ã‚Œã¦ã„ãªã„ノード `%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, fuzzy, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-#, fuzzy
-msgid "empty node name"
-msgstr "èªè­˜ã§ããªã„エミュレーションå `%s' ã§ã™"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
#, fuzzy
msgid "document without nodes"
msgstr "ã“ã®ãƒŽãƒ¼ãƒ‰ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
#, fuzzy
msgid "document without Top node"
msgstr "ã“ã®ãƒŽãƒ¼ãƒ‰ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, fuzzy, perl-format
msgid "rename %s failed: %s"
msgstr "%s: `%s' ã®ã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã«å¤±æ•—\n"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(ã‚らゆるノードã®å¤–å´)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, fuzzy, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, fuzzy, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "`%s' 見出ã—é …ç›®ãŒã‚らゆるノードã®å¤–å´ã«ã‚ã‚Šã¾ã™"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
msgid "error on closing image text file %s: %s"
msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image ファイル `%s' ãŒèª­ã‚ã¾ã›ã‚“: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2350,302 +2425,328 @@ msgstr ""
"@strong{Note...} 㯠Info 内ã«ç–‘似的ãªç›¸äº’å‚照を生æˆã—ã¾ã™ã€‚使用ã¯é¿ã‘ã¦ãã ã•"
"ã„"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, fuzzy, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, fuzzy, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' ã¾ãŸã¯ `,' ã«ã¯ `%2$c' ã§ã¯ç„¡ã @%1$s ãŒç¶šã‹ãªã‘ã‚Œã°ã„ã‘ã¾ã›ã‚“。"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "`.' ã¾ãŸã¯ `,' ã«ã¯ `%2$c' ã§ã¯ç„¡ã @%1$s ãŒç¶šã‹ãªã‘ã‚Œã°ã„ã‘ã¾ã›ã‚“。"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, fuzzy, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "ノード `%s' ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
#, fuzzy
msgid "menu entry name should not contain `:'"
msgstr "ノード `%s' ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:762
+#, fuzzy, perl-format
+msgid "could not open %s: %s"
+msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, fuzzy, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "引数 `%3$s' ã«å¯¾ã—㦠%1$s%2$s ãŒç„¡åŠ¹ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, fuzzy, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "引数 `%3$s' ã«å¯¾ã—㦠%1$s%2$s ãŒç„¡åŠ¹ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s ã«ã¯åå‰ãŒå¿…è¦ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, fuzzy, c-format, perl-format
msgid "bad name for @%s"
msgstr "エミュレーションモードåãŒã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, fuzzy, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "コメント内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, fuzzy, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "コメント内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "é–‰ã˜ã‚‹ä¸­æ‹¬å¼§ã®ãªã„ %c%s"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' ã«ã¯ `%s' ãŒå¿…è¦ã§ã™ãŒã€`%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, fuzzy, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "コメント内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, fuzzy, perl-format
msgid "no matching `%cend %s'"
msgstr "`%cend %s' ã¨ã®å¯¾å¿œãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, fuzzy, perl-format
msgid "misplaced %c"
msgstr "é–“é•ã£ãŸä½ç½®ã« %c ãŒã‚ã‚Šã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, fuzzy, perl-format
msgid "unmatched `%c%s'"
msgstr "`%c%s' ã¨ã®å¯¾å¿œãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, fuzzy, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "マクロ `%s' 呼ã³å‡ºã—ã®å¼•æ•°ãŒå¤šã™ãŽã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "設定ファイルã®æ¬ è½ã€‚"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, fuzzy, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "マクロ `%s' ã¯å¼•æ•°ãªã—ã§å®£è¨€ã•ã‚Œã€å¼•æ•°ã‚’ã¤ã‘ã¦å‘¼ã³å‡ºã•ã‚Œã¾ã—ãŸ"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, fuzzy, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "後ã‚ã« `%s' ãŒç¶šãマクロ展開内ã§ãƒ‘ラメータåã§ã¯ãªã \\ ãŒã‚ã‚Šã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, fuzzy, c-format, perl-format
msgid "missing name for @%s"
msgstr "エミュレーションモードåãŒã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, fuzzy, c-format, perl-format
msgid "missing category for @%s"
msgstr "設定ファイルã®æ¬ è½ã€‚"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, fuzzy, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
#, fuzzy
msgid "empty multitable"
msgstr "%s: 空ã®ãƒ•ã‚¡ã‚¤ãƒ«"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, fuzzy, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "%s: --auto/-a オプションã«å¯¾ã—ã¦ä¸å½“ãªå¼•æ•°\n"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, fuzzy, c-format, perl-format
msgid "bad argument to @%s"
msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s ã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™: %citem ã‚’æ•´å½¢ã™ã‚‹ãŸã‚"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, fuzzy, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "%s: オプション `--%s' ã¯å¼•æ•°ãŒä¸è¦ã§ã™\n"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, fuzzy, c-format, perl-format
msgid "@%s missing argument"
msgstr "設定ファイルã®æ¬ è½ã€‚"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, fuzzy, c-format, perl-format
msgid "unknown @end %s"
msgstr "終了インデックス"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, fuzzy, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "%s: --auto/-a オプションã«å¯¾ã—ã¦ä¸å½“ãªå¼•æ•°\n"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, fuzzy, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, fuzzy, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "èªè­˜ã§ããªã„エンコードå `%s' ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, fuzzy, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "`@titlepage' 環境ã®å¤–å´ã§ã¯ @%s ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, fuzzy, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "ノード `%s' ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
#, fuzzy
msgid "empty node name in menu entry"
msgstr "èªè­˜ã§ããªã„エミュレーションå `%s' ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, fuzzy, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@end %s should only appear at the beginning of a line"
msgstr "行頭ã¾ã§ã‚’切りå–ã‚‹"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "マクロ `%s' ã¯ä»¥å‰ã«å®šç¾©ã•ã‚Œã¦ã„ã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ã“ã“ã¯ã€`%s' ã®å‰ã®å®šç¾©ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, fuzzy, perl-format
msgid "@%s without associated character"
msgstr "エスケープ文字内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, fuzzy, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2653,354 +2754,368 @@ msgstr ""
"マクロ呼ã³å‡ºã—ã®ãƒã‚¹ãƒˆãŒæ·±ã™ãŽã¾ã™(MAX_NESTED_MACROS を設定ã—ã¦ä¸Šé™ã‚’変更ã§ã"
"ã¾ã™; ç¾åœ¨ã¯ %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, fuzzy, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "%s: オプション `--%s' ã¯å¼•æ•°ãŒä¸è¦ã§ã™\n"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, fuzzy, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "@%s ã¸ã®å¼•æ•°ã¨ã—ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’与ãˆã‚‹ã«ã¯ã€ãƒ–レースを使ã„ã¾ã—ょã†"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s 㯠`%s' ã§ã¯ãªãã€`i' ã‹ `j' を引数ã¨ã—ã¦å¿…è¦ã¨ã—ã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, fuzzy, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "%s: オプション `--%s' ã¯å¼•æ•°ãŒä¸è¦ã§ã™\n"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, fuzzy, c-format, perl-format
msgid "@%s expected braces"
msgstr "%c%s ã«ã¯ä¸­æ‹¬å¼§ãŒäºˆæœŸã•ã‚Œã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, fuzzy, c-format, perl-format
msgid "unknown command `%s'"
msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰ `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "定義ã•ã‚Œã¦ã„ãªã„フラグ: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
#, fuzzy
msgid "bad syntax for @value"
msgstr "引数 `%3$s' ã«å¯¾ã—㦠%1$s%2$s ãŒç„¡åŠ¹ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s ã¯å»ƒæ­¢äºˆå®š (ã¾ãŸã¯å»ƒæ­¢æ¸ˆã¿) ã§ã™ã€‚"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s ã¯å»ƒæ­¢äºˆå®š (ã¾ãŸã¯å»ƒæ­¢æ¸ˆã¿) ã§ã™; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@%s should only appear at the beginning of a line"
msgstr "行頭ã¾ã§ã‚’切りå–ã‚‹"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "`@%2$s' ブロックã®å†…å´ã§ã¯ `@%1$s' ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, fuzzy, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "コメント内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
#, fuzzy
msgid "@tab before @item"
msgstr "ãƒã‚§ãƒƒã‚¯ãƒ»ãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, fuzzy, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "マルãƒãƒ†ãƒ¼ãƒ–ル項目内ã®ã‚«ãƒ©ãƒ æ•°ãŒå¤šã™ãŽã¾ã™(最大 %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "マルãƒãƒ†ãƒ¼ãƒ–ルã®å¤–å´ã® @tab を無視ã—ã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, fuzzy, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "`@%2$s' ブロックã®å†…å´ã§ã¯ `@%1$s' ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, fuzzy, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "`@%2$s' を使用ã™ã‚‹ãŸã‚ã«ã¯ `@%1$s' 環境ã§ãªã‘ã‚Œã°ã„ã‘ã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s 㯠`@titlepage' ãŠã‚ˆã³ `@quotation' 環境ã®å¤–å´ã§ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, fuzzy, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "脚注ã«è„šæ³¨ã‚’å«ã‚ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, fuzzy, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@menu ãŒæœ€åˆã® @node 以å‰ã«ç¾ã‚Œã¾ã—ãŸã€‚`Top' ノードをã¤ãã‚Šã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "多分 @top ノード㯠@ifinfo より㯠@ifnottex ã«è¦†ã‚れるã¹ãã§ã¯ï¼Ÿ"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
#, fuzzy
msgid "unexpected @"
msgstr "予期ã•ã‚Œãªã„ @ ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, fuzzy, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "`@float' 環境ã®å¤–å´ã§ã¯ @%s ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, fuzzy, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "%s: オプション `--%s' ã¯å¼•æ•°ãŒä¸è¦ã§ã™\n"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image ã«ãƒ•ã‚¡ã‚¤ãƒ«åãŒä¸Žãˆã‚‰ã‚Œã¦ã„ã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, fuzzy, c-format, perl-format
msgid "@%s missing first argument"
msgstr "設定ファイルã®æ¬ è½ã€‚"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, fuzzy, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
#, fuzzy
msgid "superfluous arguments for node"
msgstr "%2$s ã«å¯¾ã™ã‚‹å¼•æ•° %1$s ãŒæ›–昧ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, fuzzy, c-format, perl-format
msgid "expected @end %s"
msgstr "終了インデックス"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s ã¸ã®å¼•æ•°ã¨ã—ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’与ãˆã‚‹ã«ã¯ã€ãƒ–レースを使ã„ã¾ã—ょã†"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, fuzzy, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, fuzzy, perl-format
msgid "environment command %s as argument to @%s"
msgstr "@%s ã¸ã®å¼•æ•°ã¨ã—ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’与ãˆã‚‹ã«ã¯ã€ãƒ–レースを使ã„ã¾ã—ょã†"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, fuzzy, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "iconv 関数ãŒä½¿ãˆã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, fuzzy, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s 引数㯠`%s' ã§ã¯ãªãã¦ã€æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, fuzzy, c-format, perl-format
msgid "reserved index name %s"
msgstr "èªè­˜ã§ããªã„エミュレーションå `%s' ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, fuzzy, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "ä¸æ˜Žãªã‚¨ã‚¹ã‚±ãƒ¼ãƒ— '\\%c' ãŒæ–‡å­—列内ã«ã‚ã‚Šã¾ã™ã€‚無視ã•ã‚Œã¾ã—ãŸ"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, fuzzy, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "ä¸æ˜Žãªç´¢å¼• `%s' ã§ã™"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, fuzzy, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "@printindex ã«ä¸æ˜Žãªè¦‹å‡ºã— `%s' ãŒã‚ã‚Šã¾ã™"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, fuzzy, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s 引数㯠`%s' ã§ã¯ãªãã¦ã€æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "@%s 10 ã¾ãŸã¯ 11 ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚`%s' ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: --footnote-style 引数㯠`%s' ã§ã¯ãªãã€`separate' åˆã¯ `end' ã§ãªã‘ã‚Œã°\n"
" ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s 引数㯠`%s' ã§ã¯ãªãã¦ã€æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, fuzzy, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent 引数㯠`%s' ã§ã¯ãªãã€æ•°å€¤/`none'/`asis' ã§ãªã‘ã‚Œã°\n"
" ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: --paragraph-indent 引数㯠`%s' ã§ã¯ãªãã€æ•°å€¤/`none'/`asis' ã§ãªã‘ã‚Œã°\n"
" ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, fuzzy, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent 引数㯠`%s' ã§ã¯ãªãã€æ•°å€¤/`none'/`asis' ã§ãªã‘ã‚Œã°\n"
" ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, fuzzy, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "@%s 㯠on ã¾ãŸã¯ off ãŒäºˆæœŸã•ã‚Œã¾ã™ã€‚`%s' ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, fuzzy, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: --footnote-style 引数㯠`%s' ã§ã¯ãªãã€`separate' åˆã¯ `end' ã§ãªã‘ã‚Œã°\n"
" ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, fuzzy, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: --footnote-style 引数㯠`%s' ã§ã¯ãªãã€`separate' åˆã¯ `end' ã§ãªã‘ã‚Œã°\n"
@@ -3031,7 +3146,7 @@ msgstr "ホストåã«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã›ã‚“"
msgid "@%s not empty"
msgstr "コメント内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
@@ -3043,215 +3158,221 @@ msgstr ""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "åå‰ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "å‚ç…§ã•ã‚Œã¦ã„ãªã„ノード `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s ã¯å­˜åœ¨ã—ãªã„ `%s' ã‚’å‚ç…§ã—ã¦ã„ã¾ã™"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, fuzzy, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"ノード `%s' ã«ã¯ 上ä½é …ç›®ãŒã‚ã‚‹ã®ã«ã€`%s' ã¸ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚¢ã‚¤ãƒ†ãƒ ã‚’欠ã„ã¦ã„ã¾ã™"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, fuzzy, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "åå‰ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, fuzzy, perl-format
msgid "empty index key in @%s"
msgstr "コメント内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, fuzzy, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, fuzzy, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "%(service)s on %(device)s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, fuzzy, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, fuzzy, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "%s: `%s' ã®ã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã«å¤±æ•—\n"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, fuzzy, perl-format
msgid "l2h: could not open %s: %s"
msgstr "@%s: %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, fuzzy, perl-format
msgid "l2h: could not load %s: %s"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, fuzzy, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, fuzzy, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "libnotify ã®åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, fuzzy, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "%s: `%s' ã®ã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã«å¤±æ•—\n"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, fuzzy, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "åˆæœŸä½œæ¥­ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æˆ»ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, fuzzy, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "設定ファイルã®æ¬ è½ã€‚"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "%sã®èª­è¾¼ã¿ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, fuzzy, perl-format
msgid "%s: unknown variable %s"
msgstr "ä¸æ˜Žãªã‚·ã‚°ãƒŠãƒ« %d"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, fuzzy, perl-format
msgid "%s: unknown variable %s\n"
msgstr "ä¸æ˜Žãªã‚·ã‚°ãƒŠãƒ« %d"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, fuzzy, perl-format
msgid "could not read init file %s"
msgstr " @FILE オプションを FILE ã‹ã‚‰èª­ã¿è¾¼ã‚€\n"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, fuzzy, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "%s: èªè­˜ã§ããªã„ TEXINFO_OUTPUT_FORMAT ã®å€¤ `%s' を無視ã—ã¦ã„ã¾ã™ã€‚\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, fuzzy, perl-format
+#| msgid "Usage: %s [OPTION]... FILE...\n"
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "使用法: %s [OPTION]... FILE...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
#, fuzzy
+#| msgid ""
+#| "Translate Texinfo source documentation to various other formats, by "
+#| "default\n"
+#| "Info files suitable for reading online with Emacs or standalone GNU "
+#| "Info.\n"
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3262,7 +3383,7 @@ msgstr ""
"Texinfo ソース文書を様々ãªå½¢å¼ã§èª­ã‚るよã†ã«å¤‰æ›ã—ã¾ã™ã€‚デフォルトã§ã¯\n"
"オンライン㧠Emacs ã‚„å˜ç‹¬ã® GNU Info ã§èª­ã‚€ã®ã«é©ã—㟠Info ファイルã§ã™ã€‚\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, fuzzy, perl-format
msgid ""
"General options:\n"
@@ -3297,8 +3418,16 @@ msgstr ""
" -v, --verbose è¡Œãªã‚れる事を説明ã™ã‚‹ã€‚\n"
" --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹ã€‚\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
+#| msgid ""
+#| "Output format selection (default is to produce Info):\n"
+#| " --docbook output Docbook XML rather than Info.\n"
+#| " --html output HTML rather than Info.\n"
+#| " --plaintext output plain text rather than Info.\n"
+#| " --xml output Texinfo XML rather than Info.\n"
+#| " --dvi, --dvipdf, --ps, --pdf call texi2dvi to generate given "
+#| "output.\n"
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3316,7 +3445,7 @@ msgstr ""
" --dvi, --dvipdf, --ps, --pdf texi2dvi を呼ã³å‡ºã—ã¦æŒ‡å®šã•ã‚ŒãŸå‡ºåŠ›ã‚’生æˆ"
"ã™ã‚‹ã€‚\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
#, fuzzy
msgid ""
"General output options:\n"
@@ -3359,7 +3488,7 @@ msgstr ""
" -o, --output=FILE FILE ã¸å‡ºåŠ›ã™ã‚‹ (分割 HTML ã®å ´åˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆ"
"リ)。\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3399,7 +3528,7 @@ msgstr ""
" --split-size=NUM Info ファイルをサイズ NUM ã§åˆ†å‰²ã™ã‚‹ (default "
"%d)。\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3426,20 +3555,29 @@ msgstr ""
"æˆã™ã‚‹;\n"
" デフォルトã§ã¯åˆ†å‰²æ™‚ã«ã®ã¿è¨­å®šã•ã‚Œã‚‹ã€‚\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
#, fuzzy
+#| msgid ""
+#| "Input file options:\n"
+#| " --commands-in-node-names does nothing, retained for "
+#| "compatibility.\n"
+#| " -D VAR define the variable VAR, as with @set.\n"
+#| " -I DIR append DIR to the @include search path.\n"
+#| " -P DIR prepend DIR to the @include search path.\n"
+#| " -U VAR undefine the variable VAR, as with "
+#| "@clear.\n"
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3456,7 +3594,7 @@ msgstr ""
" -P DIR @include 探索パスã®å…ˆé ­ã« DIR を挿入ã™ã‚‹ã€‚\n"
" -U VAR 変数 VAR を未定義ã«ã™ã‚‹ã€‚@clear ã¨åŒã˜ã€‚\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
#, fuzzy
msgid ""
"Conditional processing in input:\n"
@@ -3498,7 +3636,7 @@ msgstr ""
" ã¾ãŸã€--no-ifFORMAT オプションを指定ã™ã‚‹ã¨ @ifnotFORMAT テキストを処ç†ã™"
"る。\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3514,7 +3652,7 @@ msgstr ""
" 平文テキストを生æˆã™ã‚‹å ´åˆã€--ifplaintext ãŒæœ‰åŠ¹ã§ã€ä»–ã¯ç„¡åŠ¹ã«ãªã‚Šã¾ã™ã€‚\n"
" XML を生æˆã™ã‚‹å ´åˆã€--ifxml ãŒæœ‰åŠ¹ã§ã€ä»–ã¯ç„¡åŠ¹ã«ãªã‚Šã¾ã™ã€‚\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
#, fuzzy
msgid ""
"Examples:\n"
@@ -3550,105 +3688,350 @@ msgstr ""
" makeinfo --no-split foo.texi 大ãã•ã«ã‹ã‹ã‚らãšä¸€ã¤ã® Info ファイ"
"ルã«æ›¸ã込む\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style 引数㯠`%s' ã§ã¯ãªãã€`separate' åˆã¯ `end' ã§ãªã‘ã‚Œã°\n"
" ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent 引数㯠`%s' ã§ã¯ãªãã€æ•°å€¤/`none'/`asis' ã§ãªã‘ã‚Œã°\n"
" ãªã‚Šã¾ã›ã‚“。\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, fuzzy, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr "%s を生æˆã™ã‚‹ã¨ãã«ã€-o ã«ã¯å…¥åŠ›ãƒ•ã‚¡ã‚¤ãƒ«ã‚’1ã¤ã ã‘指定ã—ã¾ã™ã€‚"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, fuzzy, perl-format
msgid "unknown tree transformation %s"
msgstr "ä¸æ˜Žãªã‚¨ã‚¹ã‚±ãƒ¼ãƒ— '\\%c' ãŒæ–‡å­—列内ã«ã‚ã‚Šã¾ã™ã€‚無視ã•ã‚Œã¾ã—ãŸ"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: ファイル引数を忘れã¦ã„ã¾ã™ã‚ˆ\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "詳ã—ã㯠`%s --help' を実行ã—ã¦ãã ã•ã„。\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, fuzzy, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, fuzzy, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, fuzzy, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%(service)s on %(device)s"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, fuzzy, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, fuzzy, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+msgid "no matching `@end %s'"
+msgstr "`%cend %s' ã¨ã®å¯¾å¿œãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+msgid "misplaced {"
+msgstr "é–“é•ã£ãŸä½ç½®ã« %c ãŒã‚ã‚Šã¾ã™"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+msgid "unmatched `@end %s'"
+msgstr "`%c%s' ã¨ã®å¯¾å¿œãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s ã«ã¯åå‰ãŒå¿…è¦ã§ã™"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+msgid "bad name for @set"
+msgstr "エミュレーションモードåãŒã‚ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s ã«ã¯åå‰ãŒå¿…è¦ã§ã™"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+msgid "bad name for @clear"
+msgstr "エミュレーションモードåãŒã‚ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s ã«ã¯åå‰ãŒå¿…è¦ã§ã™"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+msgid "bad name for @unmacro"
+msgstr "エミュレーションモードåãŒã‚ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s ã¸ã®å¼•æ•°ã¨ã—ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’与ãˆã‚‹ã«ã¯ã€ãƒ–レースを使ã„ã¾ã—ょã†"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "@%s ã¸ã®å¼•æ•°ã¨ã—ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’与ãˆã‚‹ã«ã¯ã€ãƒ–レースを使ã„ã¾ã—ょã†"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+msgid "bad argument to @alias"
+msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+msgid "bad argument to @definfoenclose"
+msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+msgid "empty @columnfractions"
+msgstr "コメント内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "@%s 10 ã¾ãŸã¯ 11 ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚`%s' ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: --footnote-style 引数㯠`%s' ã§ã¯ãªãã€`separate' åˆã¯ `end' ã§ãªã‘ã‚Œã°\n"
+" ãªã‚Šã¾ã›ã‚“。\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "%s: %s 引数㯠`%s' ã§ã¯ãªãã¦ã€æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+msgid "bad argument to @need: %s"
+msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"%s: --paragraph-indent 引数㯠`%s' ã§ã¯ãªãã€æ•°å€¤/`none'/`asis' ã§ãªã‘ã‚Œã°\n"
+" ãªã‚Šã¾ã›ã‚“。\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+msgid "bad argument to @headings: %s"
+msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s ã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™: %citem ã‚’æ•´å½¢ã™ã‚‹ãŸã‚"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+msgid "unmatched `@end'"
+msgstr "`%c%s' ã¨ã®å¯¾å¿œãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "%s: --auto/-a オプションã«å¯¾ã—ã¦ä¸å½“ãªå¼•æ•°\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+msgid "bad argument to @end: %s"
+msgstr "@%s ã«å¯¾ã™ã‚‹èª¤ã£ãŸå¼•æ•°ã§ã™: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+msgid "@include: could not find %s"
+msgstr "@%s: `%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+msgid "@include: could not open %s:"
+msgstr "@%s: %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "`@titlepage' 環境ã®å¤–å´ã§ã¯ @%s ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "`@%2$s' ブロックã®å†…å´ã§ã¯ `@%1$s' ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "`@%2$s' ブロックã®å†…å´ã§ã¯ `@%1$s' ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s 㯠`@titlepage' ãŠã‚ˆã³ `@quotation' 環境ã®å¤–å´ã§ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s ã«ã¯åå‰ãŒå¿…è¦ã§ã™"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "引数 `%3$s' ã«å¯¾ã—㦠%1$s%2$s ãŒç„¡åŠ¹ã§ã™"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s 㯠`%s' ã§ã¯ãªãã€`i' ã‹ `j' を引数ã¨ã—ã¦å¿…è¦ã¨ã—ã¾ã™"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "定義ã•ã‚Œã¦ã„ãªã„フラグ: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s ã¯å»ƒæ­¢äºˆå®š (ã¾ãŸã¯å»ƒæ­¢æ¸ˆã¿) ã§ã™ã€‚"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s ã¯å»ƒæ­¢äºˆå®š (ã¾ãŸã¯å»ƒæ­¢æ¸ˆã¿) ã§ã™; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+msgid "@\\ should only appear in math context"
+msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+msgid "@verb without associated character"
+msgstr "エスケープ文字内ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s 㯠`%s' ã§ã¯ãªãã€`i' ã‹ `j' を引数ã¨ã—ã¦å¿…è¦ã¨ã—ã¾ã™"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+msgid "misplaced }"
+msgstr "é–“é•ã£ãŸä½ç½®ã« %c ãŒã‚ã‚Šã¾ã™"
+
+#, c-format
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
#~ msgstr "%s: オプション '--%s' ã¯å¼•æ•°ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n"
+#, c-format
#~ msgid "%s: unrecognized option '--%s'\n"
#~ msgstr "%s: オプション '--%s' ã‚’èªè­˜ã§ãã¾ã›ã‚“\n"
+#, c-format
#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
#~ msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n"
+#, c-format
#~ msgid "%s: option '-W %s' requires an argument\n"
#~ msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n"
#~ msgid "Insert this character"
#~ msgstr "ã“ã®æ–‡å­—を挿入ã™ã‚‹"
+#, c-format
#~ msgid "No index entries."
#~ msgstr "見出ã—é …ç›®ãŒã‚ã‚Šã¾ã›ã‚“"
#~ msgid "CAN'T SEE THIS"
#~ msgstr "*ã“れを見られã¾ã›ã‚“*"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "* Menu: Nodes whose indices contain `%s':\n"
@@ -3656,15 +4039,19 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ "\n"
#~ "* メニュー: `%s' ã‚’å«ã‚€è¦‹å‡ºã—é …ç›®:\n"
+#, c-format
#~ msgid "No index"
#~ msgstr "見出ã—ãŒã‚ã‚Šã¾ã›ã‚“"
+#, c-format
#~ msgid "Index for `%s'"
#~ msgstr "`%s' ã®è¦‹å‡ºã—"
+#, c-format
#~ msgid "can't open %s: %s"
#~ msgstr "%s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“: %s"
+#, c-format
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "デãƒãƒƒã‚°å‡ºåŠ›ã¯ \"%s\" ã«é€ã‚‰ã‚Œã¾ã™"
@@ -3701,24 +4088,31 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ "Info ウィンドウã®åŸºæœ¬çš„ãªã‚³ãƒžãƒ³ãƒ‰\n"
#~ "******************************\n"
+#, c-format
#~ msgid " %-10s Quit this help.\n"
#~ msgstr " %-10s ã“ã®ãƒ˜ãƒ«ãƒ—を終了ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Quit Info altogether.\n"
#~ msgstr " %-10s Info も一緒ã«çµ‚了ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Invoke the Info tutorial.\n"
#~ msgstr " %-10s Info ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«ã‚’èµ·å‹•ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Move to the `next' node of this node.\n"
#~ msgstr " %-10s ã“ã®ãƒŽãƒ¼ãƒ‰ã® `次' ã®ãƒŽãƒ¼ãƒ‰ã¸ç§»å‹•ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Move to the `previous' node of this node.\n"
#~ msgstr " %-10s ã“ã®ãƒŽãƒ¼ãƒ‰ã® `å‰' ã®ãƒŽãƒ¼ãƒ‰ã¸ç§»å‹•ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Move `up' from this node.\n"
#~ msgstr " %-10s ã“ã®ãƒŽãƒ¼ãƒ‰ã‹ã‚‰ `上' ã¸ç§»å‹•ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid ""
#~ " %-10s Pick menu item specified by name.\n"
#~ " Picking a menu item causes another node to be selected.\n"
@@ -3726,21 +4120,27 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ " %-10s 指定ã—ãŸåå‰ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚¢ã‚¤ãƒ†ãƒ ã‚’é¸æŠžã™ã‚‹ã€‚\n"
#~ " メニューアイテムをé¸æŠžã™ã‚‹ã¨ä»–ã®ãƒŽãƒ¼ãƒ‰ãŒé¸æŠžã•ã‚Œã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Follow a cross reference. Reads name of reference.\n"
#~ msgstr " %-10s 相互å‚照を辿る。å‚ç…§åを読ã¿å–る。\n"
+#, c-format
#~ msgid " %-10s Move to the last node seen in this window.\n"
#~ msgstr " %-10s ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§æœ€å¾Œã«è¦‹ãŸãƒŽãƒ¼ãƒ‰ã¸ç§»å‹•ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Skip to next hypertext link within this node.\n"
#~ msgstr " %-10s ã“ã®ãƒŽãƒ¼ãƒ‰å†…ã®æ¬¡ã®ãƒã‚¤ãƒ‘ーリンクã¸ã‚¹ã‚­ãƒƒãƒ—ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Follow the hypertext link under cursor.\n"
#~ msgstr " %-10s カーソルä½ç½®ã®ãƒã‚¤ãƒ‘ーリンクを辿る。\n"
+#, c-format
#~ msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"
#~ msgstr " %-10s `ディレクトリ' ノードã¸ç§»å‹•ã€‚`g (DIR)' ã¨åŒã˜ã€‚\n"
+#, c-format
#~ msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n"
#~ msgstr " %-10s Top ノードã¸ç§»å‹•ã€‚`g Top' ã¨åŒã˜ã€‚\n"
@@ -3751,21 +4151,27 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ "ノード内ã§ã®ç§»å‹•:\n"
#~ "---------------------\n"
+#, c-format
#~ msgid " %-10s Scroll forward a page.\n"
#~ msgstr " %-10s 1 ページ分å‰æ–¹ã¸é€²ã‚る。\n"
+#, c-format
#~ msgid " %-10s Scroll backward a page.\n"
#~ msgstr " %-10s 1 ページ分後方ã¸æˆ»ã™ã€‚\n"
+#, c-format
#~ msgid " %-10s Go to the beginning of this node.\n"
#~ msgstr " %-10s ç¾åœ¨ã®ãƒŽãƒ¼ãƒ‰ã®å…ˆé ­ã¸ç§»å‹•ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Go to the end of this node.\n"
#~ msgstr " %-10s ç¾åœ¨ã®ãƒŽãƒ¼ãƒ‰ã®å…ˆé ­ã¸ç§»å‹•ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Scroll forward 1 line.\n"
#~ msgstr " %-10s 1 行分å‰æ–¹ã¸ã™ã™ã‚る。\n"
+#, c-format
#~ msgid " %-10s Scroll backward 1 line.\n"
#~ msgstr " %-10s 1 行分後方ã¸æˆ»ã™ã€‚\n"
@@ -3776,12 +4182,15 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ "ãã®ä»–ã®ã‚³ãƒžãƒ³ãƒ‰:\n"
#~ "---------------\n"
+#, c-format
#~ msgid " %-10s Pick first...ninth item in node's menu.\n"
#~ msgstr " %-10s ノードメニューã®1ã‹ã‚‰9番目ã¾ã§ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’é¸æŠžã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid " %-10s Pick last item in node's menu.\n"
#~ msgstr " %-10s ノードメニューã®æœ€å¾Œã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’é¸æŠžã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search for a specified string in the index entries of this Info\n"
#~ " file, and select the node referenced by the first entry "
@@ -3790,6 +4199,7 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ " %-10s ã“ã® Info ファイルã®é …ç›®ã«å«ã¾ã‚Œã‚‹æŒ‡å®šã®æ–‡å­—列を検索ã—ã€æœ€åˆã«\n"
#~ " 一致ã—ãŸé …ç›®ã‹ã‚‰å‚ç…§ã•ã‚Œã¦ã„るノードã«ç§»å‹•ã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid ""
#~ " %-10s Move to node specified by name.\n"
#~ " You may include a filename as well, as in "
@@ -3799,6 +4209,7 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ " `(ファイルå)ノードå' ã®ã‚ˆã†ã«ãƒ•ã‚¡ã‚¤ãƒ«åã‚‚å«ã‚ã‚‹\n"
#~ " ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search forward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3806,6 +4217,7 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ " %-10s 指定ã—ãŸæ–‡å­—列をå‰æ–¹æ¤œç´¢ã™ã‚‹\n"
#~ " 次ã«ä¸€è‡´ã—ãŸæ–‡å­—列ãŒè¦‹ã¤ã‹ã£ãŸå ´åˆã¯ãƒŽãƒ¼ãƒ‰ã‚’é¸æŠžã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search backward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3813,9 +4225,11 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ " %-10s 指定ã—ãŸæ–‡å­—列を後方検索ã™ã‚‹\n"
#~ " 次ã«ä¸€è‡´ã—ãŸæ–‡å­—列ãŒè¦‹ã¤ã‹ã£ãŸå ´åˆã¯ãƒŽãƒ¼ãƒ‰ã‚’é¸æŠžã™ã‚‹ã€‚\n"
+#, c-format
#~ msgid "ESC %s is undefined."
#~ msgstr "ESC %s ã¯å®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+#, c-format
#~ msgid "%s is defined to %s."
#~ msgstr "%s 㯠%s ã«å®šç¾©ã•ã‚Œã¦ã„ã¾ã™ã€‚"
@@ -3826,24 +4240,31 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ "ä»–ã®ãƒŽãƒ¼ãƒ‰ã‚’é¸æŠžã™ã‚‹:\n"
#~ "----------------------\n"
+#, c-format
#~ msgid "incorrect number of arguments"
#~ msgstr "引数ã®æ•°å­—ãŒé–“é•ã£ã¦ã„ã¾ã™"
+#, c-format
#~ msgid "cannot open input file `%s'"
#~ msgstr "入力ファイル `%s' ã‚’é–‹ã‘ã¾ã›ã‚“"
+#, c-format
#~ msgid "cannot create output file `%s'"
#~ msgstr "出力ファイル `%s' を作æˆã§ãã¾ã›ã‚“"
+#, c-format
#~ msgid "error writing to `%s'"
#~ msgstr "`%s' ã¸ã®æ›¸ãè¾¼ã¿ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
+#, c-format
#~ msgid "error closing output file `%s'"
#~ msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
+#, c-format
#~ msgid "section too long"
#~ msgstr "セクションãŒé•·ã™ãŽã¾ã™"
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INPUT-FILE]\n"
#~ "\n"
@@ -3869,34 +4290,41 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ " --help ã“ã®ãƒ˜ãƒ«ãƒ—メッセージを表示ã—ã¦çµ‚了ã™ã‚‹\n"
#~ " --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報を表示ã—ã¦çµ‚了ã™ã‚‹\n"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too small"
#~ msgstr "無効㪠infokey ファイル `%s' を無視ã—ã¾ã™ - å°ã•ã™ãŽã¾ã™"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too big"
#~ msgstr "無効㪠infokey ファイル `%s' を無視ã—ã¾ã™ - 大ãã™ãŽã¾ã™"
+#, c-format
#~ msgid "Error reading infokey file `%s' - short read"
#~ msgstr ""
#~ "infokey ファイル `%s' 読込ã¿ä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—㟠- 読ã¿è¾¼ã¿ãŒçŸ­ã™ãŽã¾"
#~ "ã™"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
#~ msgstr ""
#~ "infokey ファイル `%s' ãŒç„¡åŠ¹ (é–“é•ã£ãŸãƒžã‚¸ãƒƒã‚¯ç•ªå·) ã§ã™ -- infokey を実行"
#~ "ã—ã¦æ›´æ–°ã—ã¦ãã ã•ã„"
+#, c-format
#~ msgid "Your infokey file `%s' is out of date -- run infokey to update it"
#~ msgstr ""
#~ "ã‚ãªãŸã® infokey ファイル `%s' ã¯å¤ã„ã§ã™ -- infokey を実行ã—ã¦æ›´æ–°ã—ã¦ã"
#~ "ã ã•ã„"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
#~ msgstr ""
#~ "infokey ファイル `%s' ãŒç„¡åŠ¹ (é–“é•ã£ãŸã‚»ã‚¯ã‚·ãƒ§ãƒ³é•·) ã§ã™ -- infokey を実行"
#~ "ã—ã¦æ›´æ–°ã—ã¦ãã ã•ã„"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
#~ msgstr ""
@@ -3913,6 +4341,7 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ "infokey ファイルã«é–“é•ã£ãŸãƒ‡ãƒ¼ã‚¿ãŒã‚ã‚Šã¾ã™ -- ã„ãã¤ã‹ã®å¤‰æ•°è¨­å®šãŒç„¡è¦–ã•ã‚Œ"
#~ "ã¾ã—ãŸ"
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "未定義ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã™: %s"
@@ -3922,9 +4351,11 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ msgid "No `Prev' for this node."
#~ msgstr "ã“ã®ãƒŽãƒ¼ãƒ‰ã® `å‰' ã¯ã‚ã‚Šã¾ã›ã‚“。"
+#, c-format
#~ msgid "Kill node (%s): "
#~ msgstr "ノードã®åˆ‡ã‚Šå–ã‚Š (%s): "
+#, c-format
#~ msgid "Cannot kill node `%s'"
#~ msgstr "`%s' ノードを切りå–ã‚Œã¾ã›ã‚“"
@@ -3934,27 +4365,33 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ msgid "Kill this node"
#~ msgstr "ã“ã®ãƒŽãƒ¼ãƒ‰ã‚’切りå–ã‚‹"
+#, c-format
#~ msgid "writing file %s"
#~ msgstr "ファイル %s を書ãè¾¼ã¿ä¸­..."
+#, c-format
#~ msgid "closing file %s"
#~ msgstr "ファイル %s ã‚’é–‰ã˜ã¦ã„ã¾ã™"
#~ msgid "Internally used by \\[universal-argument]"
#~ msgstr "内部的㫠\\[universal-argument] ã«ã‚ˆã£ã¦åˆ©ç”¨ã•ã‚Œã¾ã™"
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: 仮想メモリを使ã„æžœãŸã—ã¾ã—ãŸ!\n"
#~ msgid "--*** Tags out of Date ***"
#~ msgstr "--*** æ—§å¼ã®ã‚¿ã‚° ***"
+#, c-format
#~ msgid "-%s---Info: %s, %d lines --%s--"
#~ msgstr "-%s---Info: %s, %d 行 --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
#~ msgstr "-%s%s-Info: (%s)%s, %d 行 --%s--"
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr " 副ファイル: %s"
@@ -3962,15 +4399,31 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ msgid "arguments are quoted by default"
#~ msgstr "@quote-arg ã¯å»ƒæ­¢ã•ã‚Œã¾ã—ãŸã€‚引数ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§å¼•ç”¨ç¬¦ã§ããられã¾ã™"
-#, fuzzy
+#, fuzzy, perl-format
#~ msgid "Obsolete variable %s\n"
#~ msgstr "変数を設定: "
+#, fuzzy, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "ã“ã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã§ã¯ã€ã“ã®ãƒŽãƒ¼ãƒ‰ã® `å‰' ã‚„ `上' ã¯ã‚ã‚Šã¾ã›ã‚“。"
+
+#, fuzzy, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "å‚ç…§ã•ã‚Œã¦ã„ãªã„ノード `%s'"
+
+#, fuzzy, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "出力ファイル `%s' ã‚’é–‰ã˜ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
+
#, fuzzy
+#~ msgid "empty node name"
+#~ msgstr "èªè­˜ã§ããªã„エミュレーションå `%s' ã§ã™"
+
+#, fuzzy, perl-format
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "変数を設定: "
-#, fuzzy
+#, fuzzy, perl-format
#~ msgid "obsolete variable %s\n"
#~ msgstr "変数を設定: "
@@ -3986,14 +4439,17 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ msgid "send output to FILE"
#~ msgstr "出力を FILE ã«é€ã‚‹"
+#, c-format
#~ msgid "Generate a sorted index for each TeX output FILE.\n"
#~ msgstr "å„ TeX 出力㮠FILE ã«å¯¾ã™ã‚‹ã‚½ãƒ¼ãƒˆæ¸ˆã¿ç´¢å¼•ã‚’生æˆã—ã¾ã™ã€‚\n"
+#, c-format
#~ msgid ""
#~ "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
#~ msgstr ""
#~ "通常 FILE... 㯠`foo.texi' 文書ã«å¯¾ã—ã¦`foo.%c%c' ã¨ã—ã¦æŒ‡å®šã—ã¾ã™ã€‚\n"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "Options:\n"
@@ -4001,14 +4457,18 @@ msgstr "%s: --css-file %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“"
#~ "\n"
#~ "オプション:\n"
+#, c-format
#~ msgid "failure reopening %s"
#~ msgstr "%s ã®ã‚’å†åº¦é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
+#, c-format
#~ msgid "%s: not a texinfo index file"
#~ msgstr "%s: texinfo ã®ç´¢å¼•ãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
+#, c-format
#~ msgid "No page number in %s"
#~ msgstr "%s ã«ãƒšãƒ¼ã‚¸ç•ªå·ãŒã‚ã‚Šã¾ã›ã‚“"
+#, c-format
#~ msgid "entry %s follows an entry with a secondary name"
#~ msgstr "%s é …ç›®ã«äºŒã¤ç›®ã®é …ç›®åãŒç¶šã„ã¦ã„ã¾ã™"
diff --git a/macros/texinfo/texinfo/po/nb.gmo b/macros/texinfo/texinfo/po/nb.gmo
index e0cd257f59..8085331823 100644
--- a/macros/texinfo/texinfo/po/nb.gmo
+++ b/macros/texinfo/texinfo/po/nb.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/nb.po b/macros/texinfo/texinfo/po/nb.po
index 69b695329c..9dc806e340 100644
--- a/macros/texinfo/texinfo/po/nb.po
+++ b/macros/texinfo/texinfo/po/nb.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 6.1.92\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-01-22 20:47+0100\n"
"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -27,26 +27,31 @@ msgstr "Ukjent systemfeil"
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: valget «%s» er flertydig\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: valget «%s» er flertydig; muligheter:"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: ukjent valg «%c%s»\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: valget «%c%s» tillater ikke argumenter\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: valget «--%s» krever et argument\n"
@@ -244,7 +249,6 @@ msgid "Insert completion"
msgstr "Sett inn fullføring"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Bygger fullføringer..."
@@ -268,7 +272,6 @@ msgid "found file %s"
msgstr "fant fil %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Fotnoter kunne ikke vises"
@@ -281,7 +284,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Fotnoter -----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Finner indeksinnslag..."
@@ -290,7 +292,8 @@ msgid "Look up a string in the index for this file"
msgstr "Lete opp en streng i indeksen til denne filen"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "Ingen indekser funnet."
@@ -299,7 +302,6 @@ msgid "Index entry: "
msgstr "Indeksinnslag: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Ingen indekser funnet."
@@ -316,17 +318,20 @@ msgstr ""
"kommando"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "Ingen tidligere indekssøkestrenger."
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No more index entries containing '%s'."
msgid "No more index entries containing '%s'"
msgstr "Ingen flere indeksoppføringer som inneholder «%s»."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No index entries containing '%s'."
msgid "No index entries containing '%s'"
msgstr "Ingen indeksoppføringer som inneholder «%s»."
@@ -374,26 +379,31 @@ msgstr "Ingen indeksoppføringer som inneholder «%s»."
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have '%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "Ingen tilgjengelig infofiler har «%s» i sine indekser."
#: info/info-utils.c:878
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Error converting file character encoding."
msgid "Error converting file character encoding"
msgstr "Feil ved konvertering av filtegnkoding."
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item '%s' in node '%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "Ingen menypunkt «%s» i noden «%s»."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node '%s'."
msgid "Cannot find node '%s'"
msgstr "Kan ikke finne noden «%s»."
#: info/info.c:437
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No program name given."
msgid "No program name given"
msgstr "Intet programnavn oppgitt."
@@ -422,7 +432,7 @@ msgstr "verdi %s er ikke gyldig for variabel %s"
msgid "Try --help for more information.\n"
msgstr "Prøv --help for mer informasjon.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -455,6 +465,14 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -a, --all use all matching manuals.\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILE remember user keystrokes in FILENAME.\n"
+#| " -f, --file=MANUAL specify Info manual to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -472,6 +490,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILE output selected nodes to FILE."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -491,11 +514,21 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr " -b, --speech-friendly vær vennlig ovenfor talesynteser.."
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --strict-node-location (for debugging) use Info file pointers as-"
+#| "is.\n"
+#| " --subnodes recursively output menu items.\n"
+#| " -v, --variable VAR=VALUE assign VALUE to Info variable VAR.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file.\n"
+#| " -x, --debug=NUMBER set debugging level (-1 for all).\n"
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -539,6 +572,21 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers select buffers menu entry in emacs manual\n"
+#| " info emacs -n Files start at Files node within emacs manual\n"
+#| " info '(emacs)Files' alternative way to start at Files node\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -569,7 +617,7 @@ msgstr ""
" info --subnodes -o ut.txt emacs dump hele bruksanvisningen til ut.txt\n"
" info -f ./foo.info vise filen ./foo.info, søker ikke katalogen"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -581,6 +629,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node '(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "Kan ikke finne noden «(%s)%s»."
@@ -594,61 +643,73 @@ msgstr "Markøren vises ikke innen dette vinduets node!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "Kan ikke slette det siste vinduet."
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "Ingen meny i denne noden."
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "Ingen fotnoter i denne noden."
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "Ingen kryssreferanser i denne noden."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No '%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "Ingen «%s»-peker for denne noden."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command '%c'; try '?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type '%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "Terminaltypen «%s» er ikke smart nok til å kjøre Info."
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "Du er allerede på den siste siden av denne noden."
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "Du er allerede på den første siden til denne noden."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "Bare et vindu."
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "Resulterende vindu ville blitt for lite."
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
@@ -846,6 +907,7 @@ msgstr "Beskriv tast: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s er udefinert."
@@ -864,11 +926,13 @@ msgstr "«%s» er ikke på noen taster"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s kan bare bli påkallet via %s."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s kan bli påkallet via %s."
@@ -883,17 +947,14 @@ msgid "could not open init file %s"
msgstr "Kan ikke åpne init-filen «%s»"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "tastesekvensen er for lang"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "manglende tastesekvens"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NULL-tegn (\\000) er ikke tillatt"
@@ -903,12 +964,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "NULL-tegn (^%c) er ikke tillatt"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "manglende handlingsnavn"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "kan ikke tilordne tastesekvens til menytall"
@@ -918,7 +977,6 @@ msgid "unknown action `%s'"
msgstr "Ukjent handling «%s»"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "handlingsnavn for langt"
@@ -928,22 +986,18 @@ msgid "extra characters following action `%s'"
msgstr "ekstra tegn følger handlingen «%s»"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "manglende variabelnavn"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "manglende «=» umiddelbart etter variabelnavn"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "variabelnavn for langt"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "verdi for lang"
@@ -965,7 +1019,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Lese et kommandonavn i ekkoområdet og utføre den"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an 'echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "Kan ikke utføre en «echo-area»-kommando her."
@@ -1048,7 +1103,6 @@ msgid "Show all matching files"
msgstr "Vis alle samsvarende filer"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Ingen fil-indeks"
@@ -1197,6 +1251,8 @@ msgstr "Velge dette menypunktet"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There isn't %d item in this menu."
+#| msgid_plural "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "Det er ikke %d punkt i denne menyen."
@@ -1226,6 +1282,7 @@ msgstr "Følge kryssreferanse: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "Referansen forsvant! (%s)."
@@ -1259,11 +1316,13 @@ msgstr "Velge referanse eller menypunkt på denne linjen"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node '%s'."
msgid "No menu in node '%s'"
msgstr "Ingen meny i noden «%s»."
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by '%s' in '%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "Klarte ikke å finne noden referert av «%s» i «%s»."
@@ -1301,11 +1360,13 @@ msgstr "Velge første node i denne filen"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "Ingen flere noder i dette dokumentet."
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No 'Prev' or 'Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
@@ -1359,7 +1420,6 @@ msgid "Select the most recently selected node"
msgstr "Velge den sist valgte noden"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Ingen tidligere node i historikken"
@@ -1373,11 +1433,13 @@ msgstr "Finne fil: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find '%s'."
msgid "Cannot find '%s'"
msgstr "Kan ikke finne «%s»."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file '%s'."
msgid "Could not create output file '%s'"
msgstr "Kunne ikke opprette utskriftsfil «%s»."
@@ -1404,6 +1466,7 @@ msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to '%s'."
msgid "Cannot open pipe to '%s'"
msgstr "Kan ikke åpne pipe til «%s»."
@@ -1422,22 +1485,26 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Skifte bruk av regulære uttrykk i søk"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Using regular expressions for searches"
msgstr "Bruk regulære uttrykk til søking."
#: info/session.c:3909
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches."
msgid "Using literal strings for searches"
msgstr "Bruk bokstavelige strenger til søking."
#: info/session.c:4112
#, fuzzy
+#| msgid "Search continued from the end of the document."
msgid "Search continued from the end of the document"
msgstr "Søket fortsatte fra slutten av dokumentet."
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the beginning of the document."
msgid "Search continued from the beginning of the document"
msgstr "Søk fortsatte fra begynnelsen av dokumentet."
@@ -1446,8 +1513,9 @@ msgstr "Søk fortsatte fra begynnelsen av dokumentet."
msgid "Searching subfile %s ..."
msgstr "Søker i delfil «%s»..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "Søk mislyktes"
@@ -1481,142 +1549,145 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Søkestrengen er for kort"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "GÃ¥r tilbake til siste treff fra %s"
-#: info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "No more matches."
msgid "No more matches"
msgstr "Ingen flere treff."
-#: info/session.c:4578
+#: info/session.c:4581
#, fuzzy
+#| msgid "Search this node and subnodes for a string."
msgid "Search this node and subnodes for a string"
msgstr "Søk i denne noden og under-noder etter en streng."
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "Søker i delfil «%s»..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Gå til neste treff i Info-undertréet"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Ingen aktive søk"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Gå til forige treff i Info-undertréet"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr ""
"Lese inn en streng og søke etter den med skille på store og små bokstaver"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Lese inn en streng og søke etter den"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Lese inn en streng og søke bakover etter den"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Gjenta forrige søk i samme retning"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Ingen tidligere søkestreng"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Gjenta forrige søk i motsatt retning"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Tøm viste søketreff"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Søke interaktivt for en streng mens du skriver"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Regexp I-søk bakover: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-søk bakover: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Regexp I-søk: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-søk: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Mislyktes "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Avbryte gjeldende operasjon"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Avbrutt"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Vis hvilken info-versjon som kjøres"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info versjon %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Tegne skjermen på nytt"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Avslutte Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Kjør kommandoen knyttet til denne tastens «liten-bokstav-variant»"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "Ukjent kommando (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "«%s» er ugyldig"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "«%s» er ugyldig"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Legge til dette siffret til det gjeldende numeriske argumentet"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Starte (eller multiplisere med 4) den gjeldende numeriske argumentet"
@@ -1964,12 +2035,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kunne ikke lese (%s) og kunne ikke opprette (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY uten tilhørende END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY uten tilhørende START-INFO-DIR-ENTRY"
@@ -1999,12 +2068,10 @@ msgid "excess command line argument `%s'"
msgstr "overflødig argument på kommandolinjen «%s»"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Ingen innfil angitt; prøv --help for mer informasjon."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon."
@@ -2023,303 +2090,260 @@ msgstr "ingen info-dir-oppføring i «%s»"
msgid "no entries found for `%s'; nothing deleted"
msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "kunne ikke åpne %s for skriving: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s er ikke en gyldig språkkode"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s er ikke en gyldig språkkode"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "Kunne ikke lese %s: %s."
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "Feil ved lukking av @verbatiminclude-fil %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: kan ikke finne %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "Kunne ikke åpne %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s «%s» er tidligere definert"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "her er den tidligere definisjonen av @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "tomt argument i @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "Feil ved lukking av %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "kan ikke opprette katalogene «%s» eller «%s»: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "kan ikke opprette katalogen «%s»: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image-fil «%s» ikke funnet, bruker «%s»"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "ingen argument spesifisert for @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-fil «%s» (for HTML) ikke funnet, bruker «%s»"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "kunne ikke åpne html-referansefilen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "manglende type"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "ukjent type: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "feil ved lukking av html-referansefilen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-file endte i en kommentar"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "kunne ikke åpne --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "Feil ved lukking av CSS-filen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "ingen htmlxref.cnf-oppføring funnet for «%s»"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "Feil ved lukking av rammefil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "Feil ved lukking av TOC-rammefil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "Feil ved lukking av omdirigeringsnodenfilen %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "gammelt navn for «%s» er en node for dokumentet"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "fil tom for omdøpt node «%s»"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "dokument uten noder"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s utenfor enhver node"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "oppføring for indeksen «%s» utenfor enhver node"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "feil ved lukking av bildetekstfile %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-fil «%s» er uleselig: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2327,639 +2351,678 @@ msgstr ""
"@strong{Note...} lager en overflødig kryssreferanse i Info; skriv om for å "
"unngå dette"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "@%s nodenavm bør ikke inneholdet «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "«.» eller «,» må følge @xref, ikke %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "«.» eller «,» må følge @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "Kunne ikke åpne %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "flere @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s krever et navn"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "dårlig navn for @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s mangler avsluttende krøllparentes"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' forventet «%s», men så «%s»"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "Ingen tilsvarende «%cend %s»"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "feilplassert %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "umatchet «%c%s»"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "makroen «%s» kalt med for mange argumenter"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s mangler avsluttende krøllparentes"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "makroen «%s» deklarert uten argument kalt med et argument"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ i @%s ekspansjon fulgt av «%s» istedet for parameternavn eller \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "mangler navn for @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "uventet argument på @%s linje: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "tom multitabell"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "overflødig argument til @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "ugyldig argument til @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s krever et argument: formattereren for %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "dialekt-kommando «@%s» ikke tillatt som @%s-argument"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s mangler argument"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "ukjent @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "overflødig argument til @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "dårlig argument til @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: kunne ikke åpne %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "ugjenkjennelig kodingsnavn «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s er kun meningsfull i en @multitable-linje"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "tomt menyoppføringsnavn i noden «%s»."
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "%s bør ikke forekomme i @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s bør bare forekomme ved begynnelsen av en linje"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makroen «%s» er tidligere definert"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "her er den tidligere definisjonen av «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "bruk krøllparenteser for å gi en kommando som et argument til @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s forventer «i» eller «j» som argument, ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s forventet krøllparanteser"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "ukjent kommando «%s»."
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "udefinert valg: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s er foreldet."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s er foreldet: %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s bør bare forekomme ved begynnelsen av en linje"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s er meningsløs innenfor en «@%s»-blokk"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s i tom multitabell"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "for mange kolonner i multitabell-element (maks %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignorerer @tab utenfor multitabell"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s er ikke tillat i en «@%s»-blokk"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear at the beginning of a line"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s bør bare forekomme ved begynnelsen av en linje"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "Må være etter «@%s» for å bruke «@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s gir ikke mening utenfor «@titlepage»- og «@quotation»-miljøer"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "region %s inne i region %s er ikke tillatt"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s sett før første @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s bør bare forekomme ved begynnelsen av en linje"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "uventet @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s er meningsløs utenfor et «@float»-miljø"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image mangler filnavn"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s mangler første argument"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "ikke-heksadesimale sifre i argument for @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "Forventet @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s bør kun akseptere en @-kommando som argument, ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "resterende argument på @%s linje %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "miljø-kommando %s som argument til @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp-argument må være numerisk, ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "Ukjent kildeindeks i %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "Ukjent indeks «%s» i @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "@%s-argument må være «top» eller «bottom», ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Kun @%s 10 eller 11 er støttet, ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "@%s-argument må være «separate» eller «end», ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s-argument må være «on», «off» eller «odd», ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "@paragraphindent-argument må være numerisk/«none»/«asis», ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"@firstparagraphindent-argument må være numerisk/«none»/«asis», ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "@exampleindent-argument må være numerisk/«asis», ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "forventet @%s på eller av, ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "@allowcodebreaks-argument må være «true» eller «false», ikke «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "@urefbreakstyle-argument må være «after»/«before»/«none», ikke «%s»"
@@ -2988,7 +3051,7 @@ msgstr ""
msgid "@%s not empty"
msgstr "@%s ikke tom"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s referanse til ikke-eksisterende node «%s»"
@@ -2998,214 +3061,214 @@ msgstr "@%s referanse til ikke-eksisterende node «%s»"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "ureferert node «%s»"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s referanse til ikke-eksisterende «%s»"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Noden «%s» mangler et menypunkt for «%s» til tross for at den er dens oppmål"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: kunne ikke åpne %s for skriving: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "I2h: kunne ikke åpne latex-fil %s for skriving : %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: kunne ikke åpne %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: kunne ikke åpne %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: kunne ikke åpne %s for skriving: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: kunne ikke åpne %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "feil ved lasting %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: ukjent variabel %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: ukjent variabel %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "Kunne ikke lese init-fil %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "ignorerer ugjenkjennelig TEXINFO_OUTPUT_FORMAT-verdi «%s».\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3221,7 +3284,7 @@ msgstr ""
"Dette programmet er ofte installert som både «makeinfo» og «texi2any»; \\ n\n"
"virkemåten er identisk og er ikke avhengig av det installerte navnet.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3255,7 +3318,7 @@ msgstr ""
" -v, --verbose forklar hva som blir gjort.\n"
" --version vis programversjon og avslutt.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3275,7 +3338,7 @@ msgstr ""
" etter å ha sjekket gyldigheten av TEXINFO-"
"FIL.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3325,7 +3388,7 @@ msgstr ""
" legg utdatafilen der.\n"
" Ellers navngir DEST utdatafilen.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3365,7 +3428,7 @@ msgstr ""
" --split-size=ANT splitte Infofilene ved lengde ANT (standard "
"%d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3391,19 +3454,19 @@ msgstr ""
" --node-files lag omdirigeringsfiler for noder og\n"
" ankre; som standard kun hvis splitt.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3425,7 +3488,7 @@ msgstr ""
" -U VAR udefiner variabelen VAR, som om @clear "
"brukes.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3463,7 +3526,7 @@ msgstr ""
"\n"
" Dessuten, for --no-ifFORMAT-alternativer, behandle @ifnotFORMAT-tekst.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3479,7 +3542,7 @@ msgstr ""
" dersom ren tekst genereres er --ifplaintext påslått og de andre av;\n"
" dersom XML genereres er --ifxml påslått og de andre av.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3508,63 +3571,63 @@ msgstr ""
" makeinfo --number-sections foo.texi skriv Info med nummererte avsnitt\n"
" makeinfo --no-split foo.texi skriv en Infofil uansett størrelse\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr "%s: ved generering av %s, kun én inndata-FIL kan spesifiseres med -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "alternativet --Xopt uten utdata-utskrifter"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "Ukjent tre-transformasjon «%s»"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "ignorerer splitting for format %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: mangler filargument.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"fill_gaps_in_sectioning-transformasjon returnerte ingen resultater. Ingen "
"seksjon?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "Feil ved lukking av makroutvidelsesfil %s: «%s»\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "kunne ikke åpne %s for skriving: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3572,33 +3635,298 @@ msgstr ""
"insert_nodes_for_sectioning_commands-transformasjon returnerte ingen "
"resultater. Ingen seksjon?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: feil ved lukking av %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: feil ved lukking av intern lenkefil %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: kunne ikke åpne %s for skriving: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "Ingen tilsvarende «%cend %s»"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "feilplassert %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "umatchet «%c%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s krever et navn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "dårlig navn for @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s krever et navn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "dårlig navn for @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s krever et navn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "dårlig navn for @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept a @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s bør kun akseptere en @-kommando som argument, ikke «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "miljø-kommando %s som argument til @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "ugyldig argument til @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "ugyldig argument til @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "tomt argument i @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "dårlig argument til @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Kun @%s 10 eller 11 er støttet, ikke «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "@%s-argument må være «on», «off» eller «odd», ikke «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "dårlig argument til @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"@firstparagraphindent-argument må være numerisk/«none»/«asis», ikke «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "dårlig argument til @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s krever et argument: formattereren for %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "umatchet «%c%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "overflødig argument til @%s %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "dårlig argument til @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: kan ikke finne %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: kunne ikke åpne %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s er kun meningsfull i en @multitable-linje"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s er meningsløs innenfor en «@%s»-blokk"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s er ikke tillat i en «@%s»-blokk"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s gir ikke mening utenfor «@titlepage»- og «@quotation»-miljøer"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s krever et navn"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s forventer «i» eller «j» som argument, ikke «%s»"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "udefinert valg: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s er foreldet."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s er foreldet: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear at the beginning of a line"
+msgid "@\\ should only appear in math context"
+msgstr "@%s bør bare forekomme ved begynnelsen av en linje"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s forventer «i» eller «j» som argument, ikke «%s»"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "feilplassert %c"
+
+#, c-format
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
#~ msgstr "%s: valget «--%s» tillater ikke et argument\n"
+#, c-format
#~ msgid "%s: unrecognized option '--%s'\n"
#~ msgstr "%s: ukjent valg «--%s»\n"
+#, c-format
#~ msgid "%s: option '-W %s' is ambiguous\n"
#~ msgstr "%s: valget «-W %s» er flertydig\n"
+#, c-format
#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
#~ msgstr "%s: valget «-W %s» tillater ikke argumenter\n"
+#, c-format
#~ msgid "%s: option '-W %s' requires an argument\n"
#~ msgstr "%s: valget «-W %s» krever et argument\n"
@@ -3615,15 +3943,19 @@ msgstr "%s: kunne ikke åpne %s for skriving: %s\n"
#~ " --restore=FIL lese innledende tastetrykk fra FIL.\n"
#~ " -O, --show-options, --usage gå til kommandolinjealternativ-node."
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "udefinert kommando: %s"
+#, c-format
#~ msgid "can't open %s: %s"
#~ msgstr "Kan ikke åpne %s: %s"
+#, c-format
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "debuggingsdata omdirigert til «%s»"
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: Tomt for virtuelt minne!\n"
@@ -3633,12 +3965,23 @@ msgstr "%s: kunne ikke åpne %s for skriving: %s\n"
#~ msgid "arguments are quoted by default"
#~ msgstr "argumenter siteres som standard"
+#, perl-format
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Foreldet variabel %s\n"
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "gammelt navn for «%s» er en node for dokumentet"
+
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "fil tom for omdøpt node «%s»"
+
+#, perl-format
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: foreldet variabel %s\n"
+#, perl-format
#~ msgid "obsolete variable %s\n"
#~ msgstr "foreldet variabel %s\n"
diff --git a/macros/texinfo/texinfo/po/nl.gmo b/macros/texinfo/texinfo/po/nl.gmo
index ac83e3f656..b20621d053 100644
--- a/macros/texinfo/texinfo/po/nl.gmo
+++ b/macros/texinfo/texinfo/po/nl.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/nl.po b/macros/texinfo/texinfo/po/nl.po
index 391e5e72b9..f93c07c1ec 100644
--- a/macros/texinfo/texinfo/po/nl.po
+++ b/macros/texinfo/texinfo/po/nl.po
@@ -12,10 +12,10 @@
# Ivo Timmermans <zarq@iname.com>, 1998.
msgid ""
msgstr ""
-"Project-Id-Version: texinfo-6.5.90\n"
+"Project-Id-Version: texinfo-6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-01-06 18:01+0100\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-20 16:40+0200\n"
"Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"Language: nl\n"
@@ -248,7 +248,6 @@ msgid "Insert completion"
msgstr "Een voltooiing invoegen"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Opbouwen van voltooiingen..."
@@ -272,7 +271,6 @@ msgid "found file %s"
msgstr "bestand %s gevonden"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "De voetnoten kunnen niet weergegeven worden"
@@ -286,7 +284,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Voetnoten ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Zoeken naar index-items..."
@@ -295,7 +292,6 @@ msgid "Look up a string in the index for this file"
msgstr "Een tekenreeks opzoeken in de index van dit document"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Geen indexen gevonden."
@@ -304,7 +300,6 @@ msgid "Index entry: "
msgstr "Index-item: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Geen indexen gevonden."
@@ -321,7 +316,6 @@ msgstr ""
"commando"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Geen eerdere index-zoektekenreeks."
@@ -386,7 +380,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Geen van de beschikbare Info-bestanden heeft '%s' in z'n index."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Fout tijdens converteren van tekencodering van bestand."
@@ -401,7 +394,6 @@ msgid "Cannot find node '%s'"
msgstr "Kan pagina '%s' niet vinden."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Geen programmanaam gegeven."
@@ -430,7 +422,7 @@ msgstr "waarde %s is niet geldig voor variabele %s"
msgid "Try --help for more information.\n"
msgstr "Gebruik '--help' voor meer informatie.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -574,7 +566,7 @@ msgstr ""
"dumpen\n"
" info -f ./foo.info het bestand './foo.info' tonen"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -892,17 +884,14 @@ msgid "could not open init file %s"
msgstr "kan initialisatiebestand %s niet openen"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "toetsenreeks is te lang"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "ontbrekende toetsenreeks"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-teken (\\000) is niet toegestaan"
@@ -912,12 +901,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "NUL-teken (^%c) is niet toegestaan"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "ontbrekende actienaam"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "kan geen toetsencombinatie aan menu-cijfer toekennen"
@@ -927,7 +914,6 @@ msgid "unknown action `%s'"
msgstr "onbekende actie '%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "actienaam is te lang"
@@ -937,22 +923,18 @@ msgid "extra characters following action `%s'"
msgstr "extra tekens na actie '%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "ontbrekende naam van variabele"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "ontbrekende '=' na naam van variabele"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "naam van variabele is te lang"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "waarde is te lang"
@@ -974,7 +956,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "De naam van een commando in de echoregel lezen en deze uitvoeren"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Kan hier geen 'echoregel'-commando uitvoeren."
@@ -1057,7 +1038,6 @@ msgid "Show all matching files"
msgstr "Alle overeenkomende bestanden tonen"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Geen bestandenindex"
@@ -1366,7 +1346,6 @@ msgid "Select the most recently selected node"
msgstr "Terug naar de laatst geziene pagina"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Er is geen vroegere pagina in de geschiedenis."
@@ -1427,12 +1406,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Het gebruik van reguliere expressies bij zoekopdrachten aan-/uitzetten"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Zoeken gebruikt reguliere expressies."
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Zoeken gebruikt letterlijke tekst."
@@ -1449,8 +1426,7 @@ msgstr "Het zoeken is verdergegaan vanaf het begin."
msgid "Searching subfile %s ..."
msgstr "Zoeken naar subbestand %s..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Niet gevonden."
@@ -1485,142 +1461,140 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Zoektekenreeks is te kort."
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Terugkerend naar de laatste overeenkomst in '%s'."
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Geen verdere overeenkomsten."
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Deze pagina en subpagina's doorzoeken naar een tekenreeks"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Zoeken onder '%s': "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Naar de volgende overeenkomst in de Info-subboom gaan"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Er is geen actieve zoekopdracht."
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Naar de voorgaande overeenkomst in de Info-subboom gaan"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Een tekenreeks lezen en er hoofdlettergevoelig naar zoeken"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Een tekenreeks lezen en er naar zoeken"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Een tekenreeks lezen en er achterwaarts naar zoeken"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "De laatste zoekopdracht in dezelfde richting herhalen"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Geen eerdere zoektekenreeks."
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "De laatste zoekopdracht in tegenovergestelde richting herhalen"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Getoonde zoekresultaten wissen"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Naar een tekenreeks zoeken terwijl u deze intypt"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Achterwaarts typend-zoeken naar expressie: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Achterwaarts typend-zoeken: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Typend-zoeken naar expressie: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Typend-zoeken: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "*Ongevonden* "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Huidige operatie annuleren"
# Dit is een reactie op bovenstaande 'Cancel current operation'.
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Geannuleerd"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "De versie van Info tonen"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info, versie %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Het venster opnieuw schrijven"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Info afsluiten"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr ""
"Commando uitvoeren dat behoort bij de kleinelettervariant van deze toets"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Onbekend commando (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" is ongeldig."
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "'%s' is ongeldig."
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Dit cijfer toevoegen aan het huidige numerieke argument"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr ""
"Een nieuw numeriek argument beginnen (of het huidige met 4 vermenigvuldigen)"
@@ -1978,12 +1952,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kan deze niet lezen (%s) en niet aanmaken (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY zonder bijpassende END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY zonder bijpassende START-INFO-DIR-ENTRY"
@@ -2013,12 +1985,10 @@ msgid "excess command line argument `%s'"
msgstr "commandoregel-argument '%s' is overbodig"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Geen invoerbestand gegeven; gebruik '--help' voor meer informatie."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Geen inhoudsbestand gegeven; gebruik '--help' voor meer informatie."
@@ -2037,24 +2007,24 @@ msgstr "geen Info-inhoudsitem in '%s'"
msgid "no entries found for `%s'; nothing deleted"
msgstr "geen items voor '%s' gevonden; er is niets verwijderd"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "kan %s niet openen om te schrijven: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"verplaats uw @contents-commando als u de inhoudsopgave na de titelpagina wilt"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2062,285 +2032,239 @@ msgstr ""
"verplaats uw @shortcontents- en @contents-commando's als u de inhoudsopgave "
"na de titelpagina wilt"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s is geen geldige taalcode"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s is geen geldige regiocode"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s is geen geldige splitsmogelijkheid"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "kan %s niet lezen: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "fout bij sluiten van '@verbatiminclude'-bestand %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: kan %s niet vinden"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "geen pagina om te hernoemen"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "pagina's zonder nieuwe naam aan einde van bestand"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "kan %s niet openen: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, fuzzy, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "Fout bij sluiten van %s, bestand met hernoemde pagina's: %s"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "kan hekje in @%s niet beschermen"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "lege paginanaam na expansie '%s'"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s '%s' is al eerder gedefinieerd"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "hier was de eerdere definitie van @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "leeg argument in @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: uitvoer is incompatibel met splitsing"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "fout bij sluiten van %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "kan mappen '%s' en '%s' niet aanmaken: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "kan map '%s' niet aanmaken: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image-bestand '%s' is niet gevonden; '%s' wordt gebruikt"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "geen argument opgegeven voor @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-bestand '%s' (voor HTML) is niet gevonden; '%s' wordt gebruikt"
# XXX Zet ook elders "ruw" om naar "rauw".
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "rauwe opmaak %s is niet omgezet"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "kan instellingenbestand %s voor HTML-referenties niet openen: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "ontbrekend type"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "onbekend type: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "fout bij sluiten van instellingenbestand %s voor HTML-referenties: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "tekenreeks niet afgesloten in CSS-bestand"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "'--css-include' eindigt in commentaar"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "'@import' is niet afgesloten in CSS-bestand"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS-bestand %s is niet gevonden"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "kan '--include-file'-bestand %s niet openen: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "fout bij sluiten van CSS-bestand %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "geen 'htmlxref.cnf'-item gevonden voor '%s'"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "fout bij sluiten van frames-bestand %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "fout bij sluiten van TOC-frames-bestand %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "verwerker %s van fase %s, prioriteit %s, is gestruikeld"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "een 'title'-commando en '@top' vereisen een titel"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "fout bij sluiten van %s, bestand met doorverwijzende pagina's: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "oude naam van '%s' is een pagina in het document"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "bestand is leeg voor hernoemde pagina '%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "doelpagina (nieuwe naam voor '%s') zit niet in document: %s"
-
-# XXX Is het node of nodes?
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"fout bij sluiten van %s, bestand met doorverwijzingen van hernoemde "
-"pagina's: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "lege paginanaam"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "syntax voor een externe pagina is gebruikt voor '%s'"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "document zonder pagina's"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "document zonder Top-pagina"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "hernoemen van %s is mislukt: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s is meer dan eens uitgevoerd: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s buiten alle pagina's"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "@node -- naam hoort geen ',' te bevatten: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Index-item in @%s met ':' produceert ongeldige Info: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "item voor index '%s' valt buiten alle pagina's"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "fout bij sluiten van %s, bestand met 'image'-tekst: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-bestand '%s' is onleesbaar: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "kan '@image'-bestand '%s.txt' niet vinden noch een alternatieve tekst"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2348,310 +2272,334 @@ msgstr ""
"@strong{Noot...} produceert een loze kruisverwijzing in Info; kies een ander "
"woord om dat te vermijden"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "@%s -- kruisverwijzingsnaam hoort geen ':' te bevatten"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "@%s -- paginanaam hoort geen '%s' te bevatten"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "@%s -- paginanaam hoort geen ':' te bevatten"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "'.' of ',' moet volgen op @xref, niet '%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "'.' of ',' moet volgen op '@xref'"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "paginanaam in menu-item hoort geen '%s' te bevatten"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "paginanaam in menu-item hoort geen ':' te bevatten"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "menu-itemnaam hoort geen ':' te bevatten"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "kan %s niet openen: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "meerdere @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "onjuist of leeg formeel argument van @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "onjuiste syntax voor argument van @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s vereist een naam"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "foute naam voor @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s gevonden vóór sluitaccolade van @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s gevonden vóór sluitaccolade van @%s"
# XXX Maybe "closing brace"? And "is missing a" or ":"?
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s: ontbrekende sluitaccolade"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s: afsluitende scheidingstekens ontbreken: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx hoort niet aan begin van @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx hoort na @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s bevat tekst maar geen @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "'@end' verwachtte '%s', maar vond '%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s gevonden vóór @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "geen overeenkomende '%cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "verkeerd geplaatste %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "ongepaarde '%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "macro '%s' wordt aangeroepen met te veel argumenten"
# XXX Maybe "closing brace"? And "is missing a" or ":"?
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s: ontbrekende sluitaccolade"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr ""
"macro '%s' die gedeclareerd is zonder argumenten wordt aangeroepen met een "
"argument"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"'\\' in @%s-expansie werd gevolgd door '%s' in plaats van een parameternaam "
"of '\\'"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "ontbrekende naam voor @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "ontbrekende categorie voor @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "onverwacht argument op @%s-regel: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "lege multitabel"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "overtollig argument van @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "fout argument van @%s"
# FIXME: formatter?
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s vereist een argument: de formatteerder voor %c-item"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"commando @%s dat geen argumenten in accolades accepteert hoort niet op een @"
"%s-regel"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "accentcommando '@%s' is niet toegestaan als argument van @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s: ontbrekend argument"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "onbekende @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "overtollig argument van @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "fout argument van @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: kan %s niet openen: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "codering '%s' is geen kanonieke Texinfo-codering"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "onbekende coderingsnaam '%s'"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s na het eerste element"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s is alleen zinvol op een '@multitable'-regel"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part hoort niet gerelateerd te zijn aan @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
"@node gevonden vóór @%s, maar delen mogen niet gerelateerd zijn aan pagina's"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "syntax voor een externe pagina is gebruikt voor '%s'"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "lege menu-itemnaam in '%s'"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "lege paginanaam in menu-item"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s hoort niet voor te komen in @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s hoort alleen voor te komen aan begin van regel"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro '%s' is al eerder gedefinieerd"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "hier was de eerdere definitie van '%s'"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "herdefiniëren van Texinfo-commando: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s zonder gerelateerd teken"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"een @%s gedefinieerd met nul argumenten of meer dan één argument hoort "
"aangeroepen te worden met {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2659,350 +2607,363 @@ msgstr ""
"macroaanroep is te diep genest (pas eventueel MAX_NESTED_MACROS aan; huidige "
"waarde is %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"recursieve aanroep van macro %s is niet toegestaan; gebruik indien nodig "
"'@rmacro'"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "na accentcommando '@%s' hoort geen witruimte te komen"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "gebruik '{...}' om een commando als argument mee te geven aan @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s verwacht 'i' of 'j' als argument, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "na accentcommando '@%s' hoort geen nieuwe regel te komen"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s verwachtte '{...}'"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "onbekend commando '%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "ongedefinieerde vlag: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "onjuiste syntax voor @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s is verouderd."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s is verouderd; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s hoort alleen voor te komen aan begin van regel"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s hoort alleen voor te komen in kop- of voetregel"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s is zinloos in een '@%s'-blok"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s in een lege multitabel"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab vóór @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "te veel kolommen in multitabel-item (maximaal %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "@tab buiten een multitabel wordt genegeerd"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s buiten tabel of lijst"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s is niet toegestaan in een '@%s'-blok"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s hoort alleen voor te komen in een index-item"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "niet meer dan twee niveaus van index-subitems zijn toegestaan"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "moet na '@%s' zijn om '@%s' te kunnen gebruiken"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s is niet zinvol buiten '@titlepage'- en '@quotation'-omgevingen"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory na eerste pagina"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "regio %s binnen regio %s is niet toegestaan"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry na eerste pagina"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu in ongeldige context"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s gevonden vóór de eerste @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"uw @top-pagina moet mogelijk ingepakt worden in @ifnottex in plaats van "
"@ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s hoort alleen voor te komen in een index-item"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s hoort alleen voor te komen in mathematische context"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "onverwachte @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s is niet zinvol buiten een '@float'-omgeving"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s hoort direct onder '@float'"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "meerdere @%s worden genegeerd"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "commando @%s accepteert geen argumenten"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
"bij commando @%s ontbreekt een paginanaam of een extern handleidingsargument"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "een lege kruisverwijzingsnaam in @%s na expansie '%s'"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "een lege kruisverwijzingstitel in @%s na expansie '%s'"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "ontbrekend bestandsnaamargument van @image"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "bij @%s ontbreekt eerste argument"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "niet-hexadecimale cijfers in argument van @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "minder dan vier hexadecimale cijfers in argument van @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "argument van @U overschrijdt Unicode-maximum 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "overtollige argumenten voor pagina"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "verwachtte @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s hoort alleen een @-commando als argument te accepteren, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "overblijvend argument op @%s-regel: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "omgevingscommando %s is gebruikt als argument van @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "lege @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "Kolomfractie is geen getal: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "Argument van @sp moet numeriek zijn, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "gereserveerde indexnaam %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "onbekende bronindex in @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "onbekende doelindex in @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
"@%s zou leiden tot het samenvoegen van %s met zichzelf -- wordt genegeerd"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "onbekende index '%s' in @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "afdrukken van een index '%s' samengevoegd met een andere, '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "afdrukopdracht vóór begin van document: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "Argument van @%s moet 'top' of 'bottom' zijn, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Bij @%s is alleen 10 of 11 mogelijk, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "Argument van @%s moet 'separate' of 'end' zijn, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "Argument van @%s moet 'on' of 'off' zijn, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"Argument van @paragraphindent moet numeriek, 'none' of 'asis' zijn, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"Argument van @firstparagraphindent moet 'none' of 'insert' zijn, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "Argument van @exampleindent moet numeriek of 'asis' zijn, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "bij @%s werd 'on' of 'off' verwacht, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"Argument van @kbdinputstyle moet 'code', 'example' of 'distinct' zijn, niet "
"'%s'"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "Argument van @allowcodebreaks moet 'true of 'false' zijn, niet '%s'"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"Argument van @urefbreakstyle moet 'after', 'before' of 'none' zijn, niet '%s'"
@@ -3033,7 +2994,7 @@ msgstr "er is geen sectioneringscommando gerelateerd aan @%s"
msgid "@%s not empty"
msgstr "@%s is niet leeg"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s verwijst naar niet-bestaande pagina '%s'"
@@ -3043,107 +3004,107 @@ msgstr "@%s verwijst naar niet-bestaande pagina '%s'"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s-paginanaam '%s' verschilt van %s-naam '%s'"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "naar pagina '%s' wordt niet verwezen"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "pagina '%s' is %s voor '%s' in de sectionering maar niet in het menu"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "pagina %s '%s' in menu '%s' en in sectionering '%s' verschillen"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "pagina '%s' is %s voor '%s' in het menu maar niet in de sectionering"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s-pointer '%s' (voor pagina '%s') verschilt van %s-naam '%s'"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s verwijst naar niet-bestaande '%s'"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"pagina '%s' bevat geen menu-item voor '%s'\n"
"ondanks dat de eerste het 'Up'-doel van de laatste is"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "bij '%s' komen 'Up' in menu '%s' en 'Up %s' niet overeen"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s naar '%s', verschilt van %s-naam '%s'"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "lege indexsleutel in @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: kan %s niet openen om te schrijven: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: fout bij sluiten van %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: kan '%s' niet openen om te schrijven: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: de map L2H_TMP bevat een dot"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: de huidge map bevat een dot"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: opdracht is niet gelukt: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: afbeelding heeft ongeldige extensie: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: hernoemen van %s naar %s is mislukt: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: kan %s niet openen: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: einde van @%s-item %d niet gevonden"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3152,12 +3113,12 @@ msgstr ""
"latex2html.pm: bewerking produceerde %d items in HTML;\n"
"verwacht werden %d, het aantal items in het document"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: kan fragment %d voor @%s niet bepalen"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3165,47 +3126,47 @@ msgid ""
msgstr ""
"l2h: kan fragment %d voor @%s niet extraheren met uitvoerteller %d uit HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: kan %s niet laden: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: kan %s niet openen om te schrijven: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: kan %s niet openen: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: wijzigen van map naar %s is mislukt: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: kan niet terugkeren naar de oorspronkelijke werkmap: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: uitvoerbestand ontbreekt: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: opdracht is mislukt: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: einde van @%s-item %d niet gevonden"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3214,12 +3175,12 @@ msgstr ""
"tex4ht.pm: bewerking produceerde %d items in HTML;\n"
"verwacht werden %d, het aantal items in het document voor @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: uitvoer bevat geen HTML-item voor @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3228,37 +3189,37 @@ msgstr ""
"tex4ht.pm: bewerking verkreeg %d items in HTML;\n"
"verwacht werden %d, het aantal items in het document voor @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "fout bij laden van %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: onbekende variabele %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: onbekende variabele %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "kan initialisatiebestand %s niet lezen"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "onbekende waarde '%s' van TEXINFO_OUTPUT_FORMAT wordt genegeerd\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Gebruik: %s [OPTIE...] TEXINFO-BESTAND...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3273,7 +3234,7 @@ msgstr ""
"Dit programma wordt gewoonlijk geïnstalleerd zowel als 'makeinfo'\n"
"als als 'texi2any'; hun gedrag is identiek.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3311,7 +3272,7 @@ msgstr ""
" -v, --verbose tonen wat er gedaan wordt\n"
" --version versie-informatie tonen en stoppen\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3332,7 +3293,7 @@ msgstr ""
" controleren van geldigheid van TEXINFO-"
"BESTAND\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3373,7 +3334,7 @@ msgstr ""
" -o, --output=DOEL uitvoerbestand (of map indien gesplitste "
"HTML)\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3412,7 +3373,7 @@ msgstr ""
" --split-size=GETAL bestanden opsplitsen vanaf deze grootte\n"
" (standaard %d bytes)\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3442,7 +3403,7 @@ msgstr ""
" en ankers; is standaard alleen bij "
"opsplitsen\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3450,7 +3411,7 @@ msgstr ""
"Opties voor XML en DocBook:\n"
" --output-indent=WAARDE (doet niets; herkend voor compatibilteit)\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3459,7 +3420,7 @@ msgstr ""
" --Xopt=OPTIE te gebruiken optie voor 'texi2dvi'; mag "
"herhaald\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3478,7 +3439,7 @@ msgstr ""
" -P MAP MAP vooraantoevoegen aan @include-zoekpad\n"
" -U VAR variabele VAR wissen (als met '@clear')\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3513,7 +3474,7 @@ msgstr ""
"\n"
" Voor de '--no-ifOPMAAK'-opties geldt: '@ifnotOPMAAK' _wel_ verwerken.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3531,7 +3492,7 @@ msgstr ""
"niet;\n"
" als XML gemaakt wordt, staat '--ifxml' aan en de anderen niet.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3566,67 +3527,67 @@ msgstr ""
" makeinfo --no-split foo.texi één Info-bestand ongeacht de "
"grootte\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: Argument van --footnote-style moet 'separate' of 'end' zijn, niet '%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: Argument van --paragraph-indent moet numeriek, 'none' of 'asis' zijn, "
"niet '%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: bij het genereren van %s kan met optie '-o' slechts één invoerbestand "
"gegeven worden\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "Optie '--Xopt' gegeven zonder dat er afdrukuitvoer gemaakt wordt"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "onbekende boomtransformatie %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "het splitsen voor opmaak %s wordt genegeerd"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: Ontbrekend bestandsargument.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Typ '%s --help' voor meer informatie.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"Transformatie 'fill_gaps_in_sectioning()' leverde geen resultaat af. Geen "
"sectie?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "fout bij sluiten van %s, bestand met macro-expansies: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "kan %s niet openen om te schrijven: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3634,27 +3595,259 @@ msgstr ""
"Transformatie 'insert_nodes_for_sectioning_commands()' leverde geen "
"resultaat af. Geen sectie?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: fout bij sluiten van %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: fout bij sluiten van %s, bestand met interne koppelingen: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: kan %s niet openen om te schrijven: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "geen overeenkomende '@end %s'"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "verkeerd geplaatste {"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "ongepaarde '@end %s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set vereist een naam"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "foute naam voor @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear vereist een naam"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "foute naam voor @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro vereist een naam"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "foute naam voor @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+"@clickstyle hoort alleen een @-commando als argument te accepteren, niet '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "omgevingscommando %s is gebruikt als argument van @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "fout argument van @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "fout argument van @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "leeg argument van @columnfractions"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "fout argument van @printindex: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Bij @fonttextsize is alleen 10 of 11 mogelijk, niet '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "argument van @footnotestyle moet 'separate' of 'end' zijn, niet '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "argument van @setchapternewpage moet 'on' of 'off' zijn, niet '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "fout argument van @need: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "argument van @firstparagraph moet 'none' of 'insert' zijn, niet '%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "fout argument van @headings: %s"
+
+# FIXME: formatter?
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s vereist een argument: de formatteerder voor @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "ongepaarde '@end'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "overtollig argument van @end %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "fout argument van @end: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: kan %s niet vinden"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: kan %s niet openen:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename na het eerste element"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions is alleen zinvol op een '@multitable'-regel"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+"@node gevonden vóór @part, maar delen mogen niet gerelateerd zijn aan "
+"pagina's"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s is zinloos binnen een '@%s'-blok"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s is niet toegestaan binnen een '@copying'-blok"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry hoort alleen voor te komen in een index-item"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@author is niet zinvol buiten '@titlepage'- en '@quotation'-omgevingen"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s vereist een naam"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "onjuist of leeg formeel argument van @%s: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless verwacht 'i' of 'j' als argument, niet '%c'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "ongedefinieerde vlag: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s is verouderd."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s is verouderd; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ hoort alleen voor te komen in mathematische context"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb zonder gerelateerd teken"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless verwacht 'i' of 'j' als argument, niet '%s'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "verkeerd geplaatste }"
+
#~ msgid "can't open %s: %s"
#~ msgstr "kan %s niet openen: %s"
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "debugging-uitvoer is omgeleid naar '%s'"
+#~ msgid "no node to be renamed"
+#~ msgstr "geen pagina om te hernoemen"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "pagina's zonder nieuwe naam aan einde van bestand"
+
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "oude naam van '%s' is een pagina in het document"
+
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "bestand is leeg voor hernoemde pagina '%s'"
+
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "doelpagina (nieuwe naam voor '%s') zit niet in document: %s"
+
+# XXX Is het node of nodes?
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "fout bij sluiten van %s, bestand met doorverwijzingen van hernoemde "
+#~ "pagina's: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "lege paginanaam"
+
#~ msgid "recursion is always allowed"
#~ msgstr "recursie is altijd toegestaan"
@@ -3664,9 +3857,6 @@ msgstr "%s: kan %s niet openen om te schrijven: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Verouderde variabele %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s hoort niet gerelateerd te zijn aan @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: verouderde variabele %s\n"
@@ -4090,6 +4280,9 @@ msgstr "%s: kan %s niet openen om te schrijven: %s\n"
#~ msgid "chdir to %s failed"
#~ msgstr "Kan huidige map niet instellen op %s"
+#~ msgid "Error on closing renamed nodes file %s: %s"
+#~ msgstr "Fout bij sluiten van %s, bestand met hernoemde pagina's: %s"
+
#~ msgid "Node `%s' that is to be renamed exists"
#~ msgstr "Pagina '%s' die hernoemd moet worden bestaat al"
diff --git a/macros/texinfo/texinfo/po/pl.gmo b/macros/texinfo/texinfo/po/pl.gmo
index a9a689f5cd..de35a899bf 100644
--- a/macros/texinfo/texinfo/po/pl.gmo
+++ b/macros/texinfo/texinfo/po/pl.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/pl.po b/macros/texinfo/texinfo/po/pl.po
index 5bd6400b45..a9d11fccbf 100644
--- a/macros/texinfo/texinfo/po/pl.po
+++ b/macros/texinfo/texinfo/po/pl.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: texinfo 6.5.93\n"
+"Project-Id-Version: texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-12 21:02+0100\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-25 19:38+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -243,7 +243,6 @@ msgid "Insert completion"
msgstr "Wstawienie uzupełnienia"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Tworzenie uzupełnień..."
@@ -267,7 +266,6 @@ msgid "found file %s"
msgstr "znaleziono plik %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Przypisy nie mogą być wyświetlone"
@@ -280,7 +278,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Przypisy -----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Szukanie wpisów w indeksie..."
@@ -289,7 +286,6 @@ msgid "Look up a string in the index for this file"
msgstr "Szukanie łańcucha w indeksie tego pliku"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Nie znaleziono indeksów"
@@ -298,7 +294,6 @@ msgid "Index entry: "
msgstr "Wpis indeksu: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Nie znaleziono indeksów."
@@ -315,7 +310,6 @@ msgstr ""
"Przejście do następnego pasującego elementu z ostatniego '\\[index-search]'"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Brak poprzedniego łańcucha szukanego w indeksie"
@@ -379,7 +373,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Żaden z dostępnych plików info nie zawiera '%s' w swoich indeksach"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Błąd przy konwersji kodowania znaków pliku"
@@ -394,7 +387,6 @@ msgid "Cannot find node '%s'"
msgstr "Nie znaleziono węzła '%s'"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Nie podano nazwy programu"
@@ -423,7 +415,7 @@ msgstr "wartość %s nie jest prawidłowa dla zmiennej %s"
msgid "Try --help for more information.\n"
msgstr "Więcej informacji można uzyskać przez --help.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -567,7 +559,7 @@ msgstr ""
" info -f ./foo.info pokazanie pliku ./foo.info bez szukania w "
"katalogu"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -876,17 +868,14 @@ msgid "could not open init file %s"
msgstr "nie udało się otworzyć pliku inicjującego %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "sekwencja klawiszy zbyt długa"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "brak sekwencji klawiszy"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "znak NUL (\\000) nie jest dozwolony"
@@ -896,12 +885,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "znak NUL (^%c) nie jest dozwolony"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "brakujÄ…ca nazwa akcji"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "nie można przypisać sekwencji klawiszy do cyfry menu"
@@ -911,7 +898,6 @@ msgid "unknown action `%s'"
msgstr "nieznana akcja `%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nazwa akcji zbyt długa"
@@ -921,22 +907,18 @@ msgid "extra characters following action `%s'"
msgstr "nadmiarowe znaki po akcji `%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "brakujÄ…ca nazwa zmiennej"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "brakujący `=' bezpośrednio po nazwie zmiennej"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nazwa zmiennej zbyt długa"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "wartość zbyt długa"
@@ -958,7 +940,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Odczytanie nazwy polecenia w obszarze echo i wykonanie go"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Nie można tutaj wykonać polecenia 'echo-area'"
@@ -1042,7 +1023,6 @@ msgid "Show all matching files"
msgstr "Wyświetlenie wszystkich pasujących plików"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Brak indeksu plików"
@@ -1351,7 +1331,6 @@ msgid "Select the most recently selected node"
msgstr "Wybranie ostatnio wybranego węzła"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Brak wcześniejszego węzła w historii"
@@ -1412,12 +1391,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Przełączenie używania wyrażeń regularnych przy wyszukiwaniu"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Używanie wyrażeń regularnych przy wyszukiwaniu"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Używanie dosłownego tekstu przy wyszukiwaniu"
@@ -1434,8 +1411,7 @@ msgstr "Kontynuacja szukania od poczÄ…tku dokumentu"
msgid "Searching subfile %s ..."
msgstr "Szukanie podpliku %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Wyszukiwanie nie powiodło się"
@@ -1469,140 +1445,138 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Wyszukiwany łańcuch jest zbyt krótki"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Powrót do ostatniego dopasowania z %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Nic więcej nie pasuje"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Wyszukanie łańcucha w tym węźle i podwęzłach"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Szukanie poniżej %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Przejście do następnego dopasowania w poddrzewie Info"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Brak aktywnego wyszukiwania"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Przejście do poprzedniego dopasowania w poddrzewie Info"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Odczytanie łańcucha i poszukiwanie go uwzględniając wielkość liter"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Odczytanie łańcucha i poszukiwanie go"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Odczytanie łańcucha i poszukiwanie go w tył"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Powtórzenie ostatniego poszukiwania w tym samym kierunku"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Brak poprzedniego szukanego łańcucha"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Powtórzenie ostatniego poszukiwania w odwrotnym kierunku"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Wyczyszczenie wyświetlonych wyników wyszukiwania"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Interaktywne poszukiwanie łańcucha w trakcie wpisywania go"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Interaktywne szukanie wyr.reg. wstecz: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Interaktywne szukanie wstecz: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Interaktywne szukanie wyr.reg.: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Interaktywne szukanie: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Bez powodzenia "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Anulowanie bieżącej operacji"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Wyjście"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "wyświetlenie wersji uruchomionego Info"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info wersja %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Odrysowanie ekranu"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Wyjście z Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Uruchomienie polecenia przypisanego do wariantu klawisza z małą literą"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Nieznane polecenie (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" jest niepoprawne"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "'%s' jest niepoprawne"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Dodanie tej cyfry do aktualnego argumentu liczbowego"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Rozpoczęcie (lub pomnożenie przez 4) aktualnego argumentu liczbowego"
@@ -1956,12 +1930,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: nie można odczytać (%s) ani utworzyć (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY bez odpowiadajÄ…cego END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY bez odpowiadajÄ…cego START-INFO-DIR-ENTRY"
@@ -1991,12 +1963,10 @@ msgid "excess command line argument `%s'"
msgstr "nadmiarowy argument linii poleceń `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Nie podano pliku wejściowego; --help może podać więcej informacji."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Nie podano pliku katalogu; --help może podać więcej informacji."
@@ -2015,25 +1985,25 @@ msgstr "brak wpisu do katalogu info w `%s'"
msgid "no entries found for `%s'; nothing deleted"
msgstr "nie znaleziono wpisów dla `%s'; nic nie usunięto"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "nie można otworzyć %s do zapisu: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"proszę przenieść polecenie @contents, jeśli spis treści ma być po stronie "
"tytułowej"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2041,282 +2011,238 @@ msgstr ""
"proszę przenieść polecenia @shortcontents oraz @contents, jeśli spis treści "
"ma być po stronie tytułowej"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s nie jest poprawnym kodem języka"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s nie jest poprawnym kodem regionu"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s nie jest poprawną opcją podziału"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "nie można odczytać %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "błąd podczas zamykania pliku @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: nie można znaleźć %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "brak węzła do przemianowania"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "węzły bez nowej nazwy na końcu pliku"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "nie można otworzyć %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "używanie pliku węzłów przemianowanych (`%s') jest przestarzałe"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "nie można zabezpieczyć znaku hash w @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "pusta nazwa węzła po rozwinięciu `%s'"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s `%s' już zostało zdefiniowane"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "oto poprzednia definicja jako @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "pusty argument w @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: wyjście niezgodne z podziałem na pliki"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "błąd podczas zamykania %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "nie można utworzyć katalogu `%s' ani `%s': %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "nie można utworzyć katalogu `%s': %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "Plik @image `%s' nie znaleziony, użyto `%s'"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "nie podano argumentu dla @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Plik @image `%s' (dla HTML) nie znaleziony, użyto `%s'"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "format surowy %s nie jest przekonwertowany"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "nie można otworzyć pliku konfiguracyjnego html refs %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "brak typu"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "nieznany typ: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "błąd podczas zamykania pliku konfiguracyjnego html refs %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "niedomknięty łańcuch w pliku css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "plik --css-include zakończył się wewnątrz komentarza"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import nie zakończony w pliku css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "nie znaleziono pliku css %s"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "nie można otworzyć pliku --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "błąd podczas zamykania pliku CSS %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "brak wpisu htmlxref.cnf dla `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "błąd podczas zamykania pliku ramki %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "błąd podczas zamykania pliku ramki TOC %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "obsługa %s, etapu %s, priorytet %s nie powiodła się"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "trzeba określić tytuł poleceniem title lub @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "błąd podczas zamykania pliku przekierowania węzłów %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "stara nazwa `%s' jest węzłem dokumentu"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "pusty plik dla przemianowanego węzła `%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "węzeł docelowy (nowa nazwa dla `%s') nie istnieje w dokumencie: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"błąd podczas zamykania przekierowanego pliku przemianowanego węzła %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "pusta nazwa węzła"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "użyto składni węzła zewnętrznego dla `%s'"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "dokument bez węzłów"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "dokument bez węzła szczytowego."
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "zmiana nazwy %s nie powiodła się: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s zapisano więcej niż raz: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s poza jakimkolwiek węzłem"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "nazwa @node nie powinna zawierać `,': %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Wpis indeksu w @%s z : tworzy błędny plik Info: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "wpis dla indeksu `%s' poza jakimkolwiek węzłem"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "błąd podczas zamykania pliku tekstowego obrazu %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Plik @image `%s' nieczytelny: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "nie odnaleziono pliku @image `%s.txt' ani alternatywnego tekstu"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2324,302 +2250,326 @@ msgstr ""
"@string{Note...} tworzy nieprawdziwe odniesienia w Info; należy "
"przeredagować aby zapobiec temu"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "nazwa odwołania @%s nie powinna zawierać `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "nazwa węzła @%s nie powinna zawierać `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "nazwa węzła @%s nie powinna zawierać `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "Po @xref musi wystąpić `.' lub `,', a nie %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "Po @xref musi wystąpić `.' lub `,'"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "nazwa węzła wpisu menu nie powinna zawierać `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "nazwa węzła wpisu menu nie powinna zawierać `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "nazwa wpisu menu nie powinna zawierać `:'"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "nie można otworzyć %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "wiele @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "niewłaściwy lub pusty argument formalny @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "błędna składnia argumentu @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s wymaga nazwy"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "niewłaściwa nazwa dla @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s wystąpiło przed nawiasem zamykającym @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s wystąpiło przed nawiasem zamykającym @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "w %c%s brakuje klamry zamykajÄ…cej"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "Brak ograniczajÄ…cej sekwencji zamykajÄ…cej @%s: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx nie powinien zaczynać @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx musi wystąpić po @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s zawiera tekst, ale nie ma @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' oczekiwało `%s', ale napotkano `%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s wystąpiło przed @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "brak pasujÄ…cego `%cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "źle umieszczone %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "niedopasowane `%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "makro `%s' wywołane ze zbyt dużą liczbą argumentów"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "Brak klamry zamykajÄ…cej @%s"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "makro `%s' zadeklarowane bez argumentów zostało wywołane z argumentem"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "po \\ w @%s wystąpiło `%s' zamiast nazwy parametru lub \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "brak nazwy dla @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "brak kategorii dla @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "nieoczekiwany argument w linii @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "puste multitable"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "nadmiarowy argument dla @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "zły argument dla @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s wymaga argumentu: formatowania dla %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"polecenie @%s, nie przyjmujące argumentu w klamrach, nie powinno wystąpić w "
"linii @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "polecenie akcentu `@%s' nie jest dozwolone jako argument @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "Brak argumentu @%s"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "nieznany @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "nadmiarowy argument dla @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "niewłaściwy argument dla @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: nie można otworzyć pliku %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "kodowanie `%s' nie jest kanonicznym kodowaniem texinfo"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nierozpoznana nazwa kodowania `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s po pierwszym elemencie"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s ma znaczenie tylko w linii @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part nie powinno być powiązane z @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node poprzedza @%s, ale części mogą nie być powiązane z węzłami"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "użyto składni węzła zewnętrznego dla `%s'"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "pusta nazwa wpisu menu w `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "pusty węzeł we wpisie menu"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s nie powinno wystąpić w @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s powinno wystąpić tylko na początku linii"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro `%s' już zostało zdefiniowane"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "oto poprzednia definicja `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "ponowna definicja polecenia języka Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s bez powiÄ…zanego znaku"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s zdefiniowane z zerem lub więcej niż jednym argumentem powinno być "
"wywoływane z {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2627,348 +2577,361 @@ msgstr ""
"za bardzo zagnieżdżone wywołanie makra (można to zmienić przez "
"MAX_NESTED_MACROS; obecna wartość %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"rekurencyjne wywołanie makra %s nie jest dozwolone; w razie potrzeby można "
"użyć @rmacro"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "po poleceniu akcentu `@%s' nie może wystąpić znak biały"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr ""
"należy użyć nawiasów klamrowych, aby podać polecenie jako argument dla @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s oczekuje `i' lub `j' jako argumentu, a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "po poleceniu akcentu `@%s' nie może wystąpić nowa linia"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s oczekiwało nawiasów klamrowych"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "nieznane polecenie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "niezdefiniowana flaga: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "błędna składnia dla @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s jest przestarzałe."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s jest przestarzałe; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s powinno wystąpić tylko na początku linii"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s powinno wystąpić tylko w nagłówku lub stopce"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s nic nie znaczy wewnÄ…trz bloku `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s w pustym multitable"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab przed @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "zbyt dużo kolumn w elemencie multitable (maksymalnie %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "zignorowano @tab poza multitable"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s poza tabelÄ… lub listÄ…"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s nie jest dozwolone wewnÄ…trz bloku `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s powinno wystąpić tylko we wpisie indeksu"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "dozwolone są najwyżej dwa poziomy zagnieżdżenia indeksu"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "tylko po `@%s' można użyć `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s nic nie znaczy poza środowiskami `@titlepage' i `@quotation'"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory po pierwszym węźle"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "region %s wewnÄ…trz regionu %s nie jest dozwolony"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry po pierwszym węźle"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu w błędnym kontekście"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s napotkano przed pierwszym @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "może węzeł @top powinien być otoczony @ifnottex, a nie @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s powinno wystąpić tylko we wpisie indeksu"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s powinno wystąpić tylko w kontekście matematycznym"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "nieoczekiwane @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s nic nie znaczy poza środowiskiem `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s powinno być zaraz poniżej `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "zigorowano wiele @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "polecenie @%s nie może mieć argumentów"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
"brak argumentu będącego węzłem lub zewnętrznym podręcznikiem w poleceniu @%s"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "pusta nazwa odwołania w @%s po rozwinięciu `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "pusty tytuł odwołania w @%s po rozwinięciu `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "Po @image brakuje argumentu plikowego"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "brak pierwszego argumentu @%s"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "błędne znaki jako cyfry szesnastkowe w argumencie dla @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "mniej niż cztery cyfry szesnastkowe w argumencie dla @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "argument dla @U przekracza maksimum dla Unicode 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "nadmiarowe argumenty dla węzła"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "oczekiwano @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s powinno mieć tylko polecenie typu @ jako argument, a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "pozostały argument w linii @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "polecenie środowiska %s jako argument dla @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "puste @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "szerokość kolumny nie jest liczbą: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "argument @sp musi być liczbą, a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "zarezerwowana nazwa indeksu %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "nieznany indeks źródłowy w @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "nieznany indeks docelowy w @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s prowadzi do włączenia %s do sanego siebie, zignorowano"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "nieznany indeks `%s' w @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "wydruk indeksu `%s' włączony w innym, `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "polecenie printindex przed poczÄ…tkiem dokumentu: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "argumentem @%s musi być `top' lub `bottom', a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Obsługiwane są tylko @%s 10 lub 11, a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "argumentem @%s musi być `separate' lub `end', a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "argumentem @%s musi być `on', `off' lub `odd', a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"argumentem @paragraphindent musi być liczba, `none' lub `asis', a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"argumentem @firstparagraphindent musi być `none' lub `insert', a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "argumentem @exampleindent musi być liczba lub `asis', a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "oczekiwano @%s on lub off, a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"argumentem @kbdinpustyle musi być `code', `example' lub `distinct', a nie `"
"%s'"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "argumentem @allowcodebreaks musi być `true' lub `false', a nie `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"argumentem @urefbreakstyle musi być `after', `before' lub `none', a nie `%s'"
@@ -2998,7 +2961,7 @@ msgstr "brak polecenia sekcjonowania zwiÄ…zanego z @%s"
msgid "@%s not empty"
msgstr "@%s nie jest pusty"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "odwołanie @%s do nie istniejącego węzła `%s'"
@@ -3008,106 +2971,106 @@ msgstr "odwołanie @%s do nie istniejącego węzła `%s'"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "nazwa węzła wpisu @%s `%s' różni się od nazwy %s `%s'"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nie wskazywany węzeł `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "węzeł `%s' to %s dla `%s' w sekcjonowaniu, ale nie w menu"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "węzeł %s `%s' w menu `%s' i w sekcjonowaniu `%s' są różne"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "węzeł `%s' to %s dla `%s' w menu, ale nie w sekcjonowaniu"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "wskaźnik %s `%s' (dla węzła `%s') różni się od nazwy %s `%s'"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "odwołanie %s do nie istniejącego `%s'"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"węzeł `%s' nie ma elementu menu dla `%s' pomimo bycia jego celem W górę"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "dla `%s' węzeł górny w menu `%s' i górny `%s' są różne"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s do `%s' różne od nazwy %s `%s'"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "pusty klucz indeksu w @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: nie można otworzyć pliku %s do zapisu: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: błąd podczas zamykania %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: nie można otworzyć pliku LaTeXowego %s do zapisu: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: katalog L2H_TMP zawiera kropkÄ™"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: katalog bieżący zawiera kropkę"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: polecenie nie powiodło się: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: obrazek ma błędne rozszerzenie: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: zmiana nazwy %s na %s nie powiodła się: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: nie można otworzyć %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: nie znaleziono końca elementu @%s %d"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3116,12 +3079,12 @@ msgstr ""
"latex2html.pm: przetwarzanie wytworzyło elementów w HTML-u: %d; oczekiwano "
"%d, czyli liczby elementów znalezionych w dokumencie"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: nie udało się ustawić fragmentu %d dla @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3130,47 +3093,47 @@ msgstr ""
"l2h: nie udało się wydobyć fragmentu %d dla @%s z licznikiem wyjścia %d z "
"HTML-a"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: nie można załadować %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: nie można otworzyć %s do zapisu: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: nie można otworzyć %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: przejście do katalogu %s nie powiodła się: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: nie udało się powrócić do katalogu początkowego: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: brak pliku wyjściowego: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: polecenie nie powiodło się: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: nie znaleziono końca elementu @%s %d"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3179,12 +3142,12 @@ msgstr ""
"tex4ht.pm: przetwarzanie wytworzyło elementów w HTML-u: %d; oczekiwano %d, "
"czyli liczby elementów znalezionych w dokumencie dla @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: wyjście nie ma elementu HTML dla @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3193,37 +3156,37 @@ msgstr ""
"tex4ht.pm: przetwarzanie odczytało elementów w HTML-u: %d; oczekiwano %d, "
"czyli liczby elementów znalezionych w dokumencie dla @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "błąd podczas wczytywania %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: nieznana zmienna %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: nieznana zmienna %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "nie można odczytać pliku init %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "zignorowano nierozpoznaną wartość TEXINFO_OUTPUT_FORMAT `%s'.\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Składnia: %s [OPCJA]... PLIK-TEXINFO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3239,7 +3202,7 @@ msgstr ""
"Ten program jest zainstalowany wspólnie jako `makeinfo' oraz `texi2any';\n"
"zachowanie jest identycznie i nie zależy od nazwy programu.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3277,7 +3240,7 @@ msgstr ""
" --version wyświetlenie informacji o wersji i "
"zakończenie.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3296,7 +3259,7 @@ msgstr ""
" podanego wyjścia po sprawdzeniu poprawności\n"
" PLIKU-TEXINFO.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3347,7 +3310,7 @@ msgstr ""
" W innym przypadku CEL to nazwa pliku\n"
" wyjściowego.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3390,7 +3353,7 @@ msgstr ""
" --split-size=ROZMIAR podział Info na pliki o ROZMIARZE (domyślnie "
"%d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3415,7 +3378,7 @@ msgstr ""
" --node-files tworzenie plików przekierowań dla węzłów\n"
" i znaczników; domyśnie tylko przy podziale.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3423,7 +3386,7 @@ msgstr ""
"Opcje dla XML-a i Docbooka:\n"
" --output-indent=ILE nic, zachowane dla kompatybilności.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3432,7 +3395,7 @@ msgstr ""
" --Xopt=OPCJA przekazanie OPCJI do texi2dvi; można "
"powtarzać.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3454,7 +3417,7 @@ msgstr ""
" -U ZMIENNA usunięcie definicji ZMIENNEJ, tak jak "
"@clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3495,7 +3458,7 @@ msgstr ""
"\n"
" Ponadto opcje --no-ifFORMAT powodujÄ… przetwarzanie tekstu @ifnotFORMAT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3513,7 +3476,7 @@ msgstr ""
"wyłączone;\n"
" jeśli generowany jest XML, --ifxml jest włączone, a reszta wyłączona.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3548,64 +3511,64 @@ msgstr ""
" makeinfo --no-split foo.texi zapisanie jednego wielkiego pliku "
"Info\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: argumentem --footnote-style musi być `separate' lub `end', a nie `%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: argument --paragraph-indent musi być liczbą/`none'/`asis', a nie `%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: przy generowaniu %s, opcją -o można podać tylko jeden PLIK wejściowy\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "opcja --Xopt bez drukowanego wyjścia"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "nieznane przekształcenie drzewa %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "zignorowano podział dla formatu %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: brakujÄ…cy argument plikowy.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Polecenie `%s --help' poda więcej informacji.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"Przekształcenie fill_gaps_in_sectioning zwróciło pusty wynik. Brak sekcji?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "błąd podczas zamykania pliku rozwinięć makr %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "nie można otworzyć pliku %s do zapisu: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3613,17 +3576,223 @@ msgstr ""
"Przekształcenie insert_nodes_for_sectioning_commands zwróciło pusty wynik. "
"Brak sekcji?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: błąd podczas zamykania %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: błąd podczas zamykania pliku odnośników wewnętrznych %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: nie można otworzyć pliku %s do zapisu: %s\n"
+
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "brak pasujÄ…cego `@end %s'"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "źle umieszczone {"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "niedopasowane `@end %s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set wymaga nazwy"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "niewłaściwa nazwa dla @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear wymaga nazwy"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "niewłaściwa nazwa dla @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro wymaga nazwy"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "niewłaściwa nazwa dla @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+"@clickstyle powinno mieć tylko polecenie typu @ jako argument, a nie `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "polecenie środowiska %s jako argument dla @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "zły argument dla @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "zły argument dla @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "puste @columnfractions"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "niewłaściwy argument dla @printindex: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Obsługiwane są tylko @fonttextsize 10 lub 11, a nie `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "argumentem @footnotestyle musi być `separate' lub `end', a nie `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+"argumentem @setchapternewpage musi być `on', `off' lub `odd', a nie `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "niewłaściwy argument dla @need: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "argumentem @firstparagraph musi być `none' lub `insert', a nie `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "niewłaściwy argument dla @headings: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s wymaga argumentu: formatowania dla @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "niedopasowane `@end'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "nadmiarowy argument dla @end %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "niewłaściwy argument dla @end: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: nie odnaleziono %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: nie udało się otworzyć %s:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename po pierwszym elemencie"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions ma znaczenie tylko w linii @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node poprzedza @part, ale części nie mogą być powiązane z węzłami"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s nic nie znaczy wewnÄ…trz bloku @%s"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s nie jest dozwolone wewnÄ…trz bloku `@copying'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry powinno wystąpić tylko we wpisie indeksu"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@author nic nie znaczy poza środowiskami `@titlepage' i `@quotation'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s wymaga nazwy"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "niewłaściwy lub pusty argument formalny @%s: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless oczekuje `i' lub `j' jako argumentu, a nie `%c'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "niezdefiniowana flaga: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s jest przestarzałe."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s jest przestarzałe; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ powinno wystąpić tylko w kontekście matematycznym"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb bez powiÄ…zanego znaku"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless oczekuje `i' lub `j' jako argumentu, a nie `%s'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "źle umieszczone }"
diff --git a/macros/texinfo/texinfo/po/pt.gmo b/macros/texinfo/texinfo/po/pt.gmo
index b7e150de49..d5c065c438 100644
--- a/macros/texinfo/texinfo/po/pt.gmo
+++ b/macros/texinfo/texinfo/po/pt.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/pt.po b/macros/texinfo/texinfo/po/pt.po
index 2bf5920252..158ae6a285 100644
--- a/macros/texinfo/texinfo/po/pt.po
+++ b/macros/texinfo/texinfo/po/pt.po
@@ -5,17 +5,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU texinfo 6.5.93\n"
+"Project-Id-Version: GNU texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-13 07:01+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-20 12:20+0100\n"
"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
"Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\\n\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
"X-Generator: Gtranslator 2.91.7\n"
@@ -124,7 +124,7 @@ msgstr "Expressão regular muito grande"
#: gnulib/lib/regcomp.c:183
msgid "Unmatched ) or \\)"
-msgstr ") or \\) sem par"
+msgstr ") ou \\) sem par"
#: gnulib/lib/regcomp.c:676
msgid "No previous regular expression"
@@ -242,7 +242,6 @@ msgid "Insert completion"
msgstr "Inserir conclusão"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "A construir conclusões..."
@@ -266,7 +265,6 @@ msgid "found file %s"
msgstr "encontrado o ficheiro %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Impossível mostrar as notas de rodapé"
@@ -279,7 +277,6 @@ msgid "---------- Footnotes ----------"
msgstr "------- Notas de rodapé -------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "A localizar entradas de índice..."
@@ -288,7 +285,6 @@ msgid "Look up a string in the index for this file"
msgstr "Procurar no índice uma cadeia para este ficheiro"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Sem índices"
@@ -297,7 +293,6 @@ msgid "Index entry: "
msgstr "Entrada de índice: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Sem índices."
@@ -315,7 +310,6 @@ msgstr ""
"Ir para o item correspondente seguinte do último comando \"\\[index-search]\""
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Sem cadeia de procura de índice anterior"
@@ -381,7 +375,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Nenhum ficheiro de informação tem \"%s\" nos seus índices"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Erro ao converter a codificação de caracteres do ficheiro"
@@ -396,7 +389,6 @@ msgid "Cannot find node '%s'"
msgstr "Impossível encontrar o nó \"%s\""
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Sem nome de programa"
@@ -425,7 +417,7 @@ msgstr "o valor %s não é válido para a variável %s"
msgid "Try --help for more information.\n"
msgstr "Tente --help para mais informação.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -564,7 +556,7 @@ msgstr ""
" info -f ./foo.info mostra o ficheiro ./foo.info, não a pasta de "
"procura"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -874,17 +866,14 @@ msgid "could not open init file %s"
msgstr "impossível abrir o ficheiro init %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "sequência de teclas muito longa"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "sequência de teclas em falta"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "Carácter NUL (\\000) não permitido"
@@ -894,12 +883,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "Carácter NUL (^%c) não permitido"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "nome de acção em falta"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "impossível associar sequência de teclas ao dígito de menu"
@@ -909,7 +896,6 @@ msgid "unknown action `%s'"
msgstr "acção \"%s\" desconhecida"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nome de acção muito longo"
@@ -919,22 +905,18 @@ msgid "extra characters following action `%s'"
msgstr "caracteres extra a seguir a \"%s\""
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "nome de variável em falta"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "\"=\" em falta imediatamente a seguir ao nome da variável"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nome de variável muito grande"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "valor muito longo"
@@ -956,7 +938,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Lê um nome de comando na área echo e executa-o"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Impossível executar aqui um comando da \"echo-area\""
@@ -1041,7 +1022,6 @@ msgid "Show all matching files"
msgstr "Mostrar todos os ficheiros correspondentes"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Sem índice de ficheiro"
@@ -1350,7 +1330,6 @@ msgid "Select the most recently selected node"
msgstr "selecciona o nó mais recentemente seleccionado"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Sem nó anterior no histórico"
@@ -1411,12 +1390,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Alterna o uso de expressões regulares em procuras"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Usar expressões regulares em procuras"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Usar cadeias literais em procuras"
@@ -1433,8 +1410,7 @@ msgstr "Procura continuada a partir do início do documento"
msgid "Searching subfile %s ..."
msgstr "A procurar sub-ficheiro %s..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "A procura falhou"
@@ -1468,140 +1444,138 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Cadeia de procura muito curta"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "A recuar para a última correspondência de %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Sem mais correspondências"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Procurar uma cadeia neste nó e sub-nós"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Procurar sob %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Ir para a correspondência seguinte na sub-árvore Info"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Sem procura activa"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Ir para a correspondência anterior na sub-árvore Info"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "lê uma cadeia e procura-a diferenciando maiúsculas"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "lê uma cadeia e procura-a"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "lê uma cadeia e procura-a para trás"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "repete a última procura na mesma direcção"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Sem cadeia de procura prévia"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "repete a última procura na direcção inversa"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "limpa as correspondências mostradas"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "procura interactivamente uma cadeia ao escrever"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Procura I regexp para trás: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Procura I para trás: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Procura I regexp: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Procura I: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "A falhar"
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "cancela a operação actual"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "sai"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "mostra a versão do Info"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info versão %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "redesenha o ecrã"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "sair do Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "executa o comando associado à minúscula desta tecla"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Comando desconhecido (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" é inválido"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "\"%s\" é inválido"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "adiciona este algarismo ao argumento numérico actual"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "começa (ou multiplica por 4) o argumento numérico actual"
@@ -1962,12 +1936,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: impossível ler (%s) e impossível criar (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY sem corresponder a END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY sem corresponder a START-INFO-DIR-ENTRY"
@@ -1997,12 +1969,10 @@ msgid "excess command line argument `%s'"
msgstr "excesso no argumento da linha de comandos \"%s\""
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Sem ficheiro de entrada; tente --help para mais informação."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Sem ficheiro pasta; tente --help para mais informação."
@@ -2021,24 +1991,24 @@ msgstr "sem entrada pasta Info em \"%s\""
msgid "no entries found for `%s'; nothing deleted"
msgstr "sem entradas para \"%s\"; nada eliminado"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "impossível abrir %s para escrita: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"mova o seu comando @contents se pretende o conteúdo após a página de título"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2046,282 +2016,239 @@ msgstr ""
"mova os seus comandos @shortcontents e @contents se pretende o conteúdo após "
"a página de título"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s não é um código de idioma válido"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s não é um código de região válido"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s não é uma possibilidade de divisão válida"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "impossível ler %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "erro ao fechar o ficheiro @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: impossível localizar %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "sem nó para renomear"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "nós sem um novo nome no fim do ficheiro"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "impossível abrir %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "a usar um ficheiro nodes renomeado. (\"%s\") é obsoleto"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "impossível proteger o carácter hash em @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "nome de nó vazio após expansão \"%s\""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s \"%s\" anteriormente definido"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "eis a definição anterior como @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "argumento vazio em @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: saída incompatível com a divisão"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "erro ao fechar %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "impossível criar pastas \"%s\" or \"%s\": %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "impossível criar pasta \"%s\": %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "ficheiro @image \"%s\" não encontrado, a usar \"%s\""
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "sem argumento especificado para @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "ficheiro @image \"%s\" (para HTML) não encontrado, a usar \"%s\""
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "formato raw %s não está convertido"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "impossível abrir o ficheiro html refs config %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "tipo em falta"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "tipo não reconhecido: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "erro ao fechar o ficheiro html refs config %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "cadeia não fechada no ficheiro css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include terminou em comentário"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import não terminada em ficheiro css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "Ficheiro css %s não encontrado"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "impossível abrir --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "erro ao fechar o ficheiro css %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "sem entrada htmlxref.cnf para \"%s\""
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "erro ao fechar ficheiro frame %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "erro ao fechar ficheiro TOC frame %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "gestor %s de estágio %s, prioridade %s falhou"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "tem de especificar um título com um comando de título ou @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "erro ao fechar ficheiro de redireccionamento do nó %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "nome antigo de \"%s\" é um nó do documento"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "ficheiro vazio para o nó renomeado \"%s\""
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "nó alvo (novo nome para \"%s\") não está no documento: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "erro ao fechar ficheiro de redireccionamento do nó renomeado %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "nome de nó vazio"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "sintaxe para um nó externo usado para \"%s\""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "documento sem nós"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "documento sem nó de topo"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "renomeação %s falhou: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s imprimido mais de uma vez: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s fora de qualquer nó"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "nome @node devia conter \",\": %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Entrada de índice em @%s com : produz um Info inválido: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "entrada para o índice \"%s\" fora de qualquer nó"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "erro ao fechar ficheiro de texto de imagem %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "ficheiro @image \"%s\" ilegível: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
"impossível encontrar o ficheiro @image \"%s.txt\" nem texto alternativo"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2329,299 +2256,323 @@ msgstr ""
"@strong{Note...} produz uma referência cruzada espúria no Info; mude a frase "
"para o evitar"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "nome de referência cruzada @%s não deve conter \":\""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "nome de nó @%s não deve conter \"%s\""
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "nome do nó @%s não deve conter \":\""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "\".\" ou \",\" têm de seguir @xref, não %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "\".\" ou \",\" têm de seguir @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "nome de nó de entrada de menu não deve conter \"%s\""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "nome de nó de entrada de menu não deve conter \":\""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "nome de entrada de menu não deve conter \":\""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "impossível abrir %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "múltiplos @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "argumento formal @%s errado ou vazio: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "sintaxe errada pra o agrgumento @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s requer um nome"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "nome errado para @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s obtido antes da chaveta de fecho de @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s obtido antes da chaveta de fecho de @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s com chaveta de fecho em falta"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s com sequência de delimitador em falta: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx não devia começar @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx deve seguir @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s tem texto mas não @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "\"@end\" esperado \"%s\", obtido \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s obtido antes de @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "sem \"%cend %s\" correspondente"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "%c mal colocado"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "\"%c%s\" sem correspondência"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "macro \"%s\" chamada com demasiados argumentos"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s com chaveta de fecho em falta"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "macro \"%s\" declarada sem argumento chamada com um argumento"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ em expansão @%s a seguir a \"%s\" em vez de nome de parâmetro ou \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "nome para @%s em falta"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "categoria para @%s em falta"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "argumento inesperado na linha @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "multi-tabela vazia"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "argumento supérfluo para @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "argumento errado para @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s requer um argumento: o desenhador para %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"comando @%s não aceitando argumentos na chaveta não devia estar na linha @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "comando acento \"@%s\" não permitido como argumento de @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s co argumento em falta"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "@end %s desconhecido"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "argumento supérfluo para @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "argumento errado para @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: impossível abrir %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "a codificação \"%s\" não é uma codificação texinfo canónica"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nome de codificação \"%s\" não reconhecido"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s após o primeiro elemento"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s só tem significado numa linha @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part não devia estar associado com @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node precede @%s, mas partes não podem ser associadas com nós"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "sintaxe para um nó externo usado para \"%s\""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "nome de entrada de menu vazio em \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "nome de nó vazio em entrada de menu"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s não devia aparecer em @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s só devia aparecer num início de linha"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro \"%s\" anteriormente definida"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "eis a definição anterior de \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "A redefinir comando de linguagem Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s sem carácter associado"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr "@%s definido com zero o mais de um argumento devia ser chamado com {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2629,347 +2580,360 @@ msgstr ""
"chamada de macro aninhada muito profundamente (defina MAX_NESTED_MACROS para "
"sobrepor; valor actual %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"não é permitida a chamada recursiva da macro %s; use @rmacro, se necessário"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "comando acento \"@%s\"não deve ser seguido de espaço em branco"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "use chavetas para dar um comando como argumento a @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s espera \"i\" ou \"j\" como argumentos, não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "comando acento \"@%s\" não deve ser seguido de nova linha"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s esperava chavetas"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "comando \"%s\" desconhecido"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "bandeira não definida: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "sintaxe errada para @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s é obsoleto."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s é obsoleto; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s só devia aparecer num início de linha"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s só devia aparecer num título ou rodapé"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s sem significado dentro de um bloco \"@%s\""
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s em multi-tabela vazia"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab antes de @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "demasiadas colunas em item de multi-tabela (máximo: %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "a ignorar @tab fora de multi-tabela"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s fora de tabela ou lista"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s não permitido dentro de um bloco \"@%s\""
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s só devia aparecer numa entrada de índice"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "Só são permitidos dois níveis de sub-entradas de índice"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "tem de estar após \"@%s\" para usar \"@%s\""
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s sem significado fora de ambientes \"@titlepage\" e \"@quotation\""
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory após o primeiro nó"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "não é permitida a regão %s dentro da região %s"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry após o primeiro nó"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu em contexto inválido"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s obtido antes do primeiro @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"talvez o seu nó @top devesse estar dentro de @ifnottex em vez de @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s só devia aparecer numa entrada de índice"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s só devia aparecer em contexto matemático"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "@ inesperado"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s sem significado dentro de um ambiente \"@float\""
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s devia estar logo abaixo de \"@float\""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "a ignorar múltiplos @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "command @%s não aceita argumentos"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "command @%s com nó ou argumento manual externo em falta"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "em @%s nome de referência cruzada após expansão \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "em @%s título de referência cruzada após expansão \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image com argumento de nome de ficheiro em falta"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s com o primeiro argumento em falta"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "algarismos não-hex no argumento para @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "menos de quatro algarismos hex no argumento para @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "argumento para @U excede o máximo de Unicode 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "argumentos supérfluos para o nó"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "esperado @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s só devia aceitar @-command como argumento, não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "argumento restante na linha @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "comando de ambiente %s como argumento para @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "@%s vazio"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "fracção de coluna não é número: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "argumento @sp tem de ser numérico, não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "nome de índice %s reservado"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "índice fonte desconhecido em @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "índice destino desconhecido em @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s leva a uma união de %s em si mesmo, ignorando"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "índice desconhecido \"%s\" em @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "a imprimir um índice \"%s\" unido a outro, \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex antes do início do documento: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "argumento @%s tem de ser \"top\" ou \"bottom\", não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Só @%s 10 ou 11 é suportado, não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "argumento @%s tem de ser \"separate\" ou \"end\", não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "argumento @%s tem de ser \"on\", \"off\" ou \"odd\", não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"argumento @paragraphindent tem de ser numérico/\"none\"/\"asis\", não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"argumento @firstparagraphindent tem de ser \"none\" ou \"insert\", não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "argumento @exampleindent tem de ser numérico/\"asis\", não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "esperado @%s on ou off, não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"argumento @kbdinputstyle tem de ser \"code\"/\"example\"/\"distinct\", não "
"\"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"argumento @allowcodebreaks tem de ser \"true\" ou \"false\", não \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"argumento @urefbreakstyle tem de ser \"after\"/\"before\"/\"none\", não \"%s"
@@ -3002,7 +2966,7 @@ msgstr "sem comando de secção associado a @%s"
msgid "@%s not empty"
msgstr "@%s não vazio"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "referência @%s a nó não existente \"%s\""
@@ -3012,106 +2976,106 @@ msgstr "referência @%s a nó não existente \"%s\""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "nome de nó \"%s\" da entrada @%s diferente de %s nome \"%s\""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nó não referenciado \"%s\""
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "o nó \"%s\" é %s para \"%s\" nas secções mas não no menu"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "o nó %s \"%s\" no menu \"%s\" e nas secções \"%s\" difere"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "o nó \"%s\" é %s para \"%s\" no menu, mas não nas secções"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s ponteiro \"%s\" (para o nó \"%s\") diferente de %s nome \"%s\""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "referência %s a \"%s\" não existente"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"o nó \"%s\" tem um item de menu \"%s\" em falta, apesar de ser o seu alvo Up"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "para \"%s\", acima no menu \"%s\" e \"%s\" acima não correspondem"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s para \"%s\", diferente de %s nome \"%s\""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "chave de índice vazia em @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: impossível abrir %s para escrita: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: erro ao fechar %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: impossível abrir ficheiro latex %s para escrita: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: a pasta L2H_TMP contém um ponto"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: a pasta actual contém um ponto"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: comando sem sucesso: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: imagem com extensão inválida: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: renomear %s como %s falhou: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: impossível abrir %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: fim de @%s item %d não encontrado"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3120,12 +3084,12 @@ msgstr ""
"latex2html.pm: o processamento produziu %d itens em HTML; esperados %d, o "
"número de itens encontrados no documento"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: impossível determinar o fragmento %d para @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3134,47 +3098,47 @@ msgstr ""
"l2h: impossível extrair o fragmento %d para @%s com contador de saída %d de "
"HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: impossível carregar %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: impossível abrir %s para escrita: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: impossível abrir %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: chdir %s falhou: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: impossível regressar à pasta inicial: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: ficheiro de saída em falta: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: o comando falhou: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: fim de @%s item %d não encontrado"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3183,12 +3147,12 @@ msgstr ""
"tex4ht.pm: o processamento produziu %d itens em HTML; esperados %d, o número "
"de itens encontrados no documento @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: a saída não tem item HTML para @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3197,37 +3161,37 @@ msgstr ""
"tex4ht.pm: o processamento obteve %d itens em HTML; esperados %d, o número "
"de itens encontrados no documento para @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "erro ao carregar %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: variável %s desconhecida"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: variável %s desconhecida\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "impossível ler o ficheiro init %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "a ignorar o valor TEXINFO_OUTPUT_FORMAT \"%s\" desconhecido\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uso: %s [OPÇÃO]... FICH-TEXINFO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3242,7 +3206,7 @@ msgstr ""
"Este programa é habitualmente instalado como \"makeinfo\" e \"texi2any\";\n"
"o comportamento é idêntico e não depende do nome instalado.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3280,7 +3244,7 @@ msgstr ""
" -v, --verbose explica o que se está a passar.\n"
" --version mostra informação da versão e sai.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3299,7 +3263,7 @@ msgstr ""
"indicada,\n"
" após verificar a validade de FICH-TEXINFO.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3350,7 +3314,7 @@ msgstr ""
" põe lá o ficheiro de saída.\n"
" Senão, DEST é o nome do ficheiro de saída.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3389,7 +3353,7 @@ msgstr ""
" \"asis\", preserva a indentação existente.\n"
" --split-size=NUM split Info files at size NUM (default %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3418,7 +3382,7 @@ msgstr ""
" âncoras; a predefinição só existe se "
"dividido.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3426,7 +3390,7 @@ msgstr ""
"Opções para XML e Docbook:\n"
" --output-indent=VAL não faz nada, retida para compatibilidade.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3434,7 +3398,7 @@ msgstr ""
"Opções para DVI/PS/PDF:\n"
" --Xopt=OPÇÃO passa OPÇÃO a texi2dvi; pode ser repetida.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3454,7 +3418,7 @@ msgstr ""
"@include.\n"
" -U VAR remove a definição de VAR, tal como @clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3490,7 +3454,7 @@ msgstr ""
"\n"
" Também, para opções --no-ifFORMAT, processa texto @ifnotFORMAT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3506,7 +3470,7 @@ msgstr ""
" se gerar texto simples, --ifplaintext está activa e as outras inactivas;\n"
" se gerar XML, --ifxml está activa e as outras inactivas.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3539,66 +3503,66 @@ msgstr ""
" makeinfo --number-sections foo.texi write Info with numbered sections\n"
" makeinfo --no-split foo.texi write one Info file however big\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: o argumento --footnote-style tem de ser \"separate\" ou \"end\", não \"%s"
"\".\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: o argumento --paragraph-indent tem de ser numérico/\"none\"/\"asis\", "
"não \"%s\".\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: ao gerar %s, só um ficheiro de entrada FICHEIRO pode ser especificado "
"com -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "opção --Xopt sem saída impressa"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "transformação de árvore %s desconhecida"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "a ignorar divisão para formato %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: argumento de ficheiro em falta.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente \"%s --help\" para mais informação.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr "transformação fill_gaps_in_sectioning sem resultados. Não há secção?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "erro ao fechar o ficheiro de expansão de macro %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "impossível abrir %s para escrita: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3606,21 +3570,254 @@ msgstr ""
"transformação insert_nodes_for_sectioning_commands sem resultados. Não há "
"secção?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: erro ao fechar %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: erro ao fechar ficheiro de ligações internas %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: impossível abrir %s para escrita: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "sem \"@end %s\" correspondente"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "{ mal colocado"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "\"@end %s\" sem correspondência"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set requer um nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "nome errado para @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear requer um nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "nome errado para @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro requer um nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "nome errado para @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@clickstyle só devia aceitar @-command como argumento, não \"%s\""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "comando de ambiente %s como argumento para @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "argumento errado para @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "argumento errado para @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "@columnfractions vazio"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "argumento errado para @printindex: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Só @fonttextsize 10 ou 11 é suportado, não \"%s\""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"o argumento @footnotestyle tem de ser \"separate\" ou \"end\", não \"%s\"."
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+"argumento @setchapternewpage tem de ser \"on\", \"off\" ou \"odd\", não \"%s"
+"\""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "argumento errado para @need: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"argumento @firstparagraph tem de ser \"none\" ou \"insert\", não \"%s\""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "argumento errado para @headings: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s requer um argumento: o desenhador para @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "\"@end\" sem correspondência"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "argumento supérfluo para @end %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "argumento errado para @end: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: impossível localizar %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: impossível abrir %s:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename após o primeiro elemento"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions só tem significado numa linha @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node precede @part, mas partes não podem ser associadas com nós"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s sem significado dentro de um bloco @%s"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s não permitido dentro de um bloco \"@copying\""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry só devia aparecer numa entrada de índice"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@author sem significado fora de ambientes \"@titlepage\" e \"@quotation\""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s requer um nome"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "argumento formal @%s errado ou vazio: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless espera \"i\" ou \"j\" como argumento, não \"%c\""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "bandeira não definida: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s é obsoleto."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s é obsoleto; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ só devia aparecer em contexto matemático"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb sem carácter associado"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless espera \"i\" ou \"j\" como argumento, não \"%s\""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "} mal colocada"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "sem nó para renomear"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "nós sem um novo nome no fim do ficheiro"
+
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr "a usar um ficheiro nodes renomeado. (\"%s\") é obsoleto"
+
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "nome antigo de \"%s\" é um nó do documento"
+
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "ficheiro vazio para o nó renomeado \"%s\""
+
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "nó alvo (novo nome para \"%s\") não está no documento: %s"
+
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "erro ao fechar ficheiro de redireccionamento do nó renomeado %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "nome de nó vazio"
+
#~ msgid "can't open %s: %s"
#~ msgstr "impossível abrir %s: %s"
@@ -3636,9 +3833,6 @@ msgstr "%s: impossível abrir %s para escrita: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Variável %s obsoleta\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s não devia estar associado com @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: variável %s obsoleta\n"
diff --git a/macros/texinfo/texinfo/po/pt_BR.gmo b/macros/texinfo/texinfo/po/pt_BR.gmo
index b03b7d28b9..1ad0ae9c14 100644
--- a/macros/texinfo/texinfo/po/pt_BR.gmo
+++ b/macros/texinfo/texinfo/po/pt_BR.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/pt_BR.po b/macros/texinfo/texinfo/po/pt_BR.po
index 48bbf56e00..2836305150 100644
--- a/macros/texinfo/texinfo/po/pt_BR.po
+++ b/macros/texinfo/texinfo/po/pt_BR.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: texinfo 6.5.93\n"
+"Project-Id-Version: texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-13 06:15-0200\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-20 06:38-0300\n"
"Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
"net>\n"
@@ -243,7 +243,6 @@ msgid "Insert completion"
msgstr "Insira conclusão"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Construindo conclusões... "
@@ -267,7 +266,6 @@ msgid "found file %s"
msgstr "encontrado arquivo %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "As notas de rodapé não podem ser exibidas"
@@ -280,7 +278,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Notas de Rodapé ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Encontrando entradas de índice"
@@ -289,7 +286,8 @@ msgid "Look up a string in the index for this file"
msgstr "Procurando uma sequência de caracteres no índice do arquivo atual"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "Nenhum índice encontrado"
@@ -298,7 +296,6 @@ msgid "Index entry: "
msgstr "Entrada de índice:"
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Nenhum índice encontrado"
@@ -316,17 +313,20 @@ msgstr ""
"search]'"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous search string"
msgid "No previous index search string"
msgstr "Nenhuma sequência de caracteres de busca anterior"
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No index entries containing '%s'."
msgid "No more index entries containing '%s'"
msgstr "Não existem entradas de índice contendo '%s'."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No index entries containing '%s'."
msgid "No index entries containing '%s'"
msgstr "Não existem entradas de índice contendo '%s'."
@@ -382,7 +382,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Nenhum arquivo info disponível tem '%s' em seus índices"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Erro ao converter a codificação de caractere do arquivo"
@@ -393,11 +392,11 @@ msgstr "Não existe o item '%s' de menu no nodo '%s'"
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "No menu in node '%s'"
msgid "Cannot find node '%s'"
msgstr "Nenhum menu no nodo '%s'"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Nenhum nome de programa "
@@ -426,7 +425,7 @@ msgstr "o valor %s não é válido para a variável %s"
msgid "Try --help for more information.\n"
msgstr "Tente --help para mais informação.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -570,7 +569,7 @@ msgstr ""
" info -f ./qualquercoisa.info exiba o arquivo ./qualquercoisa.info, sem "
"procurar diretório"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -582,6 +581,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "No menu in node '%s'"
msgid "Cannot find node '(%s)%s'"
msgstr "Nenhum menu no nodo '%s'"
@@ -595,26 +595,31 @@ msgstr "O apontador não aparece dentro desse nodo de janela!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete a permanent window"
msgid "Cannot delete the last window"
msgstr "Não posso apagar uma janela permanente"
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in node '%s'"
msgid "No menu in this node"
msgstr "Nenhum menu no nodo '%s'"
#: info/info.c:1187
#, fuzzy
+#| msgid "Move to the end of this node"
msgid "No footnotes in this node"
msgstr "Vai para o fim desse nodo"
#: info/info.c:1188
#, fuzzy
+#| msgid "Read a footnote or cross reference and select its node"
msgid "No cross references in this node"
msgstr "Lê uma nota de rodapé ou referência cruzada e seleciona seu nodo"
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "Move to the start of this node"
msgid "No '%s' pointer for this node"
msgstr "Vai para o início desse nodo"
@@ -630,11 +635,13 @@ msgstr "Terminal tipo '%s' não é adequado para executar Info"
#: info/info.c:1192
#, fuzzy
+#| msgid "Move to the start of this node"
msgid "You are already at the last page of this node"
msgstr "Vai para o início desse nodo"
#: info/info.c:1193
#, fuzzy
+#| msgid "Move to the start of this node"
msgid "You are already at the first page of this node"
msgstr "Vai para o início desse nodo"
@@ -849,6 +856,7 @@ msgstr "Descreva a chave: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "@%s `%s' previously defined"
msgid "%s is undefined"
msgstr "@%s `%s' definido anteriormente"
@@ -867,6 +875,9 @@ msgstr "'%s' não é sobre quaisquer chaves"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid ""
+#| "The following commands can only be invoked via %s:\n"
+#| "\n"
msgid "%s can only be invoked via %s"
msgstr ""
"Os seguintes comandos podem somente serem chamados via %s:\n"
@@ -874,6 +885,9 @@ msgstr ""
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid ""
+#| "The following commands can only be invoked via %s:\n"
+#| "\n"
msgid "%s can be invoked via %s"
msgstr ""
"Os seguintes comandos podem somente serem chamados via %s:\n"
@@ -890,17 +904,14 @@ msgid "could not open init file %s"
msgstr "sem acesso à inicialização de %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "sequência chave muito longa"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "sequência chave faltando"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "proibido usar o caractere NUL (\\000)"
@@ -910,12 +921,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "proibido usar o caractere NUL (^%c)"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "nome de ação faltando"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "nenhuma tecla associada a menu-digito"
@@ -925,7 +934,6 @@ msgid "unknown action `%s'"
msgstr "ação desconhecida `%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nome de ação muito longo"
@@ -935,22 +943,18 @@ msgid "extra characters following action `%s'"
msgstr "caracteres extras adiante da ação `%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "nome de variável faltando"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "faltando `=' imediatamente após o nome da variável"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nome de variável muito grande"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "valor muito grande"
@@ -972,7 +976,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Lê um nome de comando na área de eco e executa-o"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Não posso executar um comando 'echo-area' aqui"
@@ -1054,7 +1057,6 @@ msgid "Show all matching files"
msgstr "Mostra todos os arquivo que coincidem"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Nenhum índice de arquivo"
@@ -1203,6 +1205,7 @@ msgstr "Seleciona esse item de menu"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "Select the last item in this node's menu"
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "Seleciona o último item nesse menu de nodo"
@@ -1232,6 +1235,7 @@ msgstr "Segue a xref: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "A referência desapareceu! (%s)."
@@ -1307,13 +1311,13 @@ msgstr "Seleciona o primeiro nodo nesse arquivo"
#: info/session.c:3161
#, fuzzy
+#| msgid "No earlier node in history"
msgid "No more nodes within this document"
msgstr "Nenhum nodo anterior no histórico"
#: info/session.c:3205 info/session.c:3244
-#, fuzzy
msgid "No 'Prev' or 'Up' for this node within this document"
-msgstr "nome antigo de `%s' é um nodo do documento"
+msgstr ""
#: info/session.c:3257
msgid "Move forwards or down through node structure"
@@ -1365,7 +1369,6 @@ msgid "Select the most recently selected node"
msgstr "Seleciona o nodo mais recentemente selecionado"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Nenhum nodo anterior no histórico"
@@ -1379,11 +1382,13 @@ msgstr "Encontra o arquivo: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot open pipe to '%s'"
msgid "Cannot find '%s'"
msgstr "Não posso abrir o pipe para '%s'"
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "could not read init file %s"
msgid "Could not create output file '%s'"
msgstr "não posso ler o arquivo de inicialização %s"
@@ -1427,12 +1432,12 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Muda o uso de expressões regulares em buscas"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches"
msgid "Using regular expressions for searches"
msgstr "Usando sequência de caracteres literal para buscas"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Usando sequência de caracteres literal para buscas"
@@ -1442,6 +1447,7 @@ msgstr "Busca prossegue a partir do fim do documento"
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the end of the document"
msgid "Search continued from the beginning of the document"
msgstr "Busca prossegue a partir do fim do documento"
@@ -1450,8 +1456,9 @@ msgstr "Busca prossegue a partir do fim do documento"
msgid "Searching subfile %s ..."
msgstr "Buscando subarquivo %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search"
msgid "Search failed"
msgstr "Busca"
@@ -1485,142 +1492,144 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Sequência de caractere de busca muito curta"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Voltando ao anterior que coincide com %s"
-#: info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "No match"
msgid "No more matches"
msgstr "Nenhuma ocorrência do padrão"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Procura uma sequência de caracteres nesse nodo e em seus subnodos"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "Buscando subarquivo %s ..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Vá para o próximo coincidente nos níveis abaixo"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Nenhuma busca ativa"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Vá para o coincidente anterior nos níveis abaixo"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Lê uma sequência de caracteres e busca-a sensivelmente à caixa"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Lê uma sequência de caracteres e busca-a"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Lê uma sequência de caracteres e busca-a voltando"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Repita a última busca na mesma direção"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Nenhuma sequência de caracteres de busca anterior"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Repita a última busca na direção contrária"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Limpar padrões de busca mostrados"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr ""
"Busca iterativamente por uma sequência de caracteres da forma como foi "
"digitada"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Regexp I-search para trás: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-search de volta: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Regexp I-search: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-search: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Falha "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Cancela a operação atual"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Sair"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Mostre informação do Info de agora"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "Versão Info %s GNU"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Atualiza a tela"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Sair usando Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Executa o comando associado a essa variante em caixa baixa da chave"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "unknown command `%s'"
msgid "Unknown command (%s)"
msgstr "comando desconhecido `%s'"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" inválido"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "'%s' inválido"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Adiciona esse dígito ao argumento numérico atual"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Inicia (ou multiplica por 4) o argumento numérico atual"
@@ -1989,12 +1998,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: não posso ler (%s) e não posso criar (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY não coincide com END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY não coincide com START-INFO-DIR-ENTRY"
@@ -2024,13 +2031,11 @@ msgid "excess command line argument `%s'"
msgstr "excesso de argumentos de linha de comando `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Nenhum arquivo de entrada especificado; tente --help para mais informação."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Nenhum arquivo de diretório especificado; tente --help para mais informação."
@@ -2050,24 +2055,24 @@ msgstr "nenhuma entrada de diretório Info em `%s'"
msgid "no entries found for `%s'; nothing deleted"
msgstr "nenhuma entrada encontrada em `%s'; nada apagado"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "não posso abrir %s para escrita: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"move seu comando @contents se você desejar os conteúdos após a página título"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2075,282 +2080,239 @@ msgstr ""
"move seus comandos @shortcontents e @contents se você desejar os conteúdos "
"após a página título"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s é um código inválido de linguagem"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s é um código de região inválido"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s é uma possibilidade de particionamento inválida"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "não posso ler %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "erro ao fechar o arquivo @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: não encontrado %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "nenhum nodo para ser renomeado"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "nodos sem um novo nome ao final do arquivo"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "não posso abrir %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "uso de um arquivo de nodos renomeado (`%s') está desatualizado"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "não posso proteger o caractere de hash em @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "nome de nodo vazio após expansão `%s'"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s `%s' definido anteriormente"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "aqui está a definição anterior de @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "argumento vazio em @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: saída incompatível com quebra"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "erro ao fechar %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "não posso criar diretórios `%s' ou `%s': %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "não posso criar diretório `%s': %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "arquivo @image `%s' não encontrado, usando `%s'"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "nenhum argumento especificado para @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "arquivo @image `%s' (para o HTML) não encontrado, usando `%s'"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "formato raw %s não convertido"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "impossível abrir arquivo html de configuração de referência %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "tipo omitido"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "tipo desconhecido: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "erro ao fechar o arquivo html de configuração de referência %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "sequência de caracteres aberta no arquivo css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include terminou em comentário"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import não terminado no arquivo css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "Arquivo CSS %s não encontrado"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "Não posso abrir --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "erro ao fechar arquivo CSS %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "nenhuma entrada htmlxref.cnf encontrada para `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "erro ao fechar o arquivo de moldura %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "erro ao fechar o arquivo de moldura TOC %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "controlador %s de estágio %s prioridade %s falhou"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "deve especificar um comando de título ou @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "erro ao fechar o arquivo de nodo de redirecionamento %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "nome antigo de `%s' é um nodo do documento"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "arquivo vazio para o nodo renomeado `%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "nodo alvo (novo nome `%s') não está no documento: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "erro ao fechar o arquivo de redirecionamento de nodo renomeado %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "nome de nodo vazio"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "sintaxe para um nodo externo usado para `%s'"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "documento sem nodos"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "documento sem o nodo de nível mais alto"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "a tentativa de renomear %s falhou: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "saída @%s mais de uma vez: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s fora de qualquer nodo"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "o nome @node não deve conter `,': %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Entrada de índice em %s com : produz Info inválido: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "entrada para o índice `%s' fora de qualquer nodo"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "erro ao fechar o arquivo de texto de imagem %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "arquivo @image `%s' inlegível: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
"não posso encontrar o arquivo @image `%s.txt' nem seu texto alternativo"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2358,299 +2320,325 @@ msgstr ""
"@strong{Note...} produz uma referência cruzada espúria em Info; reescreva de "
"forma a evitar que isso ocorra novamente"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "o nome @%s de referência cruzada não deve conter `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "o nome de nodo @%s não deve conter `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "o nome de nodo @%s não deve conter `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' ou `,' deve seguir @xref, não %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "`.' ou `,' deve seguir @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "entrada de menu com nome de nodo não deve conter `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "entrada de menu com nome de nodo não deve conter `:'"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "nome de entrada de menu não deve conter `:'"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "não posso abrir %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "multiplos @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "formato do argumento @%s errônea ou vazia: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "sintaxe errônea para argumento @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s requer um nome"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "nome errôneo para @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s visto antes de @%s fechando a chave"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s visto antes de @%s fechando a chave"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s fechamento de chave faltando"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s omitido fechamento de delimitador de sequência: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx não deve começar @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx deve seguir @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s tem texo mas nenhum @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' espera `%s', mas recebeu `%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s recebido antes de @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "não coincide `%cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "perdido %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "não coincidiu `%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "macro `%s' chamada com muitos argumentos"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s faltando fechamento da chave"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "macro `%s' declarada sem argumento foi chamado com argumento"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ na expansão @%s seguiu `%s' ao invés de nome de parâmetro ou \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "omitido o nome para @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "omitida a categoria de @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "argumento inesperado sobre @%s linha: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "tabela multipla vazia"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "argumento desnecessário para @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "argumento errôneo para @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s requer um argumento: o formatador para %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"o comando @%s sem aceitar argumento entre chaves não deve estar na linha @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "comando de acentuação `@%s' não permitido como argumento @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "argumento @%s falando"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "@end %s desconhecido"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "argumento supéfluo a @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "argumento errôneo a @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: não posso abrir %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "codificação `%s' não é uma codificação canônica do texinfo"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nome de codificação não reconhecido `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s após o primeiro elemento"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s somente tem significado em uma linha @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@part should not be associated with @top"
+msgstr "@node precede @%s, mas algumas partes podem não ser associadas a nodos"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node precede @%s, mas algumas partes podem não ser associadas a nodos"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "sintaxe para um nodo externo usado para `%s'"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "nome de entrada de menu vazio em `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "nome de nodo vazio na entrada de menu"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s não deve aparecer em @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s deve somente aparecer no início de uma linha"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro `%s' já definida"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "a definição já existente de `%s' é"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "redefinindo o comando de linguagem Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s sem caractere associado"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr "@%s definido com zero mais que um argumento deve ser chamado com {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2658,343 +2646,357 @@ msgstr ""
"chamada de macro com muitos subníveis (ajuste a variável MAX_NESTED_MACROS "
"para aumentá-la; o valor atual é %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr "chamada recursiva à macro %snão é permitida; use @rmacro se necessário"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "comando de acentuação `@%s' não deve ser seguido por espaço em branco"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "use chaves para fornecer um comando como um argumento a @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s espera `i' ou `j' como argumento, não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "comando de acentuação `@%s' não deve ser seguido por nova linha"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s esperado chaves"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "comando desconhecido `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "sinalizador indefinido: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "sintaxe errônea para @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s está obsoleto."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s está obsoleto; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s deve somente aparecer em um começo de linha"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s deve somente aparecer em cabeçalho ou rodapé"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s não é significativo dentro do bloco `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s em tabela multipla vazia"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab antes de @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "muitas colunas em item de tabela múltipla (o máximo é %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignorando @tab fora de tabela múltipla"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s fora de tabela ou lista"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s não permitido dentro do bloco `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear in math context"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s deve somente aparecer em contexto matemático"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "não mais que dois níveis de subentrada de índice são permitidos"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "deve estar após `@%s' para usar `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s insignificante fora dos ambientes `@titlepage' e `@quotation'"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory após o primeiro nodo"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "região %s dentro da região %s não é permitida"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry após o primeiro nodo"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu em contexto inválido"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s visto antes do primeiro @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"pode ser que seu nodo @top node deva estar envolvido em um @ifnottex ao "
"invés de um @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s deve somente aparecer em contexto matemático"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s deve somente aparecer em contexto matemático"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "@ inesperado"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s não tem significado fora do ambiente `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s deve estar imediatamente após `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "ignorando multiplos @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "o comando @%s não aceita argumentos"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "o comando @%s omitiu um nodo ou argumento externo de manual"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "em @%s tem-se uma referência cruzada vazia após a expansão `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "em @%s tem-se uma referência cruzada vazia após a expansão `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image faltando o argumento nome de arquivo"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s faltando primeiro argumento"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "dígitos não hexadecimais no argumento a @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "menos que quatro dígitos hexadecimais para @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "argumento a @U excede o maior Unicode 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "argumento supérfluo para nodo"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "esperado %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s deve somente aceitar um @-comando como argumento, não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "resta argumento na linha @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "comando de ambiente %s como argumento a @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "@%s vazio"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "fração de coluna não um número: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp arg deve ser numérico, não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "nome de índice reservado %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "nome de índice desconhecido em @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "índice de destinação desconhecido em @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s conduz a uma ação de %s consigo mesmo, ignorando"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "índice desconhecido `%s' em @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "imprimindo um índice `%s' misturado a outro, `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex antes de início de documento: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "o argumento @%s deve ser ou `top' ou `bottom', não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Somente @%s 10 ou 11 é suportado, não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "@%s arg deve ser `separate' ou `end', não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s arg deve ser `on', `off' ou `odd', not `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "@paragraphindent arg deve ser numeric/`none'/`asis', não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "@firstparagraphindent arg deve ser `none' ou `insert', não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "@exampleindent arg deve ser numeric/`asis', não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "esperado @%s on ou off, não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"o argumento @kbdinputstyle deve ser `code'/`example'/`distinct', não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "o argumento @allowcodebreaks deve ser `true' ou `false', não `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "@urefbreakstyle arg deve ser `after'/`before'/`none', não `%s'"
@@ -3023,7 +3025,7 @@ msgstr "nenhum comando de seção associado a @%s"
msgid "@%s not empty"
msgstr "@%s não vazio"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s referencia a um nodo não existente `%s'"
@@ -3033,106 +3035,106 @@ msgstr "@%s referencia a um nodo não existente `%s'"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "a entrada @%s nome de nodo `%s' diferentes de %s nome `%s'"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nodo não referenciado `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "nodo `%s' é %s para `%s' na seção mas não no menu"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "nodo %s `%s' no menu `%s' e na seção `%s' diferem"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "nodo `%s' é %s para `%s' no menu mas não na seção"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s aponta `%s' (para o nodo `%s') diferente de %s nome `%s'"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s referencia a `%s' o qual não existe"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"nodo `%s' precisa de um item de menu para `%s' apesar de ser seu alvo Acima"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "para `%s', acima no menu `%s' e acima `%s' não coincidem"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s para `%s', diferente do %s nome `%s'"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "chave de índice vazia em @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: não pode abrir %s para gravação: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: erro ao fechar %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: não posso abrir o arquivo latex %s para gravação: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: o diretório L2H_TMP contém um ponto"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: o diretório atual contém um ponto"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: o comando falhou: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: a imagem tem uma extensão inválida: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: renomear %s para %s falhou: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: não posso abrir %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: fim de item @%s que é %d não foi encontrado"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3141,12 +3143,12 @@ msgstr ""
"latex2html.pm: processando os %d itens produzidos em HTML; esperado %d, o "
"número de itens encontrado no documento"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: não posso determinar o fragmento %d para @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3155,47 +3157,47 @@ msgstr ""
"l2h: não posso extrair o fragmento %d para @%s com contador de saída %d a "
"partir do HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: não posso chamar %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: não posso abrir %s para escrita: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: não posso abrir %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: mover para %s falhou: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: incapaz de retornar ao diretório inicial: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: arquivo de saída omitido: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: o comando falhou: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: fim de @%s item %d não encontrado"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3204,12 +3206,12 @@ msgstr ""
"tex4ht.pm: processando %d itens produzidos em HTML; esperado %d, o número de "
"itens encontrados no documento para @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: a saída não tem nenhum item HTML para @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3218,37 +3220,37 @@ msgstr ""
"tex4ht.pm: processando %d itens recuperados no HTML; esperado %d, o número "
"de itens encontrado no documento para @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "erro ao chamar %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: variável desconhecida %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: variável desconhecida %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "não posso ler o arquivo de inicialização %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "ignorando valor desconhecido da TEXINFO_OUTPUT_FORMAT variável `%s'\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uso: %s [OPÇÃO]... ARQUIVO-TEXI...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3264,7 +3266,7 @@ msgstr ""
"Esse programa está instalado ou como `makeinfo' ou como `texi2any';\n"
"o comportamento é idêntico, e não do nome de instalação.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3303,7 +3305,7 @@ msgstr ""
" -v, --verbose mostra o que está sendo feito.\n"
" --version mostra informação de versão e sai.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3324,7 +3326,7 @@ msgstr ""
"solicitada,\n"
" após verificar ARQUIVO-TEXI.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3377,7 +3379,7 @@ msgstr ""
" De outra forma, DEST nomeia o arquivo de "
"saída.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3418,7 +3420,7 @@ msgstr ""
" --split-size=NUM quebra arquivos Info a um tamanho NUM (o "
"padrão é %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3447,7 +3449,7 @@ msgstr ""
" ancoras; o padrão é ajustar somente se hover "
"QUEBRA.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3455,7 +3457,7 @@ msgstr ""
"Opções para XML e para Docbook:\n"
" --output-indent=VAL não faz nada, mantida para compatibilidade.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3463,7 +3465,7 @@ msgstr ""
"Opções para DVI/PS/PDF:\n"
" --Xopt=OPÇÃO informa OPÇÃO ao texi2dvi; pode ser repetido.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3485,7 +3487,7 @@ msgstr ""
"@include.\n"
" -U VAR remove a variável VAR, semelhante a @clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3523,7 +3525,7 @@ msgstr ""
"\n"
" Também, para as opções --no-ifFORMATO, processa o texto @ifnotFORMAT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3539,7 +3541,7 @@ msgstr ""
" se gerando plain text, --ifplaintext é on e os outros são off;\n"
" se gerando XML, --ifxml é on e os outros são off.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3574,66 +3576,66 @@ msgstr ""
" makeinfo --no-split algumacoisa.texi grava um único arquivo Info mesmo "
"grande\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: o argumento de --footnote-style deve ser `separate' ou `end', não `%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: o argumento de --paragraph-indent deve ser numeric/`none'/`asis', não `"
"%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: ao gerar %s, somente um único ARQUIVO de entrada pode ser especificado "
"com -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "opção --Xopt sem saída mostrada"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "árvore de transformação %s desconhecida"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "ignorando quebra para o formato %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: faltando argumento arquivo.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informação.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"a transformação fill_gaps_in_sectioning não retorna nada. Nenhuma seção?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "erro ao fechar o arquivo expandido de macro %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "não posso abrir %s para escrita: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3641,17 +3643,286 @@ msgstr ""
"a transformação insert_nodes_for_sectioning_commands não retorna nada. "
"Nenhuma seção?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: erro ao fechar %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: erro ao fechar o arquivo de links internos %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: não posso abrir %s para escrita: %s\n"
+
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "não coincide `%cend %s'"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "perdido %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "não coincidiu `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s requer um nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "nome errôneo para @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s requer um nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "nome errôneo para @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s requer um nome"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "nome errôneo para @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept an @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s deve somente aceitar um @-comando como argumento, não `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "comando de ambiente %s como argumento a @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "argumento errôneo para @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "argumento errôneo para @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "argumento vazio em @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "argumento errôneo a @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Somente @%s 10 ou 11 é suportado, não `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: o argumento de --footnote-style deve ser `separate' ou `end', não `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "@%s arg deve ser `on', `off' ou `odd', not `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "argumento errôneo a @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "@firstparagraphindent arg deve ser `none' ou `insert', não `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "argumento errôneo a @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s requer um argumento: o formatador para %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "não coincidiu `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "argumento supéfluo a @%s %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "argumento errôneo a @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: não encontrado %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: não posso abrir %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "@%s após o primeiro elemento"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s somente tem significado em uma linha @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node precede @%s, mas algumas partes podem não ser associadas a nodos"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s não é significativo dentro do bloco `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s não permitido dentro do bloco `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s deve somente aparecer em contexto matemático"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s insignificante fora dos ambientes `@titlepage' e `@quotation'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s requer um nome"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "formato do argumento @%s errônea ou vazia: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s espera `i' ou `j' como argumento, não `%s'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "sinalizador indefinido: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s está obsoleto."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s está obsoleto; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s deve somente aparecer em contexto matemático"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s sem caractere associado"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s espera `i' ou `j' como argumento, não `%s'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "perdido %c"
diff --git a/macros/texinfo/texinfo/po/remove-potcdate.sin b/macros/texinfo/texinfo/po/remove-potcdate.sin
index 2436c49e78..8c70dfbf14 100644
--- a/macros/texinfo/texinfo/po/remove-potcdate.sin
+++ b/macros/texinfo/texinfo/po/remove-potcdate.sin
@@ -1,6 +1,12 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
+# Sed script that removes the POT-Creation-Date line in the header entry
# from a POT file.
#
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
+#
# The distinction between the first and the following occurrences of the
# pattern is achieved by looking at the hold space.
/^"POT-Creation-Date: .*"$/{
diff --git a/macros/texinfo/texinfo/po/ro.gmo b/macros/texinfo/texinfo/po/ro.gmo
index 95ab4e69ec..8304bbf7de 100644
--- a/macros/texinfo/texinfo/po/ro.gmo
+++ b/macros/texinfo/texinfo/po/ro.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/ro.po b/macros/texinfo/texinfo/po/ro.po
index 6c31f1e472..277e9d1c87 100644
--- a/macros/texinfo/texinfo/po/ro.po
+++ b/macros/texinfo/texinfo/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 4.7.94\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2005-05-03 12:00+05\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -25,36 +25,43 @@ msgstr ""
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: opþiunea `%s' este ambiguã\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: opþiunea `%s' este ambiguã\n"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: opþiune nerecunoscutã `%c%s'\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: opþiunea `%c%s' nu permite un argument\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: opþiunea `%s' necesitã un argument\n"
#: gnulib/lib/getopt.c:621
#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
msgid "%s: invalid option -- '%c'\n"
msgstr "%s: opþiune invalidã -- %c\n"
#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:682
#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: opþiunea necesitã un argument -- %c\n"
@@ -72,11 +79,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:144
#, fuzzy
+#| msgid "invalid encoded character `%s'"
msgid "Invalid collation character"
msgstr "caracter codat invalid `%s'"
#: gnulib/lib/regcomp.c:147
#, fuzzy
+#| msgid "unlikely character %c in @var"
msgid "Invalid character class name"
msgstr "caracter neverosimil %c în @var"
@@ -94,11 +103,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:159
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ( or \\("
msgstr "} fãrã pereche"
#: gnulib/lib/regcomp.c:162
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched \\{"
msgstr "} fãrã pereche"
@@ -128,11 +139,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:183
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ) or \\)"
msgstr "} fãrã pereche"
#: gnulib/lib/regcomp.c:676
#, fuzzy
+#| msgid "No previous search string"
msgid "No previous regular expression"
msgstr "Nici un ºir cãutat anterior"
@@ -238,6 +251,7 @@ msgstr "O singurã completare"
#: info/echo-area.c:1049
#, fuzzy, c-format
+#| msgid "%d completions:\n"
msgid "%d completion:\n"
msgid_plural "%d completions:\n"
msgstr[0] "%d completãri:\n"
@@ -248,7 +262,6 @@ msgid "Insert completion"
msgstr "Insereazã completarea"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Construim completãrile..."
@@ -263,16 +276,17 @@ msgstr ""
#: info/filesys.c:150
#, fuzzy, c-format
+#| msgid "Making %s file `%s' from `%s'.\n"
msgid "looking for file %s in %s"
msgstr "Creez fiºierul %s `%s' din `%s'.\n"
#: info/filesys.c:236 info/filesys.c:250 info/filesys.c:271
#, fuzzy, c-format
+#| msgid "Find file: "
msgid "found file %s"
msgstr "Gãseºte fiºier: "
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Notele de subsol nu pot fi afiºate"
@@ -285,7 +299,6 @@ msgid "---------- Footnotes ----------"
msgstr "------- Note de subsol -------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Cãutãm intrãri în index..."
@@ -294,7 +307,8 @@ msgid "Look up a string in the index for this file"
msgstr "Cautã un ºir în indexul acestui fiºier"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "Nici am gãsit nici un index."
@@ -303,18 +317,21 @@ msgid "Index entry: "
msgstr "Intrare în index: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Nici am gãsit nici un index."
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr ""
"Am gãsit `%s' în %s. (`\\[next-index-match]' încearcã sã gãseascã urmãtorul.)"
#: info/indices.c:446
#, fuzzy
+#| msgid ""
+#| "Go to the next matching index item from the last `\\[index-search]' "
+#| "command"
msgid ""
"Go to the next matching index item from the last '\\[index-search]' command"
msgstr ""
@@ -322,22 +339,26 @@ msgstr ""
"\\[index-search]'"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "Nu existã nici un ºir cãutat anterior."
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No more index entries containing '%s'"
msgstr "Nici o intrare în %sindex conþinând `%s'."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No index entries containing '%s'"
msgstr "Nici o intrare în %sindex conþinând `%s'."
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of `%s'..."
msgid "Scanning indices of '%s'..."
msgstr "Scanãm indexurile pentru `%s'..."
@@ -348,11 +369,13 @@ msgstr ""
#: info/indices.c:654 info/indices.c:656
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index apropos"
msgstr "Index apropos: "
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "Index entries containing '%s':\n"
msgstr "Nici o intrare în %sindex conþinând `%s'."
@@ -371,36 +394,39 @@ msgstr ""
#: info/indices.c:889 info/indices.c:891
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index topic"
msgstr "Index apropos: "
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No index entries containing '%s'."
msgstr "Nici o intrare în %sindex conþinând `%s'."
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have `%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "Nici un fiºier info nu are `%s' în indexurile lor."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "Nici un articol de meniu `%s' în nod `%s'."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr "Nu pot gãsi nodul `%s'."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -421,6 +447,7 @@ msgstr ""
#: info/info.c:828 info/infokey.c:560
#, fuzzy, c-format
+#| msgid "Set the value of an Info variable"
msgid "value %s is not valid for variable %s"
msgstr "Seteazã valoarea unei variabile Info"
@@ -429,7 +456,7 @@ msgstr "Seteazã valoarea unei variabile Info"
msgid "Try --help for more information.\n"
msgstr "Încercaþi --help pentru informaþii suplimentare.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -441,6 +468,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
@@ -475,6 +503,7 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers.\n"
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr ""
" -b, --speech-friendly fii prietenos cu sintetizatoarele de "
@@ -521,8 +550,13 @@ msgid ""
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Email bug reports to bug-texinfo@gnu.org,\n"
+#| "general questions and discussion to help-texinfo@gnu.org.\n"
+#| "Texinfo home page: http://www.gnu.org/software/texinfo/"
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -535,6 +569,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "Nu pot gãsi nodul `(%s)%s'."
@@ -548,61 +583,73 @@ msgstr "Punctul nu apare în interiorul nodului acestei ferestre!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "Nu pot ºterge ultima fereastrã."
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "Nici un meniu în acest nod"
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "Nici o notã de subsol în acest nod."
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "Nici un pointer `%s' pentru acest nod."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "Comandã Info necunoscutã `%c';încercaþi `?' pentru ajutor."
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "Terminalul de tip `%s' nu e destul de deºtept sã ruleze Info."
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "Sunteþi deja la ultima paginã a acestui nod."
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "Sunteþi deja la prima paginã a acestui nod."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "O singurã fereastrã."
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "Fereastra rezultantã ar fi prea micã."
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr "Nu e destul spaþiu pentru o fereastrã de ajutor, ºtergeþi o fereastrã."
@@ -612,6 +659,7 @@ msgstr ""
#: info/infodoc.c:40
#, fuzzy
+#| msgid "\\%-10[quit-help] Quit this help.\n"
msgid "\\%-10[quit-help] Close this help window.\n"
msgstr "\\%-10[quit-help] Terminã acest ajutor.\n"
@@ -625,21 +673,25 @@ msgstr "\\%-10[get-info-help-node] Invocaþi tutorialul Info.\n"
#: info/infodoc.c:44
#, fuzzy
+#| msgid "\\%-10[prev-line] Scroll backward 1 line.\n"
msgid "\\%-10[prev-line] Move up one line.\n"
msgstr "\\%-10[prev-line] Scroll înapoi 1 linie.\n"
#: info/infodoc.c:45
#, fuzzy
+#| msgid "\\%-10[next-line] Scroll forward 1 line.\n"
msgid "\\%-10[next-line] Move down one line.\n"
msgstr "\\%-10[next-line] Scroll înainte 1 linie.\n"
#: info/infodoc.c:46
#, fuzzy
+#| msgid "\\%-10[scroll-backward] Scroll backward a page.\n"
msgid "\\%-10[scroll-backward] Scroll backward one screenful.\n"
msgstr "\\%-10[scroll-backward] Scroll înapoi o paginã.\n"
#: info/infodoc.c:47
#, fuzzy
+#| msgid "\\%-10[scroll-forward] Scroll forward a page.\n"
msgid "\\%-10[scroll-forward] Scroll forward one screenful.\n"
msgstr "\\%-10[scroll-forward] Scroll înainte o paginã.\n"
@@ -653,6 +705,8 @@ msgstr "\\%-10[end-of-node] Mergi la sfârºitul acestui nod.\n"
#: info/infodoc.c:51
#, fuzzy
+#| msgid ""
+#| "\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n"
msgid "\\%-10[move-to-next-xref] Skip to the next hypertext link.\n"
msgstr ""
"\\%-10[move-to-next-xref] Sari la urmãtoarea legãturã hypertext din acest "
@@ -660,6 +714,9 @@ msgstr ""
#: info/infodoc.c:52
#, fuzzy
+#| msgid ""
+#| "\\%-10[select-reference-this-line] Follow the hypertext link under "
+#| "cursor.\n"
msgid ""
"\\%-10[select-reference-this-line] Follow the hypertext link under the "
"cursor.\n"
@@ -669,62 +726,75 @@ msgstr ""
#: info/infodoc.c:53
#, fuzzy
+#| msgid "\\%-10[history-node] Move to the last node seen in this window.\n"
msgid "\\%-10[history-node] Go back to the last node seen in this window.\n"
msgstr ""
"\\%-10[history-node] Mergi la ultimul nod vãzut în aceastã fereastrã.\n"
#: info/infodoc.c:55
#, fuzzy
+#| msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n"
msgid "\\%-10[global-prev-node] Go to the previous node in the document.\n"
msgstr "\\%-10[prev-node] Mergi la nodul \"precedent\" al acestui nod.\n"
#: info/infodoc.c:56
#, fuzzy
+#| msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n"
msgid "\\%-10[global-next-node] Go to the next node in the document.\n"
msgstr "\\%-10[next-node] Mergi la \"urmãtorul\" nod al acestui nod.\n"
#: info/infodoc.c:57
#, fuzzy
+#| msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n"
msgid "\\%-10[prev-node] Go to the previous node on this level.\n"
msgstr "\\%-10[prev-node] Mergi la nodul \"precedent\" al acestui nod.\n"
#: info/infodoc.c:58
#, fuzzy
+#| msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n"
msgid "\\%-10[next-node] Go to the next node on this level.\n"
msgstr "\\%-10[next-node] Mergi la \"urmãtorul\" nod al acestui nod.\n"
#: info/infodoc.c:59
#, fuzzy
+#| msgid "\\%-10[up-node] Move \"up\" from this node.\n"
msgid "\\%-10[up-node] Go up one level.\n"
msgstr "\\%-10[up-node] Mergi în \"sus\" de la acest nod.\n"
#: info/infodoc.c:60
#, fuzzy
+#| msgid "\\%-10[end-of-node] Go to the end of this node.\n"
msgid "\\%-10[top-node] Go to the top node of this document.\n"
msgstr "\\%-10[end-of-node] Mergi la sfârºitul acestui nod.\n"
#: info/infodoc.c:61
#, fuzzy
+#| msgid "\\%-10[end-of-node] Go to the end of this node.\n"
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
msgstr "\\%-10[end-of-node] Mergi la sfârºitul acestui nod.\n"
#: info/infodoc.c:63
#, fuzzy
+#| msgid " %-10s Pick first ... ninth item in node's menu.\n"
msgid "1...9 Pick the first...ninth item in this node's menu.\n"
msgstr " %-10s Alege primul ... al nouãlea articol în meniul nodului.\n"
#: info/infodoc.c:64
#, fuzzy
+#| msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n"
msgid "\\%-10[last-menu-item] Pick the last item in this node's menu.\n"
msgstr "\\%-10[last-menu-item] Alege ultimul articol în meniul nodului.\n"
#: info/infodoc.c:65
#, fuzzy
+#| msgid " %-10s Pick menu item specified by name.\n"
msgid "\\%-10[menu-item] Pick a menu item specified by name.\n"
msgstr " %-10s Alege articolul de meniu specificat prin nume.\n"
#: info/infodoc.c:66
#, fuzzy
+#| msgid ""
+#| "\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n"
msgid "\\%-10[xref-item] Follow a cross reference specified by name.\n"
msgstr ""
"\\%-10[xref-item] Urmeazã o referinþã încruciºatã. Citeºte numele "
@@ -732,11 +802,13 @@ msgstr ""
#: info/infodoc.c:67
#, fuzzy
+#| msgid " %-10s Move to node specified by name.\n"
msgid "\\%-10[goto-node] Go to a node specified by name.\n"
msgstr " %-10s Mergi la nodul specificat prin nume.\n"
#: info/infodoc.c:69
#, fuzzy
+#| msgid " %-10s Search forward for a specified string,\n"
msgid "\\%-10[search] Search forward for a specified string.\n"
msgstr " %-10s Cautã înainte un ºir specificat,\n"
@@ -750,6 +822,11 @@ msgstr ""
#: info/infodoc.c:72
#, fuzzy
+#| msgid ""
+#| "\\%-10[index-search] Search for a specified string in the index entries "
+#| "of this Info\n"
+#| " file, and select the node referenced by the first entry "
+#| "found.\n"
msgid ""
"\\%-10[index-search] Search for a specified string in the index, and\n"
" select the node referenced by the first entry found.\n"
@@ -764,11 +841,13 @@ msgstr ""
#: info/infodoc.c:76
#, fuzzy
+#| msgid "Cancel current operation"
msgid "\\%-10[abort-key] Cancel the current operation.\n"
msgstr "Renunþã la operaþia curentã"
#: info/infodoc.c:195
#, fuzzy, c-format
+#| msgid "This is %s, produced by makeinfo version %s from %s.\n"
msgid "This is GNU Info version %s. "
msgstr "Acesta este %s, produs de makeinfo versiunea %s din %s.\n"
@@ -815,6 +894,7 @@ msgstr "Afiºeazã mesaj de ajutor"
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "Viziteazã nodul Info `(info)Ajutor'"
@@ -829,6 +909,7 @@ msgstr "Descrie tastã (key): %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s nu este definit(ã)."
@@ -842,41 +923,43 @@ msgstr "Unde este comanda: "
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "`%s' nu este pe nici o tastã"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s poate fi invocat doar via %s."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s poate fi invocat via %s."
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr "Nu existã nii o funcþie numitã `%s'"
#: info/infomap.c:585
#, fuzzy, c-format
+#| msgid "cannot open input file `%s'"
msgid "could not open init file %s"
msgstr "nu pot deschide fiºierul de intrare `%s'"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "secvenþã de taste prea lungã"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "secvenþã de taste inexistentã"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "caracterul NUL (\\000) nu este permis"
@@ -886,12 +969,12 @@ msgid "NUL character (^%c) not permitted"
msgstr "caracterul NUL (^%c) nu este permis"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "nume de acþiune inexistent"
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "key sequence too long"
msgid "cannot bind key sequence to menu-digit"
msgstr "secvenþã de taste prea lungã"
@@ -901,7 +984,6 @@ msgid "unknown action `%s'"
msgstr "acþiune necunoscutã `%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "nume de acþiune prea lung"
@@ -911,22 +993,18 @@ msgid "extra characters following action `%s'"
msgstr "extra caractere dupã acþiunea `%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "nume de variabilã inexistent"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "caracterul `=' lipseºte imediat dupã numele de variabilã"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "nume de variabilã prea lung"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "valoare prea lungã"
@@ -948,7 +1026,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Citeºte un nume de comandã în zona ecou ºi executã-o"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an `echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "Nu pot executa o comandã `zonã ecou' aici."
@@ -979,6 +1058,11 @@ msgstr "Nu ap putut manipula fiºierul %s.\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -993,6 +1077,9 @@ msgstr ""
#: info/nodemenu.c:185
#, fuzzy
+#| msgid ""
+#| "Here is the menu of nodes you have recently visited.\n"
+#| "Select one from this menu, or use `\\[history-node]' in another window.\n"
msgid ""
"Here is the menu of nodes you have recently visited.\n"
"Select one from this menu, or use '\\[history-node]' in another window.\n"
@@ -1035,7 +1122,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr ""
@@ -1044,6 +1130,9 @@ msgstr ""
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1188,6 +1277,7 @@ msgstr "Selecteazã acest articol de meniu"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "Nu existã %d articole în acest meniu"
@@ -1217,6 +1307,7 @@ msgstr "Urmeazã ref: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "Referinþa a dispãrut! (%s)."
@@ -1250,11 +1341,13 @@ msgstr "Selecteazã referinþa sau articolul de meniu ce apare pe acestã linie"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr "Nici un meniu în nod `%s'."
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "Nu pot gãsi nodul referit de `%s' în `%s'."
@@ -1292,11 +1385,13 @@ msgstr "Selecteazã primul nod din acest fiºier"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "Nu mai sunt alte noduri în acest document."
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "Nici un `Prec' sau `Sus' pentru acest nod în acest document."
@@ -1335,11 +1430,13 @@ msgstr "Obþine paginã manual (manpage): "
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "Selecteazã nodul `Vârf' în acest fiºier"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "Selecteazã nodul `(dir)'"
@@ -1352,7 +1449,6 @@ msgid "Select the most recently selected node"
msgstr "Selecteazã cel mai recent nod selectat"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1366,26 +1462,31 @@ msgstr "Gãseºte fiºier: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr "Nu pot gãsi `%s'."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr "Nu am putut crea fiºier ieºire `%s'."
#: info/session.c:3727
#, fuzzy, c-format
+#| msgid "error writing to `%s'"
msgid "error writing to %s: %s"
msgstr "eroare la scrierea în `%s'"
#: info/session.c:3736
#, fuzzy, c-format
+#| msgid "Removing %s\n"
msgid "closing %s"
msgstr "ªterg %s\n"
#: info/session.c:3785
#, fuzzy, c-format
+#| msgid "Writing node %s..."
msgid "writing node %s..."
msgstr "Scriu nod %s..."
@@ -1395,16 +1496,19 @@ msgstr "Conectez (pipe) conþinutul acestui nod prin INFO_PRINT_COMMAND"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr "Nu pot deschide conexiune (pipe) cãtre `%s'."
#: info/session.c:3864
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "printing node %s..."
msgstr "Tipãresc nod %s..."
#: info/session.c:3872
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "finished printing node %s"
msgstr "Tipãresc nod %s..."
@@ -1413,12 +1517,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr ""
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr ""
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr ""
@@ -1428,6 +1530,7 @@ msgstr ""
#: info/session.c:4117
#, fuzzy
+#| msgid "Kill to the beginning of the line"
msgid "Search continued from the beginning of the document"
msgstr "ªterge (kill) pânã la începutul liniei"
@@ -1436,13 +1539,15 @@ msgstr "ªterge (kill) pânã la începutul liniei"
msgid "Searching subfile %s ..."
msgstr "Caut subfiºier %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "Cãutare eºuatã."
#: info/session.c:4192
#, fuzzy, c-format
+#| msgid "%s%sfor string [%s]: "
msgid "%s%s%s [%s]: "
msgstr "%s%s pentru ºir [%s]: "
@@ -1456,11 +1561,13 @@ msgstr "Cautã"
#: info/session.c:4194 info/session.c:4200
#, fuzzy
+#| msgid " case-sensitively "
msgid " case-sensitively"
msgstr " þinând cont de litere mari/mici"
#: info/session.c:4195 info/session.c:4201
#, fuzzy
+#| msgid "Search backward"
msgid " backward"
msgstr "Cautã înapoi"
@@ -1473,143 +1580,147 @@ msgstr ""
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr ""
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "Caut subfiºier %s ..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Citeºte un ºir ºi cautã-l þinând cont de litere mari/mici"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Citeºte un ºir ºi cautã-l"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Citeºte un ºir ºi cautã-l înapoi"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Repetã ultima cãutare în aceeaºi direcþie"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Nici un ºir cãutat anterior"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Repetã ultima cãutare în direcþie opusã"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Cautã interactiv pentru un ºir pe mãsurã ce este introdus"
-#: info/session.c:4878
+#: info/session.c:4893
#, fuzzy
+#| msgid "I-search backward: "
msgid "Regexp I-search backward: "
msgstr "I-cautã înapoi: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-cautã înapoi: "
-#: info/session.c:4881
+#: info/session.c:4896
#, fuzzy
+#| msgid "I-search: "
msgid "Regexp I-search: "
msgstr "I-cautã: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-cautã: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Eºuez "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Renunþã la operaþia curentã"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Ieºi"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "afiºeazã informaþii despre versiune ºi terminã"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Redeseneazã ecranul"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Ieºi din Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Ruleazã comanda legatã de litera micã de pe tastã"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "Comandã necunoscutã (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" este invalid"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "`%s' is invalid"
msgid "'%s' is invalid"
msgstr "`%s' este invalid"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Adaugã aceastã cifrã la argumentul numeric curent"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Începe (sau înmulþeºte cu 4) argumentul numeric curent"
@@ -1665,6 +1776,8 @@ msgstr "Când \"Activ\", Info acceptã ºi afiºeazã caractere ISO Latin"
#: info/variables.c:111
#, fuzzy
+#| msgid ""
+#| "Controls what happens when scrolling is requested at the end of a node"
msgid ""
"What to do when a scrolling command is issued at the end of the last node"
msgstr ""
@@ -1698,6 +1811,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "Mergi la referinþa urmãtoare"
@@ -1758,6 +1872,7 @@ msgstr "%s: fiºier gol"
#: install-info/install-info.c:291
#, fuzzy, c-format
+#| msgid " for %s"
msgid "%s for %s"
msgstr " pentru %s"
@@ -1768,6 +1883,7 @@ msgstr "\tÎncercaþi `%s --help' pentru o lipsã completã de opþiuni.\n"
#: install-info/install-info.c:538
#, fuzzy, c-format
+#| msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n"
@@ -1866,6 +1982,23 @@ msgstr ""
#: install-info/install-info.c:639
#, fuzzy, c-format
+#| msgid ""
+#| "This is the file .../info/dir, which contains the\n"
+#| "topmost node of the Info hierarchy, called (dir)Top.\n"
+#| "The first time you invoke Info you start off looking at this node.\n"
+#| "\n"
+#| "%s\tThis is the top of the INFO tree\n"
+#| "\n"
+#| " This (the Directory node) gives a menu of major topics.\n"
+#| " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+#| " \"h\" gives a primer for first-timers,\n"
+#| " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+#| "\n"
+#| " In Emacs, you can click mouse button 2 on a menu item or cross "
+#| "reference\n"
+#| " to select it.\n"
+#| "\n"
+#| "%s\n"
msgid ""
"This is the file .../info/dir, which contains the\n"
"topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -1903,16 +2036,15 @@ msgstr ""
#: install-info/install-info.c:663
#, fuzzy, c-format
+#| msgid "%s: could not read (%s) and could not create (%s)\n"
msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: nu am putut citi (%s) ºi nu am putut crea (%s)\n"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY fãrã un END-INFO-DIR-ENTRY corespunzãtor"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY fãrã un START-INFO-DIR-ENTRY corespunzãtor"
@@ -1942,14 +2074,12 @@ msgid "excess command line argument `%s'"
msgstr "argument suplimentar în linia de comandã `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Nici un fiºier de intrare specificat; încercaþi --help pentru informaþii "
"suplimentare."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Nici un fiºier dir specificat; încercaþi --help pentru informaþii "
@@ -1957,6 +2087,7 @@ msgstr ""
#: install-info/install-info.c:2301
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not read %s."
msgstr "Nu am putut crea fiºier ieºire `%s'."
@@ -1970,307 +2101,294 @@ msgstr "nici o intrare dir info în `%s'"
msgid "no entries found for `%s'; nothing deleted"
msgstr "nici o intrare gãsitã pentru `%s'; n-am ºters nimic"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open %s for writing: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid language code"
msgstr "%s nu este un cod de limbã valid conform ISO 639"
-#: tp/Texinfo/Common.pm:1157
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid region code"
msgstr "%s nu este un cod de limbã valid conform ISO 639"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not read %s: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s: could not find %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, fuzzy, perl-format
-msgid "could not open %s: %s"
-msgstr "%s: nu am putut deschide --css-file: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, fuzzy, perl-format
+#| msgid "macro `%s' previously defined"
msgid "@%s `%s' previously defined"
msgstr "macro-ul `%s' definit anterior"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, fuzzy, perl-format
+#| msgid "here is the previous definition of `%s'"
msgid "here is the previous definition as @%s"
msgstr "aici este definiþia anterioarã a lui `%s'"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "empty argument in @%s"
msgstr "Argument nepotrivit pentru @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing %s: %s"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directories `%s' or `%s': %s"
msgstr "Nu pot crea directorul `%s': %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directory `%s': %s"
msgstr "Nu pot crea directorul `%s': %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, fuzzy, perl-format
+#| msgid "@image file `%s' unreadable: %s"
msgid "@image file `%s' not found, using `%s'"
msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
+#| msgid "No node name specified for `%c%s' command"
msgid "no argument specified for @U"
msgstr "Nici un nume specificat pentru comanda `%c%s'"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, fuzzy, perl-format
+#| msgid "@image file `%s' (for HTML) not readable: %s"
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Fiºierul @image `%s' (pentru HTML) nu poate fi citit: %s"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open html refs config file %s: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
#, fuzzy
+#| msgid "missing action name"
msgid "missing type"
msgstr "nume de acþiune inexistent"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, fuzzy, perl-format
+#| msgid "%s: unrecognized option `--%s'\n"
msgid "unrecognized type: %s"
msgstr "%s: opþiune nerecunoscutã `--%s'\n"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing html refs config file %s: %s"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
#, fuzzy
+#| msgid "%s:%d: --css-file ended in comment"
msgid "--css-include ended in comment"
msgstr "%s:%d: --css-file s-a terminat cu un comentariu"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open --include-file %s: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing CSS file %s: %s"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, fuzzy, perl-format
+#| msgid "no index entries found for `%s'\n"
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing frame file %s: %s"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing TOC frame file %s: %s"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing redirection node file %s: %s"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, fuzzy, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "Nici un `Prec' sau `Sus' pentru acest nod în acest document."
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, fuzzy, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "nod nereferit `%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
#, fuzzy
+#| msgid "No menu in this node."
msgid "document without nodes"
msgstr "Nici un meniu în acest nod"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, fuzzy, perl-format
+#| msgid "(outside of any node)"
msgid "@%s outside of any node"
msgstr "(în afara oricãrui nod)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, fuzzy, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, fuzzy, c-format, perl-format
+#| msgid "Entry for index `%s' outside of any node"
msgid "entry for index `%s' outside of any node"
msgstr "Intrarea pentru index-ul `%s' în afara oricãrui nod"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing image text file %s: %s"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2278,646 +2396,743 @@ msgstr ""
"@strong{Notã...] produce o referinþã încruciºatã falsã în Info; reformulaþi "
"pentru a o evita"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, fuzzy, perl-format
+#| msgid "No %sindex entries containing `%s'."
msgid "@%s node name should not contain `%s'"
msgstr "Nici o intrare în %sindex conþinând `%s'."
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:762
+#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "could not open %s: %s"
+msgstr "%s: nu am putut deschide --css-file: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s necesitã un nume"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad name for @%s"
msgstr "Argument nepotrivit pentru @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s lipseºte paranteza de închidere"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' a aºteptat `%s', dar a vãzut `%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, fuzzy, perl-format
+#| msgid "No matching `%cend %s'"
msgid "no matching `%cend %s'"
msgstr "Nici o potrivire %cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, fuzzy, perl-format
+#| msgid "Misplaced %c"
msgid "misplaced %c"
msgstr "%c nelalocul lui"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, fuzzy, perl-format
+#| msgid "Unmatched `%c%s'"
msgid "unmatched `%c%s'"
msgstr "`%c%s' fãrã pereche"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' called with too many args"
msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s missing close brace"
msgid "@%s missing closing brace"
msgstr "%c%s lipseºte paranteza de închidere"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' declared without argument called with an argument"
msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, fuzzy, c-format, perl-format
+#| msgid "\\ in macro expansion followed by `%s' instead of parameter name"
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ in expansiunea macro urmatã de `%s' în loc de nume parametru"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, fuzzy, c-format, perl-format
+#| msgid "missing action name"
msgid "missing name for @%s"
msgstr "nume de acþiune inexistent"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, fuzzy, c-format, perl-format
+#| msgid "arguments to @%s ignored"
msgid "unexpected argument on @%s line: %s"
msgstr "argumentele pentru @%s ignorate"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
#, fuzzy
+#| msgid "%s: empty file"
msgid "empty multitable"
msgstr "%s: fiºier gol"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "superfluous argument to @%s"
msgstr "Argument nepotrivit pentru @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad argument to @%s"
msgstr "Argument nepotrivit pentru @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s necesitã un argument: formatatorul pentru %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, fuzzy, c-format, perl-format
+#| msgid "%s: option `--%s' doesn't allow an argument\n"
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "%s: opþiunea `--%s' nu permite un argument\n"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing argument"
msgstr "%s: lipseºte fiºierul argument.\n"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown @end %s"
msgstr "Index necunoscut `%s'"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, fuzzy, perl-format
+#| msgid "Bad argument to @%s"
msgid "superfluous argument to @%s %s: %s"
msgstr "Argument nepotrivit pentru @%s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad argument to @%s: %s"
msgstr "Argument nepotrivit pentru @%s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s: could not open %s: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "nume de codare nerecunoscut `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, fuzzy, perl-format
+#| msgid "@%s not meaningful outside `@titlepage' environment"
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s nu are sens în exteriorul mediului `@titlepage'"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, fuzzy, c-format, perl-format
+#| msgid "No menu in node `%s'."
msgid "empty menu entry name in `%s'"
msgstr "Nici un meniu în nod `%s'."
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, fuzzy, c-format, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s should not appear in @%s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@end %s should only appear at the beginning of a line"
msgstr "ªterge (kill) pânã la începutul liniei"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro-ul `%s' definit anterior"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "aici este definiþia anterioarã a lui `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, fuzzy, c-format, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "use braces to give a command as an argument to @%s"
msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, fuzzy, perl-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s aºteaptã `i' sau `j' ca argument, nu `%c'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s expected braces"
msgid "@%s expected braces"
msgstr "%c%s am aºteptat paranteze"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown command `%s'"
msgid "unknown command `%s'"
msgstr "Comandã necunoscutã `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "marcaj nedefinit: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete."
msgstr "%c%s este depãsit"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete; %s"
msgstr "%c%s este depãsit"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@%s should only appear at the beginning of a line"
msgstr "ªterge (kill) pânã la începutul liniei"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s nu are sens în interiorul blocului `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, fuzzy, c-format, perl-format
+#| msgid "%s: empty file"
msgid "@%s in empty multitable"
msgstr "%s: fiºier gol"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, fuzzy, c-format, perl-format
+#| msgid "Too many columns in multitable item (max %d)"
msgid "too many columns in multitable item (max %d)"
msgstr "Prea multe coloane în articol multitabel (max %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignor @tab în afara multitabelului"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, fuzzy, perl-format
+#| msgid "@%s not meaningful inside `@%s' block"
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s nu are sens în interiorul blocului `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, fuzzy, c-format, perl-format
+#| msgid "Must be in `@%s' environment to use `@%s'"
msgid "must be after `@%s' to use `@%s'"
msgstr "Trebuie sã fiþi în mediul `@%s' pentru a folosi `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s nu are sens în exteriorul mediilor `@titlepage' ºi `@quotation'"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, fuzzy, c-format, perl-format
+#| msgid "Footnotes inside footnotes are not allowed"
msgid "region %s inside region %s is not allowed"
msgstr "Nu sun permise note de subsol în note de subsol"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, fuzzy, c-format, perl-format
+#| msgid "@menu seen before first @node, creating `Top' node"
msgid "@%s seen before first @node"
msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"probabil cã nodul d-voastrã @top ar trebui împachetat în @ifnottex în loc de "
"@ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
#, fuzzy
+#| msgid "Expected `%s'"
msgid "unexpected @"
msgstr "Am aºteptat `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, fuzzy, c-format, perl-format
+#| msgid "@%s not meaningful outside `@float' environment"
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s nu are sens în exteriorul mediului `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image lipseºte fiºierul argument."
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing first argument"
msgstr "%s: lipseºte fiºierul argument.\n"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, fuzzy, c-format, perl-format
+#| msgid "Expected `%s'"
msgid "expected @end %s"
msgstr "Am aºteptat `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, fuzzy, c-format, perl-format
+#| msgid "arguments to @%s ignored"
msgid "remaining argument on @%s line: %s"
msgstr "argumentele pentru @%s ignorate"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "environment command %s as argument to @%s"
msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown source index in @%s: %s"
msgstr "Index necunoscut `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s' in @printindex"
msgid "unknown index `%s' in @printindex"
msgstr "Index necunoscut `%s' în @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, fuzzy, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, fuzzy, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, fuzzy, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
@@ -2947,8 +3162,10 @@ msgstr ""
msgid "@%s not empty"
msgstr ""
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, fuzzy, perl-format
+#| msgid ""
+#| "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"referinþa %s cãtre nodul inexistent `%s' (probabil secþionare incorectã?)"
@@ -2958,214 +3175,232 @@ msgstr ""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nod nereferit `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, fuzzy, perl-format
+#| msgid "unreferenced node `%s'"
msgid "%s reference to nonexistent `%s'"
msgstr "nod nereferit `%s'"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, fuzzy, perl-format
+#| msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Nodului `%s' îi lipseºte articolul pentru `%s' deºi îi este þinta Sus"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open %s: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not load %s: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open %s for writing: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "tex4ht.pm: could not open %s: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, fuzzy, perl-format
+#| msgid "error writing to `%s'"
msgid "error loading %s: %s\n"
msgstr "eroare la scrierea în `%s'"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s"
msgstr "acþiune necunoscutã `%s'"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s\n"
msgstr "acþiune necunoscutã `%s'"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
msgid "could not read init file %s"
msgstr "Nu am putut crea fiºier ieºire `%s'."
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, fuzzy, perl-format
+#| msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "%s: Ignor valoare nerecunoscutã TEXINFO_OUTPUT_FORMAT `%s'.\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
#, fuzzy
+#| msgid ""
+#| "Translate Texinfo source documentation to various other formats, by "
+#| "default\n"
+#| "Info files suitable for reading online with Emacs or standalone GNU "
+#| "Info.\n"
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3176,8 +3411,19 @@ msgstr ""
"Translateazã documentaþia sursã Texinfo în diferite alte formate, implicit\n"
"fiºiere Info potrivite pentru citit online cu Emacs sau GNU Info.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, fuzzy, perl-format
+#| msgid ""
+#| "General options:\n"
+#| " --error-limit=NUM quit after NUM errors (default %d).\n"
+#| " --force preserve output even if errors.\n"
+#| " --help display this help and exit.\n"
+#| " --no-validate suppress node cross-reference validation.\n"
+#| " --no-warn suppress warnings (but not errors).\n"
+#| " --reference-limit=NUM warn about at most NUM references (default "
+#| "%d).\n"
+#| " -v, --verbose explain what is being done.\n"
+#| " --version display version information and exit.\n"
msgid ""
"General options:\n"
" --document-language=STR locale to use in translating Texinfo keywords\n"
@@ -3206,8 +3452,14 @@ msgstr ""
" --version afiºeazã informaþii despre versiune ºi "
"terminã.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
+#| msgid ""
+#| "Output format selection (default is to produce Info):\n"
+#| " --docbook output Docbook XML rather than Info.\n"
+#| " --html output HTML rather than Info.\n"
+#| " --xml output Texinfo XML rather than Info.\n"
+#| " --plaintext output plain text rather than Info.\n"
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3223,8 +3475,23 @@ msgstr ""
" --xml ieºire Texinfo XML în loc de Info.\n"
" --plaintext ieºire text simplu în loc de Info.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
#, fuzzy
+#| msgid ""
+#| "General output options:\n"
+#| " -E, --macro-expand FILE output macro-expanded source to FILE.\n"
+#| " ignoring any @setfilename.\n"
+#| " --no-headers suppress node separators, Node: lines, and "
+#| "menus\n"
+#| " from Info output (thus producing plain "
+#| "text)\n"
+#| " or from HTML (thus producing shorter "
+#| "output);\n"
+#| " also, write to standard output by default.\n"
+#| " --no-split suppress splitting of Info or HTML output,\n"
+#| " generate only one output file.\n"
+#| " --number-sections output chapter and sectioning numbers.\n"
+#| " -o, --output=FILE output to FILE (directory if split HTML),\n"
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3264,8 +3531,26 @@ msgstr ""
" --number-sections scrie numere de capitole ºi secþiuni.\n"
" -o, --output=FIªIER scrie în FIªIER (director dacã multiple HTML),\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, fuzzy, perl-format
+#| msgid ""
+#| "Options for Info and plain text:\n"
+#| " --enable-encoding output accented and special characters in\n"
+#| " Info output based on @documentencoding.\n"
+#| " --fill-column=NUM break Info lines at NUM characters (default "
+#| "%d).\n"
+#| " --footnote-style=STYLE output footnotes in Info according to "
+#| "STYLE:\n"
+#| " `separate' to put them in their own "
+#| "node;\n"
+#| " `end' to put them at the end of the node\n"
+#| " in which they are defined (default).\n"
+#| " --paragraph-indent=VAL indent Info paragraphs by VAL spaces "
+#| "(default %d).\n"
+#| " If VAL is `none', do not indent; if VAL "
+#| "is\n"
+#| " `asis', preserve existing indentation.\n"
+#| " --split-size=NUM split Info files at size NUM (default %d).\n"
msgid ""
"Options for Info and plain text:\n"
" --disable-encoding do not output accented and special characters\n"
@@ -3304,7 +3589,7 @@ msgstr ""
" --split-size=NUM împarte fiºierele Info de dimens. NUM "
"(implicit %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3318,20 +3603,28 @@ msgid ""
" anchors; default is set only if split.\n"
msgstr ""
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
#, fuzzy
+#| msgid ""
+#| "Input file options:\n"
+#| " --commands-in-node-names allow @ commands in node names.\n"
+#| " -D VAR define the variable VAR, as with @set.\n"
+#| " -I DIR append DIR to the @include search path.\n"
+#| " -P DIR prepend DIR to the @include search path.\n"
+#| " -U VAR undefine the variable VAR, as with "
+#| "@clear.\n"
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3348,8 +3641,27 @@ msgstr ""
" -P DIR prepend DIR la calea de cãutare @include.\n"
" -U VAR nedefineºte variabila VAR, ca ºi @clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
#, fuzzy
+#| msgid ""
+#| "Conditional processing in input:\n"
+#| " --ifdocbook process @ifdocbook and @docbook even if\n"
+#| " not generating Docbook.\n"
+#| " --ifhtml process @ifhtml and @html even if not generating "
+#| "HTML.\n"
+#| " --ifinfo process @ifinfo even if not generating Info.\n"
+#| " --ifplaintext process @ifplaintext even if not generating plain "
+#| "text.\n"
+#| " --iftex process @iftex and @tex; implies --no-split.\n"
+#| " --ifxml process @ifxml and @xml.\n"
+#| " --no-ifdocbook do not process @ifdocbook and @docbook text.\n"
+#| " --no-ifhtml do not process @ifhtml and @html text.\n"
+#| " --no-ifinfo do not process @ifinfo text.\n"
+#| " --no-ifplaintext do not process @ifplaintext text.\n"
+#| " --no-iftex do not process @iftex and @tex text.\n"
+#| " --no-ifxml do not process @ifxml and @xml text.\n"
+#| "\n"
+#| " Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3388,8 +3700,14 @@ msgstr ""
" De asemenea, pentru opþiunile --no-ifFORMAT, proceseazã text "
"@ifnotFORMAT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
#, fuzzy
+#| msgid ""
+#| " The defaults for the @if... conditionals depend on the output format:\n"
+#| " if generating HTML, --ifhtml is on and the others are off;\n"
+#| " if generating Info, --ifinfo is on and the others are off;\n"
+#| " if generating plain text, --ifplaintext is on and the others are off;\n"
+#| " if generating XML, --ifxml is on and the others are off.\n"
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3405,8 +3723,24 @@ msgstr ""
" dacã generaþi text simplu, --ifplaintext este selectat iar restul sunt "
"deselectate;\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
#, fuzzy
+#| msgid ""
+#| "Examples:\n"
+#| " makeinfo foo.texi write Info to foo's @setfilename\n"
+#| " makeinfo --html foo.texi write HTML to @setfilename\n"
+#| " makeinfo --xml foo.texi write Texinfo XML to "
+#| "@setfilename\n"
+#| " makeinfo --docbook foo.texi write DocBook XML to "
+#| "@setfilename\n"
+#| " makeinfo --no-headers foo.texi write plain text to standard "
+#| "output\n"
+#| "\n"
+#| " makeinfo --html --no-headers foo.texi write html without node lines, "
+#| "menus\n"
+#| " makeinfo --number-sections foo.texi write Info with numbered "
+#| "sections\n"
+#| " makeinfo --no-split foo.texi write one Info file however big\n"
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3437,82 +3771,332 @@ msgstr ""
" makeinfo --no-split foo.texi scrie un singur fiºier Info "
"indiferent cât de mare\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "unknown tree transformation %s"
msgstr "acþiune necunoscutã `%s'"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: lipseºte fiºierul argument.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing macro expand file %s: %s\n"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open %s for writing: %s\n"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: nu am putut deschide --css-file: %s"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "No matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "Nici o potrivire %cend %s'"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced {"
+msgstr "%c nelalocul lui"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "`%c%s' fãrã pereche"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s necesitã un nume"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s necesitã un nume"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s necesitã un nume"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "Argument nepotrivit pentru @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "Argument nepotrivit pentru @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @printindex: %s"
+msgstr "Argument nepotrivit pentru @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @need: %s"
+msgstr "Argument nepotrivit pentru @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @headings: %s"
+msgstr "Argument nepotrivit pentru @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s necesitã un argument: formatatorul pentru %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "`%c%s' fãrã pereche"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @end: %s"
+msgstr "Argument nepotrivit pentru @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "@include: could not open %s:"
+msgstr "%s: nu am putut deschide --css-file: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s nu are sens în interiorul blocului `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s nu are sens în interiorul blocului `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s nu are sens în exteriorul mediilor `@titlepage' ºi `@quotation'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s necesitã un nume"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s aºteaptã `i' sau `j' ca argument, nu `%c'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "marcaj nedefinit: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete."
+msgstr "%c%s este depãsit"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s este depãsit"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s aºteaptã `i' sau `j' ca argument, nu `%c'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced }"
+msgstr "%c nelalocul lui"
+
#~ msgid "Insert this character"
#~ msgstr "Insereazã acest caracter"
@@ -3528,6 +4112,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "CAN'T SEE THIS"
#~ msgstr "NU POT VEDEA ACEASTA"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "* Menu: Nodes whose indices contain `%s':\n"
@@ -3535,6 +4120,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ "\n"
#~ "* Meniu: Noduri a cãror indexurile conþin `%s':\n"
+#, c-format
#~ msgid ""
#~ "There is NO warranty. You may redistribute this software\n"
#~ "under the terms of the GNU General Public License.\n"
@@ -3544,6 +4130,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ "termenilor Licenþei Publice Generale GNU (GNU GPL). Pentru informaþii\n"
#~ "suplimentare despre aceste chestiuni, vedeþi fiºierul numit COPYING.\n"
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
#~ "\n"
@@ -3719,21 +4306,27 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ "\\%-10[search-backward] Cautã înapoi un ºir specificat\n"
#~ " ºi selecteazã nodul în care acesta este gãsit.\n"
+#, c-format
#~ msgid " %-10s Quit this help.\n"
#~ msgstr " %-10s Terminã acest ajutor.\n"
+#, c-format
#~ msgid " %-10s Quit Info altogether.\n"
#~ msgstr " %-10s Terminã Info complet.\n"
+#, c-format
#~ msgid " %-10s Invoke the Info tutorial.\n"
#~ msgstr " %-10s Invocã tuturialul Info.\n"
+#, c-format
#~ msgid " %-10s Move to the `next' node of this node.\n"
#~ msgstr " %-10s Mergi la nodul `urmãtor' acestui nod.\n"
+#, c-format
#~ msgid " %-10s Move to the `previous' node of this node.\n"
#~ msgstr " %-10s Mergi la nodul `precedent' acestui nod.\n"
+#, c-format
#~ msgid " %-10s Move `up' from this node.\n"
#~ msgstr " %-10s Mergi în `sus' de la acest nod.\n"
@@ -3743,46 +4336,60 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ " Alegând un articol de meniu face ca alt nod sã fie "
#~ "selectat.\n"
+#, c-format
#~ msgid " %-10s Follow a cross reference. Reads name of reference.\n"
#~ msgstr ""
#~ " %-10s Urmeazã referinþã la acelaºi pasaj. Citeºte numele referinþei.\n"
+#, c-format
#~ msgid " %-10s Move to the last node seen in this window.\n"
#~ msgstr " %-10s Mergi la ultimul nod vãzut în aceastã fereastrã.\n"
+#, c-format
#~ msgid " %-10s Skip to next hypertext link within this node.\n"
#~ msgstr " %-10s Sari la urmãtoarea legãturã hypertext din acest nod.\n"
+#, c-format
#~ msgid " %-10s Follow the hypertext link under cursor.\n"
#~ msgstr " %-10s Sari la legãtura hypertext de sub cursor.\n"
+#, c-format
#~ msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"
#~ msgstr " %-10s Mergi la nodul `director'. Echivalent cu `g (DIR)'.\n"
+#, c-format
#~ msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n"
#~ msgstr " %-10s Mergi la nodul Vârf. Echivalent cu `g Top'.\n"
+#, c-format
#~ msgid " %-10s Scroll forward a page.\n"
#~ msgstr " %-10s Scroll înainte o paginã.\n"
+#, c-format
#~ msgid " %-10s Scroll backward a page.\n"
#~ msgstr " %-10s Scroll înapoi o paginã.\n"
+#, c-format
#~ msgid " %-10s Go to the beginning of this node.\n"
#~ msgstr " %-10s Mergi la începutul acestui nod.\n"
+#, c-format
#~ msgid " %-10s Go to the end of this node.\n"
#~ msgstr " %-10s Mergi la sfârºitul acestui nod.\n"
+#, c-format
#~ msgid " %-10s Scroll forward 1 line.\n"
#~ msgstr " %-10s Scroll înainte 1 linie.\n"
+#, c-format
#~ msgid " %-10s Scroll backward 1 line.\n"
#~ msgstr " %-10s Scroll înapoi 1 linie.\n"
+#, c-format
#~ msgid " %-10s Pick last item in node's menu.\n"
#~ msgstr " %-10s Alege ultimul articol în meniul nodului.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search for a specified string in the index entries of this Info\n"
#~ msgstr ""
@@ -3806,6 +4413,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ " and select the node in which the next occurrence is found.\n"
#~ msgstr " ºi selecteazã nodul în care acesta este gãsit.\n"
+#, c-format
#~ msgid " %-10s Search backward for a specified string\n"
#~ msgstr " %-10s Cautã înapoi un ºir specificat\n"
@@ -3813,12 +4421,15 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgstr ""
#~ "--- Folosiþi `\\[history-node]' sau `\\[kill-node]' pentru a termina ---\n"
+#, c-format
#~ msgid "ESC %s is undefined."
#~ msgstr "ESC %s nu este definit(ã)."
+#, c-format
#~ msgid "%s is defined to %s."
#~ msgstr "%s este definit(ã) ca %s."
+#, c-format
#~ msgid ""
#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
#~ "There is NO warranty. You may redistribute this software\n"
@@ -3833,12 +4444,14 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "incorrect number of arguments"
#~ msgstr "numãr incorect de argumente"
+#, c-format
#~ msgid "cannot create output file `%s'"
#~ msgstr "nu pot crea fiºierul de ieºire `%s'"
#~ msgid "section too long"
#~ msgstr "secþiune prea lungã"
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INPUT-FILE]\n"
#~ "\n"
@@ -3863,32 +4476,39 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ " --help\t\tafiºeazã acest ajutor ºi terminã.\n"
#~ " --version\t\tafiºeazã informaþii versiune ºi terminã.\n"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too small"
#~ msgstr "Ignorãm fiºier infokey incorect `%s' - prea mic"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too big"
#~ msgstr "Ignorãm fiºier infokey incorect `%s' - prea mare"
+#, c-format
#~ msgid "Error reading infokey file `%s' - short read"
#~ msgstr "Eroare la citirea fiºierului infokey `%s' - citit scurt"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
#~ msgstr ""
#~ "Fiºier infokey incorect `%s' (bad magic numbers) -- rulaþi infokey pentru "
#~ "a-l actualiza"
+#, c-format
#~ msgid "Your infokey file `%s' is out of date -- run infokey to update it"
#~ msgstr ""
#~ "Fiºierul d-voastrã infokey `%s' este vechi - rulaþi infokey pentru a-l "
#~ "actualiza"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
#~ msgstr ""
#~ "Fiºier infokey incorect `%s' (bad section length) -- rulaþi infokey "
#~ "pentru a-l actualiza"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
#~ msgstr ""
@@ -3903,6 +4523,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgstr ""
#~ "Date incorecte în fiºierul infokey -- unele setãri de variabile ignorate"
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "Comandã nedefinitã: %s"
@@ -3918,6 +4539,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "Selecting Next node..."
#~ msgstr "Selectare nod Urmãtor..."
+#, c-format
#~ msgid "Moving Up %d time(s), then Next."
#~ msgstr "Merg în Sus %d ori, apoi Urmãtor."
@@ -3933,9 +4555,11 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "Moving to `Prev's last menu item."
#~ msgstr "Merg la ultimul articol din meniul `Prec'"
+#, c-format
#~ msgid "Kill node (%s): "
#~ msgstr "Distruge nodul (%s): "
+#, c-format
#~ msgid "Cannot kill node `%s'"
#~ msgstr "Nu pot distruge nodul `%s'"
@@ -3954,27 +4578,34 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "Internally used by \\[universal-argument]"
#~ msgstr "Folosit intern de \\[argument-universal]"
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: Nu mai am memorie virtualã!\n"
#~ msgid "--*** Tags out of Date ***"
#~ msgstr "--*** Tag-uri Vechi ***"
+#, c-format
#~ msgid "-%s---Info: %s, %d lines --%s--"
#~ msgstr "-%s---Info: %s, %d linii --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
#~ msgstr "-%s%s-Info: (%s)%s, %d linii --%s--"
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr " Subfiºier: %s"
+#, c-format
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: opþiune ilegalã -- %c\n"
+#, c-format
#~ msgid "%s: option `-W %s' is ambiguous\n"
#~ msgstr "%s: opþiunea `-W %s' este ambiguã\n"
+#, c-format
#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
#~ msgstr "%s: opþiunea `-W %s' nu permite un argument\n"
@@ -4017,18 +4648,22 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "@sc argument all uppercase, thus no effect"
#~ msgstr "argumentul @sc în litere mari, prin urmare fãrã efect"
+#, c-format
#~ msgid "`{' expected, but saw `%c'"
#~ msgstr "`{' aºteptat, dar am vãzut `%c'"
#~ msgid "end of file inside verb block"
#~ msgstr "sfârºit de fiºier în interiorul blocului de verb"
+#, c-format
#~ msgid "`}' expected, but saw `%c'"
#~ msgstr "`}' aºteptat, dar am vãzut `%c'"
+#, c-format
#~ msgid "@sp requires a positive numeric argument, not `%s'"
#~ msgstr "@sp necesitã un argument numeric pozitiv, nu `%s'"
+#, c-format
#~ msgid "Bad argument to %c%s"
#~ msgstr "Argument nepotrivit pentru %c%s"
@@ -4071,21 +4706,26 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "on"
#~ msgstr "pe"
+#, c-format
#~ msgid "%s: getwd: %s, %s\n"
#~ msgstr "%s: getwd: %s, %s\n"
+#, c-format
#~ msgid "`%s' omitted before output filename"
#~ msgstr "`%s' omis înainte de numele fiºierului de ieºire"
+#, c-format
#~ msgid "`%s' omitted since writing to stdout"
#~ msgstr "`%s' omis întrucât scriu la ieºirea standard (stdout)"
#~ msgid "Output buffer not empty."
#~ msgstr "Buffer-ul de ieºire nu este gol."
+#, c-format
#~ msgid "`%c%s' needs an argument `{...}', not just `%s'"
#~ msgstr "`%c%s' necesitã un argument `{...}', nu numai `%s'"
+#, c-format
#~ msgid "No closing brace for footnote `%s'"
#~ msgstr "Nici o parantezã de închidere pentru nota de subsol `%s'"
@@ -4101,21 +4741,26 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "[unexpected] no html tag to pop"
#~ msgstr "[neaºteptat] nici un tag html de ridicat"
+#, c-format
#~ msgid "[unexpected] invalid node name: `%s'"
#~ msgstr "[neaºteptat] nume de nod invalid: `%s'"
+#, c-format
#~ msgid "Info cannot handle `:' in index entry `%s'"
#~ msgstr "Info nu poate folosi `:' în intrarea de index `%s'"
+#, c-format
#~ msgid "Index `%s' already exists"
#~ msgstr "Indez-ul `%s' existã deja"
+#, c-format
#~ msgid "Unknown index `%s' and/or `%s' in @synindex"
#~ msgstr "Index-ul necunoscut `%s' ºi/sau `%s' în @synindex"
#~ msgid "(line )"
#~ msgstr "(linie )"
+#, c-format
#~ msgid "(line %*d)"
#~ msgstr "(linia %*d)"
@@ -4131,12 +4776,15 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "Enumeration stack overflow"
#~ msgstr "Stivã de enumerare inundatã (overflow)"
+#, c-format
#~ msgid "lettering overflow, restarting at %c"
#~ msgstr "inundate (overflow) la tipãrire, reîncep la %c"
+#, c-format
#~ msgid "%cfloat environments cannot be nested"
#~ msgstr "mediile %cfloat nu pot fi încuibãrite"
+#, c-format
#~ msgid "%s requires letter or digit"
#~ msgstr "%s necesitã litere sau cifre"
@@ -4146,36 +4794,46 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "@detailmenu seen before first node, creating `Top' node"
#~ msgstr "@detailmenu vãzut înainte de primul nod, creez nodul `Vârf'"
+#, c-format
#~ msgid "`%c%s' needs something after it"
#~ msgstr "`%c%s' necesitã ceva dupã el"
+#, c-format
#~ msgid "Bad argument `%s' to `@%s', using `%s'"
#~ msgstr "Argument greºit `%s' pentru `@%s', folosesc `%s'"
+#, c-format
#~ msgid "@itemx not meaningful inside `%s' block"
#~ msgstr "@itemx nu are sens în interiorul blocului `%s'"
+#, c-format
#~ msgid "%c%s found outside of an insertion block"
#~ msgstr "%c%s gãsit în afara unui bloc de inserare"
+#, c-format
#~ msgid "sorry, encoding `%s' not supported"
#~ msgstr "ne pare rãu, codarea `%s' nu este suportatã"
+#, c-format
#~ msgid "%c%s expects a single character `i' or `j' as argument"
#~ msgstr "%c%s aºteaptã un singur caracter `i' sau `j' ca argument"
+#, c-format
#~ msgid "%cend macro not found"
#~ msgstr "%cend macro nu a fost gãsit"
#~ msgid "@quote-arg only useful for single-argument macros"
#~ msgstr "@quote-arg folositor numai pentru macro-uri cu un singur argument"
+#, c-format
#~ msgid "mismatched @end %s with @%s"
#~ msgstr "nepotrivire @end %s cu @%s"
+#, c-format
#~ msgid "Too many errors! Gave up.\n"
#~ msgstr "Prea multe erori! Am renunþat.\n"
+#, c-format
#~ msgid "%s:%d: warning: "
#~ msgstr "%s:%d: avertisment: "
@@ -4188,6 +4846,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ " --css-include=FIªIER include FIªIER în HTML <stil> ieºire;\n"
#~ " citeºte stdin dacã FIªIER este -.\n"
+#, c-format
#~ msgid ""
#~ "Options for XML and Docbook:\n"
#~ " --output-indent=VAL indent XML elements by VAL spaces "
@@ -4201,23 +4860,29 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ " dacã VAL e 0, spaþiile goale ce pot fi "
#~ "ignorate nu sunt afiºate.\n"
+#, c-format
#~ msgid "%s: could not open macro expansion output `%s'"
#~ msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'"
+#, c-format
#~ msgid "%s: ignoring second macro expansion output `%s'.\n"
#~ msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'.\n"
+#, c-format
#~ msgid "Multiline command %c%s used improperly"
#~ msgstr "Comandã pe multiple linii %c%s folositã incorect"
+#, c-format
#~ msgid "No `%s' found in `%s'"
#~ msgstr "Nici un `%s' nu a fost gãsit în `%s'"
+#, c-format
#~ msgid ""
#~ "%s: Skipping macro expansion to stdout as Info output is going there.\n"
#~ msgstr ""
#~ "%s: Omite expasiunea macro la ieºire întrucât ieºirea Info merge acolo.\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing macro output file `%s' due to errors; use --force to "
#~ "preserve.\n"
@@ -4225,6 +4890,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ "%s: ªterg fiºierul de ieºire macro `%s' din cauza erorilor; folosiþi --"
#~ "force pentru a-l pãstra.\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
#~ msgstr ""
@@ -4234,45 +4900,58 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "NO_NAME!"
#~ msgstr "NICI_UN_NUME!"
+#, c-format
#~ msgid "No such file `%s'"
#~ msgstr "Nici un fiºier `%s'"
+#, c-format
#~ msgid "@image file `%s' (for text) unreadable: %s"
#~ msgstr "Fiºierul @image `%s' (pentru text) nu poate fi citit: %s"
+#, c-format
#~ msgid "{No value for `%s'}"
#~ msgstr "{Nici o valoare pentru `%s'}"
+#, c-format
#~ msgid "Reached eof before matching @end %s"
#~ msgstr "Am ajuns la eof înainte de a potrivi @end %s"
+#, c-format
#~ msgid "`%.40s...' is too long for expansion; not expanded"
#~ msgstr "`%.40s...' este prea lung pentru expansiune; nu a fost expandat"
#~ msgid "Missing } in @multitable template"
#~ msgstr "} lipsã în ºablonul @multitable"
+#, c-format
#~ msgid "ignoring stray text `%s' after @multitable"
#~ msgstr "ignor text aiurea `%s' dupã @multitable"
+#, c-format
#~ msgid "[unexpected] cannot select column #%d in multitable"
#~ msgstr "[neaºteptat] nu pot selecta coloana #%d în multitabel"
+#, c-format
#~ msgid "** Multicolumn output from last row:\n"
#~ msgstr "** Ieºirea multitabel din ultimul rând:\n"
+#, c-format
#~ msgid "* column #%d: output = %s\n"
#~ msgstr "* coloana #%d: ieºire = %s\n"
+#, c-format
#~ msgid "Node `%s' previously defined at line %d"
#~ msgstr "Nodul `%s' definit anterior la linia %d"
+#, c-format
#~ msgid "Formatting node %s...\n"
#~ msgstr "Formatez nodul %s...\n"
+#, c-format
#~ msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
#~ msgstr "Nodul `%s' cere o comandã de secþionare (ex., %c%s)"
+#, c-format
#~ msgid "Anchor `%s' and node `%s' map to the same file name"
#~ msgstr "Ancoraj `%s' ºi nodul `%s' aratã cãtre acelaºi nume de fiºier"
@@ -4283,6 +4962,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "Rename this anchor or use the `--no-split' option"
#~ msgstr "Redenumeºte acest ancoraj sau foloseºte opþiunea `--no-split'"
+#, c-format
#~ msgid "Unexpected string at end of split-HTML file `%s'"
#~ msgstr "ªir neaºteptat la sfârºitul fiºierului HTML spart `%s'"
@@ -4295,6 +4975,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "Up:"
#~ msgstr "Sus:"
+#, c-format
#~ msgid "Anchors `%s' and `%s' map to the same file name"
#~ msgstr "Ancoraj `%s' ºi `%s' aratã cãtre acelaºi nume de fiºier"
@@ -4307,54 +4988,68 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "Cross"
#~ msgstr "Traverseazã"
+#, c-format
#~ msgid ""
#~ "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
#~ msgstr ""
#~ "Urmãtorul câmp de nod `%s' nu este referit (probabil secþionare "
#~ "incorectã?)"
+#, c-format
#~ msgid "This node (%s) has the bad Prev"
#~ msgstr "Acest nod (%s) are un Prec incorect"
#~ msgid "Prev"
#~ msgstr "Prec"
+#, c-format
#~ msgid "Prev field of node `%s' not pointed to"
#~ msgstr "Câmpul Prec al nodului `%s' nu este referit"
+#, c-format
#~ msgid "This node (%s) has the bad Next"
#~ msgstr "Acest nod (%s) are referinþa Urmãtor incorectã"
+#, c-format
#~ msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
#~ msgstr "`%s' nu are nici un câmp Sus (probabil secþionare incorectã?)"
#~ msgid "Up"
#~ msgstr "Sus"
+#, c-format
#~ msgid "node `%s' has been referenced %d times"
#~ msgstr "nodul `%s' a fost referit de %d ori"
+#, c-format
#~ msgid "Can't remove file `%s': %s"
#~ msgstr "Nu pot ºterge fisierul `%s': %s"
+#, c-format
#~ msgid "Appendix %c"
#~ msgstr "Anexã %c"
+#, c-format
#~ msgid "Internal error (search_sectioning) `%s'!"
#~ msgstr "Eroare internã (search_sectioning) `%s'!"
+#, c-format
#~ msgid "Internal error (search_sectioning) \"%s\"!"
#~ msgstr "Eroare internã (search_sectioning) \"%s\"!"
+#, c-format
#~ msgid "%c%s is obsolete; use %c%s instead"
#~ msgstr "%c%s este depãºitã; foloseºte %c%s în schimb"
+#, c-format
#~ msgid "Node with %ctop as a section already exists"
#~ msgstr "Nodul cu %ctop ca ºi secþiune existã deja"
+#, c-format
#~ msgid "Here is the %ctop node"
#~ msgstr "Aici este nodul %ctop"
+#, c-format
#~ msgid "%ctop used before %cnode, defaulting to %s"
#~ msgstr "%ctop folosit înaintea lui %cnode, implicit cãtre %s"
@@ -4371,9 +5066,11 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ "@headitem ca ultimul articol din @multitable produce documenteDocbook "
#~ "invalide"
+#, c-format
#~ msgid "%s: warning: "
#~ msgstr "%s: avertisment: "
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
#~ "\n"
@@ -4450,6 +5147,7 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ " determinate din informaþiile din fiºierul Info.\n"
#~ " --version afiºeazã informaþii depre versiune ºi terminã.\n"
+#, c-format
#~ msgid "menu item `%s' already exists, for file `%s'"
#~ msgstr "articol meniu `%s' existã deja, pentru fiºier `%s'"
@@ -4465,18 +5163,22 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ msgid "send output to FILE"
#~ msgstr "trimite ieºire în FIªIER"
+#, c-format
#~ msgid "Usage: %s [OPTION]... FILE...\n"
#~ msgstr "Folosire: %s [OPÞIUNI]... FIªIER...\n"
+#, c-format
#~ msgid "Generate a sorted index for each TeX output FILE.\n"
#~ msgstr "Genereazã un index sortat pentru fiecare FIªIER de ieºire TeX.\n"
+#, c-format
#~ msgid ""
#~ "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
#~ msgstr ""
#~ "De obicei FIªIER... este specificat ca `foo.%c%c' pentru un document 'foo."
#~ "texi'.\n"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "Options:\n"
@@ -4484,14 +5186,18 @@ msgstr "%s: nu am putut deschide --css-file: %s"
#~ "\n"
#~ "Opþiuni:\n"
+#, c-format
#~ msgid "%s: not a texinfo index file"
#~ msgstr "%s: nu este un fiºier index texinfo"
+#, c-format
#~ msgid "failure reopening %s"
#~ msgstr "am eºuat sã redeschid %s"
+#, c-format
#~ msgid "No page number in %s"
#~ msgstr "Nici un numãr de paginã în %s"
+#, c-format
#~ msgid "entry %s follows an entry with a secondary name"
#~ msgstr "intrarea %s urmeazã o intrare cu nume secundar"
diff --git a/macros/texinfo/texinfo/po/ru.gmo b/macros/texinfo/texinfo/po/ru.gmo
index 7e91c72509..6a52831f9d 100644
--- a/macros/texinfo/texinfo/po/ru.gmo
+++ b/macros/texinfo/texinfo/po/ru.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/ru.po b/macros/texinfo/texinfo/po/ru.po
index 2b80e4d1d4..8ea742db33 100644
--- a/macros/texinfo/texinfo/po/ru.po
+++ b/macros/texinfo/texinfo/po/ru.po
@@ -7,10 +7,10 @@
# Yuri Kozlov <yuray@komyakino.ru>, 2013, 2015, 2016, 2017, 2019.
msgid ""
msgstr ""
-"Project-Id-Version: texinfo 6.5.93\n"
+"Project-Id-Version: texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-13 18:53+0300\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-09-09 19:58+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@d07.ru>\n"
"Language: ru\n"
@@ -246,7 +246,6 @@ msgid "Insert completion"
msgstr "Ð’Ñтавить завершение"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "СоÑтавление завершений…"
@@ -270,7 +269,6 @@ msgid "found file %s"
msgstr "файл %s найден"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "СноÑки не могут быть показаны"
@@ -283,7 +281,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- СноÑки ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "ПоиÑк в алфавитном указателе…"
@@ -292,7 +289,6 @@ msgid "Look up a string in the index for this file"
msgstr "Ðайти Ñтроку в алфавитном указателе Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ файла"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Ðе найден алфавитный указатель"
@@ -301,7 +297,6 @@ msgid "Index entry: "
msgstr "Пункт в алфавитном указателе: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Ðе найден алфавитный указатель."
@@ -319,7 +314,6 @@ msgstr ""
"поÑледней команде «\\[index-search]»"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Строка поиÑка в алфавитном указателе не была раньше задана"
@@ -385,7 +379,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Ðи один из info-файлов не Ñодержит «%s» в алфавитных указателÑÑ…"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Ошибка при преобразовании кодировки Ñимволов файла"
@@ -400,7 +393,6 @@ msgid "Cannot find node '%s'"
msgstr "Ðевозможно найти ноду «%s»"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Ðе задано Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
@@ -429,7 +421,7 @@ msgstr "значение %s недопуÑтимо Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ %
msgid "Try --help for more information.\n"
msgstr "Попробуйте --help Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ подробного опиÑаниÑ.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -565,7 +557,7 @@ msgstr ""
" Ñохранить руководÑтво в out.txt\n"
" info -f ./foo.info показать файл ./foo.info, не иÑкать каталог"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -871,17 +863,14 @@ msgid "could not open init file %s"
msgstr "невозможно открыть файл инициализации %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð½Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ Ñлишком длиннаÑ"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "пропущена ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ð½Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "знак NUL (\\000) недопуÑтим"
@@ -891,12 +880,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "знак NUL (^%c) недопуÑтим"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "пропущено Ð¸Ð¼Ñ Ð´ÐµÐ¹ÑтвиÑ"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "невозможно привÑзать клавиатурную поÑледовательноÑÑ‚ÑŒ к цифровому меню"
@@ -906,7 +893,6 @@ msgid "unknown action `%s'"
msgstr "неизвеÑтное дейÑтвие «%s»"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "Ð¸Ð¼Ñ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ñлишком длинное"
@@ -916,22 +902,18 @@ msgid "extra characters following action `%s'"
msgstr "лишние Ñимволы поÑле дейÑÑ‚Ð²Ð¸Ñ Â«%s»"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "пропущено Ð¸Ð¼Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "пропущен знак «=» Ñразу поÑле имени переменной"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "Ð¸Ð¼Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ Ñлишком длинное"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "значение Ñлишком длинное"
@@ -953,7 +935,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Считать Ð¸Ð¼Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ в Ñхо-облаÑти и иÑполнить её"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "ЗдеÑÑŒ Ð½ÐµÐ»ÑŒÐ·Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ команду «echo-area»"
@@ -1036,7 +1017,6 @@ msgid "Show all matching files"
msgstr "Показать вÑе подходÑщие файлы"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Ðе найден файл указателÑ"
@@ -1346,7 +1326,6 @@ msgid "Select the most recently selected node"
msgstr "Перейти к поÑледней выбранной ноде"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Ð’ иÑтории нет более ранней ноды"
@@ -1407,12 +1386,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Переключить иÑпользование регулÑрных выражений в поиÑке"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "ИÑпользование регулÑрных выражений при поиÑке"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "ИÑпользование обычных Ñтрок при поиÑке"
@@ -1429,8 +1406,7 @@ msgstr "ПоиÑк продолжитÑÑ Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° документа"
msgid "Searching subfile %s ..."
msgstr "ПоиÑк подфайла %s…"
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Ðе найдено"
@@ -1464,140 +1440,138 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Слишком ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ°Ñ Ñтрока поиÑка"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Переходим обратно к поÑледнему Ñовпадению из %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Больше нет Ñовпадений"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "ИÑкать Ñтроку в Ñтой ноде и поднодах"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "ПоиÑк в %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Перейти к Ñледующему Ñовпадению в поддереве Info"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Ðет активного поиÑка"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Перейти к предыдущему Ñовпадению в поддереве Info"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Считать Ñтроку и запуÑтить региÑтрозавиÑимый поиÑк"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Считать Ñтроку и запуÑтить поиÑк"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Считать Ñтроку и запуÑтить поиÑк в обратном направлении"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Повторить поÑледний поиÑк в том же направлении"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Ðет Ñтроки предыдущего поиÑка"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Повторить поÑледний поиÑк в обратном направлении"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "ОчиÑтить показанные ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð¸Ñка"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "ЗапуÑтить интерактивный поиÑк по мере ввода Ñтроки"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Ðаращиваемый обратный поиÑк по регулÑрному выражению: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Ðаращиваемый обратный поиÑк: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Ðаращиваемый поиÑк по регулÑрному выражению: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Ðаращиваемый поиÑк: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Ðе найдено "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Отменить выполнение текущей команды"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Выход"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Показать верÑию запущенной Info"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info, верÑÐ¸Ñ %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "ПерериÑовать Ñкран"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Выйти из Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "ЗапуÑтить команду, привÑзанную к Ñтой клавише в нижнем региÑтре"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° «%s»"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "«%s» неверно"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Добавить цифру к текущему чиÑловому аргументу"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Ðачать (или умножить на 4) текущий чиÑловой аргумент"
@@ -1950,12 +1924,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: невозможно прочитать (%s) и Ñоздать (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY без ÑоответÑтвующего END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY без ÑоответÑтвующего START-INFO-DIR-ENTRY"
@@ -1985,14 +1957,12 @@ msgid "excess command line argument `%s'"
msgstr "лишний аргумент командной Ñтроки «%s»"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Ðе задан входной файл; попробуйте --help Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ подробного "
"опиÑаниÑ."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Ðе задан файл каталога; попробуйте --help Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ подробного "
@@ -2013,25 +1983,25 @@ msgstr "в «%s» нет Ñлемента info dir"
msgid "no entries found for `%s'; nothing deleted"
msgstr "не найдены Ñлементы Ð´Ð»Ñ Â«%s»; ничего не удалено"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "невозможно открыть %s на запиÑÑŒ: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"перемеÑтите команду @contents, еÑли хотите видеть Ñодержимое поÑле титульной "
"Ñтраницы"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2039,281 +2009,238 @@ msgstr ""
"перемеÑтите команды @shortcontents и @contents, еÑли хотите видеть "
"Ñодержимое поÑле титульной Ñтраницы"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым кодом Ñзыка"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым кодом облаÑти"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимой возможноÑтью разделениÑ"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "невозможно прочитать %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "ошибка при закрытии файла @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: невозможно найти %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "отÑутÑтвует нода Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "ноды без нового имени в конце файла"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "невозможно открыть %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "иÑпользование файла перемеименованных нод («%s») не допуÑкаетÑÑ"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "невозможно защитить Ñ…Ñш-Ñимвол в @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "пуÑтое Ð¸Ð¼Ñ Ð½Ð¾Ð´Ñ‹ поÑле раÑÐºÑ€Ñ‹Ñ‚Ð¸Ñ Â«%s»"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s «%s» было определено раньше"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "меÑто предыдущего Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "пуÑтой аргумент в @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: вывод неÑовмеÑтим Ñ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸ÐµÐ¼"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "ошибка при закрытии %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "невозможно Ñоздать каталог «%s» или «%s»: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "невозможно Ñоздать каталог «%s»: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "файл @image «%s» не найден, иÑпользуетÑÑ Â«%s»"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "не задан аргумент Ð´Ð»Ñ @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "файл @image «%s» (Ð´Ð»Ñ HTML) не найден, иÑпользуетÑÑ Â«%s»"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "неÑтруктурированный формат %s не преобразован"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "невозможно открыть файл наÑтроек ÑÑылок html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "отÑутÑтвует тип"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "нераÑпознанный тип: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "ошибка при закрытии файла наÑтроек ÑÑылок html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "Ð½ÐµÐ·Ð°ÐºÑ€Ñ‹Ñ‚Ð°Ñ Ñтрока в файле css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include обрываетÑÑ Ð² комментарии"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import не завершена в файле css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "Файл CSS %s не найден"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "невозможно открыть --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "ошибка при закрытии файла CSS %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "Ñлемент htmlxref.cnf не найден в «%s»"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "ошибка при закрытии файла frame %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "ошибка при закрытии файла TOC frame %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "ошибка обработчика %s на Ñтадии %s Ñ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼ %s"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "должен быть задан заголовок командой заголовка или @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "ошибка при закрытии файла ноды Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "Ñтарое Ð¸Ð¼Ñ Â«%s» — Ñто нода документа"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "файл пуÑÑ‚ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐµÐ¼Ð¾Ð¹ ноды «%s»"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "нода Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ (новое Ð¸Ð¼Ñ Ð´Ð»Ñ Â«%s») отÑутÑтвует в документе: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "ошибка при закрытии файла переименуемой ноды Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "пуÑтое Ð¸Ð¼Ñ Ð½Ð¾Ð´Ñ‹"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "ÑинтакÑÐ¸Ñ Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ ноды иÑпользуетÑÑ Ð´Ð»Ñ Â«%s»"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "документ без нод"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "документ без ноды Top"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "ошибка Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ %s: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "вывод @%s более одного раза: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s вне какой-либо ноды"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "Ð¸Ð¼Ñ @node не должно Ñодержать «,»: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Пункт в алфавитном указателе @%s Ñ : Ñоздаёт некорректный Info: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "Ñлементе Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Â«%s» вне какой-либо ноды"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "ошибка при закрытии файла текÑта Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "невозможно прочитать файл @image «%s»: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "невозможно найти файл @image «%s.txt» или альтернативный текÑÑ‚"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2321,300 +2248,324 @@ msgstr ""
"@strong{Note…} Ñоздаёт в Info ложную перекреÑтную ÑÑылку; перефразируйте "
"текÑÑ‚, чтобы избежать Ñтого"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "Ð¸Ð¼Ñ Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñтной ÑÑылки @%s не Ñодержит «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "Ð¸Ð¼Ñ Ð½Ð¾Ð´Ñ‹ @%s не должно Ñодержать «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "Ð¸Ð¼Ñ Ð½Ð¾Ð´Ñ‹ @%s не должно Ñодержать «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "поÑле «.» или «,» должен Ñледовать @xref, а не %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "поÑле «.» или «,» должен Ñледовать @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "Ð¸Ð¼Ñ Ð½Ð¾Ð´Ñ‹ Ñлемента меню не должно Ñодержать «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "Ð¸Ð¼Ñ Ð½Ð¾Ð´Ñ‹ Ñлемента меню не должно Ñодержать «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "Ð¸Ð¼Ñ Ñлемента меню не должно Ñодержать «:»"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "невозможно открыть %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "неÑколько @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "неверный или пуÑтой формальный аргумент @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "неверный ÑинтакÑÐ¸Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð° @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "команде %c%s нужно указать имÑ"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "некорректное Ð¸Ð¼Ñ Ð´Ð»Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s перед закрывающей Ñкобкой @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s перед закрывающей Ñкобкой @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s пропущена Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ Ñкобка"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s отÑутÑтвует Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾ÑледовательноÑÑ‚ÑŒ: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx не должен начинатьÑÑ Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx должен Ñледовать за @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s Ñодержит текÑÑ‚, но не @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "ожидалоÑÑŒ «@end» Ñ Â«%s», вÑтречено «%s»"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s перед @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "нет парной «%cend %s»"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "здеÑÑŒ не должно быть %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "Ð½ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ Â«%c%s»"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ Â«%s» вызван Ñ Ð¸Ð·Ð»Ð¸ÑˆÐ½Ð¸Ð¼Ð¸ аргументами"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s пропущена Ð·Ð°ÐºÑ€Ñ‹Ð²Ð°ÑŽÑ‰Ð°Ñ Ñкобка"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ Â«%s», объÑвленный без аргумента, вызван Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð¼"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ в раÑкрытии @%s Ñледует «%s», а не Ð¸Ð¼Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° или \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "пропущено Ð¸Ð¼Ñ Ð´Ð»Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "пропущена ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "неожиданный аргумент на Ñтроке @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "пуÑÑ‚Ð°Ñ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð°"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "лишний аргумент Ð´Ð»Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "некорректный аргумент Ð´Ð»Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s должна иÑпользоватьÑÑ c аргументом: форматом Ð´Ð»Ñ %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"команды @%s, не принимающей аргументов в Ñкобках, не должно быть в Ñтроке @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° «@%s» недопуÑтима как аргумент @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s пропущен аргумент"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "неизвеÑтный @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "лишний аргумент Ð´Ð»Ñ @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "неверный аргумент Ð´Ð»Ñ @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: невозможно открыть %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "кодировка «%s» не ÑвлÑетÑÑ ÐºÐ°Ð½Ð¾Ð½Ð¸Ñ‡Ð½Ð¾Ð¹ кодировкой texinfo"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸ «%s» не раÑпознано"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s поÑле первого Ñлемента"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s имеет ÑмыÑл только в Ñтроке @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part не должен быть ÑвÑзан Ñ @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node Ñтоит до @%s, но чаÑти не могут быть ÑвÑзаны Ñ Ð½Ð¾Ð´Ð°Ð¼Ð¸"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "ÑинтакÑÐ¸Ñ Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ ноды иÑпользуетÑÑ Ð´Ð»Ñ Â«%s»"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "пуÑтое Ð¸Ð¼Ñ Ñлемента меню в «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "пуÑтое Ð¸Ð¼Ñ Ð½Ð¾Ð´Ñ‹ в Ñлементе меню"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s не должен поÑвлÑÑ‚ÑŒÑÑ Ð² @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s должен поÑвлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в начале Ñтроки"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ Â«%s» был определён раньше"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "меÑто предыдущего Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Â«%s»"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "переопределение команды Ñзыка Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s без ÑоответÑтвующего Ñимвола"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s определён Ñ Ð½ÑƒÐ»Ñ‘Ð¼ или более чем одним аргументом, должен вызыватьÑÑ Ñ {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2622,347 +2573,360 @@ msgstr ""
"вызов макроÑа вложен Ñлишком глубоко (можно изменить через "
"MAX_NESTED_MACROS; текущее значение: %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"рекурÑивный вызов макроÑа %s не допуÑкаетÑÑ; еÑли нужно, иÑпользуйте @rmacro"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "поÑле выделенной команды «@%s» не должно быть пробельного Ñимвола"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr ""
"иÑпользуйте фигурные Ñкобки, чтобы передать @%s команду в качеÑтве аргумента"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s ожидает в качеÑтве аргумента «i» или «j», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "поÑле выделенной команды «@%s» не должно быть новой Ñтроки"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s подразумевает фигурные Ñкобки"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "неизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° «%s»"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "неопределенный флаг: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "неверный ÑинтакÑÐ¸Ñ @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "Команда %c%s уÑтарела."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "Команда %c%s уÑтарела; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s должен поÑвлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в начале Ñтроки"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s должен поÑвлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в заголовке или нижнем колонтитуле"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s не имеет ÑмыÑла внутри блока «@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s в пуÑтой мультитаблице"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab перед @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "Ñлишком много Ñтолбцов в мультитабличном Ñлементе (макÑимум %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "@tab вне мультитаблицы игнорирован"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s вне таблицы или ÑпиÑка"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s не допуÑкаетÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ блока «@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s должен поÑвлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в пункте алфавитного указателÑ"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "допуÑкаетÑÑ Ð½Ðµ более двух уровней вложенноÑти индекÑных подÑлементов"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "должно быть поÑле «@%s», чтобы иÑпользовать «@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s не имеет ÑмыÑла вне Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Â«@titlepage» или «@quotation»"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory поÑле первой ноды"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "не допуÑкаетÑÑ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ðµ облаÑти %s внутри облаÑти %s"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry поÑле первой ноды"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu в неверном контекÑте"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s вÑтречено перед первой @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "вероÑтно, ваша нода @top должна быть в @ifnottex, а не в @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s должен поÑвлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в пункте алфавитного указателÑ"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s должен поÑвлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в Ñовпадающем контекÑте"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "неожиданный Ñимвол @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s не имеет ÑмыÑла вне Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Â«@float»"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s должен быть Ñразу поÑле «@float»"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "игнорируетÑÑ Ð¼Ð½Ð¾Ð³Ð¾ÐºÑ€Ð°Ñ‚Ð½Ñ‹Ð¹ @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "команда @%s не допуÑкает аргументов"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "у команда @%s отÑутÑтвует нода или внешний указанный вручную аргумент"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "в @%s указана пуÑтое Ð¸Ð¼Ñ Ð¿ÐµÑ€ÐµÐºÑ€Ñ‘Ñтной ÑÑылки поÑле раÑкрытого «%s»"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
"в @%s указан пуÑтой заголовок перекрёÑтной ÑÑылки поÑле раÑкрытого «%s»"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "поÑле @image пропущен аргумент, задающий файл"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "у @%s пропущен первый аргумент"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "найдены не шеÑтнадцатеричные цифры в аргументе Ð´Ð»Ñ @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
"количеÑтво шеÑтнадцатеричных цифр в аргументе больше четырёх Ð´Ð»Ñ @U : %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "аргумент @U превышает макÑимальное значение 0x10FFFF Юникода: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "лишние аргументы у ноды"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "ожидалÑÑ @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s должна принимать только @-команду в качеÑтве аргумента, а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "оÑтавшийÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ в Ñтроке @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "команда Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ %s в качеÑтве аргумента Ð´Ð»Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "пуÑÑ‚Ð°Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "чаÑÑ‚ÑŒ Ñтолбца не ÑвлÑетÑÑ Ñ‡Ð¸Ñлом: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp аргумент должен быть чиÑловым, а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "зарезервированное Ð¸Ð¼Ñ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ð¾Ð³Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "неизвеÑтный иÑточник алфавитного ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð² @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "неизвеÑтное назначение алфавитного ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð² @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s ведёт к ÑлиÑнию %s Ñ Ñамим Ñобой, игнорируетÑÑ"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "неизвеÑтный алфавитный указатель «%s» в @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "выводитÑÑ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ð½Ñ‹Ð¹ указатель «%s», объединённый в другой — «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex до начала документа: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "@%s аргумент должен быть «top» или «bottom», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "ПоддерживаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ @%s 10 или 11, а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "@%s аргумент должен быть «separate» или «end», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s аргумент должен быть «on», «off» или «odd», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"@paragraphindent аргумент должен быть чиÑловым/«none»/«asis», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"@firstparagraphindent аргумент должен быть «none» или «insert», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "@exampleindent аргумент должен быть чиÑловым/«asis», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "ожидалÑÑ @%s on или off, а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"@kbdinputstyle аргумент должен быть «code»/«example»/«distinct», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "@allowcodebreaks аргумент должен быть «true» или «false», а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"@urefbreakstyle аргумент должен быть «after»/«before»/«none», а не «%s»"
@@ -2994,7 +2958,7 @@ msgid "@%s not empty"
msgstr "@%s не пуÑÑ‚"
# здеÑÑŒ %s может быть `cross' или `menu'
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующую ноду «%s»"
@@ -3004,105 +2968,105 @@ msgstr "@%s ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующую ноду «%s»
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s Ð¸Ð¼Ñ Ð¿Ð¾ÑвившейÑÑ Ð½Ð¾Ð´Ñ‹ «%s» отличаетÑÑ Ð¾Ñ‚ %s имени «%s»"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "на ноду «%s» нет ÑÑылок"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "нода «%s» ÑоответÑтвует %s Ð´Ð»Ñ Â«%s» в разделах, но не в меню"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "нода %s «%s» в меню «%s» и в разделах «%s» различна"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "нода «%s» ÑоответÑтвует %s Ð´Ð»Ñ Â«%s» в меню, но не в разделах"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s указатель «%s» (Ð´Ð»Ñ Ð½Ð¾Ð´Ñ‹ «%s») отличаетÑÑ Ð¾Ñ‚ %s Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s»"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующий «%s»"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "нода «%s» не имеет пункта меню Ð´Ð»Ñ Â«%s», Ñ…Ð¾Ñ‚Ñ Ð½Ð° неё ÑÑылаетÑÑ Ñ†ÐµÐ»ÑŒ Up"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "Ð´Ð»Ñ Â«%s», верх в меню «%s» и верх «%s» не Ñовпадают"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s на «%s», отличаетÑÑ Ð¾Ñ‚ %s Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ «%s»"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "пуÑтой ключ алфавитного ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð² @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: невозможно открыть %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: ошибка при закрытии %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: невозможно открыть файл latex %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° L2H_TMP Ñодержит точку"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: Ð¸Ð¼Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ каталога Ñодержит точку"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: ошибка Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: изображение имеет некорректное раÑширение: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: ошибка при переименовании %s в %s: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: невозможно открыть %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: не найден конец @%s Ñлемента %d"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3111,12 +3075,12 @@ msgstr ""
"latex2html.pm: результатом работы Ñтало %d Ñлементов в HTML; ожидалоÑÑŒ %d, "
"чиÑло Ñлементов, найденных в документе"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: невозможно определить фрагмент %d Ð´Ð»Ñ @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3124,47 +3088,47 @@ msgid ""
msgstr ""
"l2h: невозможно извлечь фрагмент %d Ð´Ð»Ñ @%s Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ð¼ количеÑтвом %d из HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: невозможно загрузить %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: невозможно открыть %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: невозможно открыть %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: ошибка при выполнении chdir %s: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: невозможно вернутьÑÑ Ð² начальный каталог: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: отÑутÑтвует Ð¸Ð¼Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: ошибка при выполнении команды: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: не найден конец @%s Ñлемента %d"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3173,12 +3137,12 @@ msgstr ""
"tex4ht.pm: результатом работы Ñтало %d Ñлементов в HTML; ожидалоÑÑŒ %d, чиÑло "
"Ñлементов, найденных в документе Ð´Ð»Ñ @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: в выводе нет Ñлемента HTML Ð´Ð»Ñ @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3187,37 +3151,37 @@ msgstr ""
"tex4ht.pm: при обработке получено %d Ñлементов в HTML; ожидалоÑÑŒ %d, чиÑло "
"Ñлементов, найденных в документе Ð´Ð»Ñ @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "ошибка загрузки %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: неизвеÑÑ‚Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: неизвеÑÑ‚Ð½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "невозможно причитать файл инициализации %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "игнорируетÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑтное значение TEXINFO_OUTPUT_FORMAT «%s»\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "ИÑпользование: %s [ПÐРÐМЕТР]… ФÐЙЛ-TEXINFO…\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3232,7 +3196,7 @@ msgstr ""
"Эта программа, обычно, уÑтанавливаетÑÑ Ð¿Ð¾ именами «makeinfo» и «texi2any»;\n"
"её поведение одинаково и не завиÑит от названиÑ.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3266,7 +3230,7 @@ msgstr ""
" -v, --verbose поÑÑнÑÑ‚ÑŒ дейÑтвиÑ\n"
" --version показать информацию о верÑии и выйти\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3285,7 +3249,7 @@ msgstr ""
" поÑле проверки корректноÑти ФÐЙЛÐ-"
"TEXINFO\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3333,7 +3297,7 @@ msgstr ""
" помещать файл в него; в противном Ñлучае ÐÐЗÐ\n"
" ÑвлÑÑŽÑ‚ÑÑ Ð¸Ð¼ÐµÐ½Ð°Ð¼Ð¸ выходного файла\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3375,7 +3339,7 @@ msgstr ""
"РÐЗМЕРÐ\n"
" (по умолчанию %d)\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3401,7 +3365,7 @@ msgstr ""
" Ñкорей; по умолчанию, еÑли задано "
"разделение\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3409,7 +3373,7 @@ msgstr ""
"Параметры Ð´Ð»Ñ XML и Docbook:\n"
" --output-indent=ЧИСЛО ничего не делает, Ð´Ð»Ñ ÑовмеÑтимоÑти\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3417,7 +3381,7 @@ msgstr ""
"Параметры Ð´Ð»Ñ DVI/PS/PDF:\n"
" --Xopt=ПÐР передать ПÐР в texi2dvi; может повторÑÑ‚ÑŒÑÑ\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3436,7 +3400,7 @@ msgstr ""
" -P КÐТÐЛОГ добавить КÐТÐЛОГ в начало ÑпиÑка поиÑка @include\n"
" -U ПЕРЕМЕÐÐÐЯ удалить ПЕРЕМЕÐÐУЮ, аналогично @clear\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3476,7 +3440,7 @@ msgstr ""
" Кроме того, Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² --no-ifФОРМÐТ, обрабатывать текÑÑ‚ в "
"@ifnotФОРМÐТ.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3492,7 +3456,7 @@ msgstr ""
" при выводе проÑтого текÑта включён --ifplaintext, а оÑтальные выключены;\n"
" при выводе XML включён --ifxml, а оÑтальные выключены.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3522,65 +3486,65 @@ msgstr ""
"разделами\n"
" makeinfo --no-split foo.texi запиÑать один большой Info-файл\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: аргумент --footnote-style должен быть «separate» или «end», а не «%s».\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: аргумент --paragraph-indent должен быть чиÑловым/«none»/«asis», а не "
"«%s».\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: при генерации %s, можно указать только один входной ФÐЙЛ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "параметр --Xopt без печатного вывода"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "неизвеÑтное преобразование дерева %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "игнорируетÑÑ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð° %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: пропущен аргумент, задающий файл.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Попробуйте «%s --help» Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ подробного опиÑаниÑ.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"Преобразование fill_gaps_in_sectioning не дало результата. Ðет раздела?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "ошибка при закрытии раÑширÑющего Ð¼Ð°ÐºÑ€Ð¾Ñ Ñ„Ð°Ð¹Ð»Ð° %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "невозможно открыть %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3588,21 +3552,256 @@ msgstr ""
"Преобразование insert_nodes_for_sectioning_commands не дало результата. Ðет "
"раздела?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: ошибка при закрытии %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: ошибка при закрытии файла внутренних ÑÑылок %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: невозможно открыть %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "нет парной «@end %s»"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "здеÑÑŒ не должно быть {"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "Ð½ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ Â«@end %s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set нужно указать имÑ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "некорректное Ð¸Ð¼Ñ Ð´Ð»Ñ @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear нужно указать имÑ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "некорректное Ð¸Ð¼Ñ Ð´Ð»Ñ @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro нужно указать имÑ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "некорректное Ð¸Ð¼Ñ Ð´Ð»Ñ @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+"@clickstyle должна принимать только @-команду в качеÑтве аргумента, а не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "команда Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ %s в качеÑтве аргумента Ð´Ð»Ñ @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "некорректный аргумент Ð´Ð»Ñ @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "некорректный аргумент Ð´Ð»Ñ @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "пуÑтой @columnfractions"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "неверный аргумент Ð´Ð»Ñ @printindex: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "ПоддерживаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ @fonttextsize 10 или 11, а не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"значением аргумента @footnotestyle должно быть «separate» или «end», а не "
+"«%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+"значением аргумента @setchapternewpage должно быть «on», «off» или «odd», а "
+"не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "неверный аргумент Ð´Ð»Ñ @need: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"значением аргумента @firstparagraph должно быть «none» или «insert», а не "
+"«%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "неверный аргумент Ð´Ð»Ñ @headings: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s должна иÑпользоватьÑÑ c аргументом: форматом Ð´Ð»Ñ @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "Ð½ÐµÐ¿Ð°Ñ€Ð½Ð°Ñ Â«@end»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "лишний аргумент Ð´Ð»Ñ @end %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "неверный аргумент Ð´Ð»Ñ @end: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: невозможно найти %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: невозможно открыть %s:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename поÑле первого Ñлемента"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions имеет ÑмыÑл только в Ñтроке @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node Ñтоит до @part, но чаÑти не могут быть ÑвÑзаны Ñ Ð½Ð¾Ð´Ð°Ð¼Ð¸"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s не имеет ÑмыÑла внутри блока @%s"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s не допуÑкаетÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ блока «@copying»"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry должен поÑвлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в пункте алфавитного указателÑ"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@author не имеет ÑмыÑла вне Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Â«@titlepage» или «@quotation»"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s нужно указать имÑ"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "неверный или пуÑтой формальный аргумент @%s: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless ожидает в качеÑтве аргумента «i» или «j», а не «%c»"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "неопределенный флаг: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "Команда @%s уÑтарела."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "Команда @%s уÑтарела; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ должен поÑвлÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в Ñовпадающем контекÑте"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb без ÑоответÑтвующего Ñимвола"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless ожидает в качеÑтве аргумента «i» или «j», а не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "здеÑÑŒ не должно быть }"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "отÑутÑтвует нода Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "ноды без нового имени в конце файла"
+
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr "иÑпользование файла перемеименованных нод («%s») не допуÑкаетÑÑ"
+
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "Ñтарое Ð¸Ð¼Ñ Â«%s» — Ñто нода документа"
+
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "файл пуÑÑ‚ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐµÐ¼Ð¾Ð¹ ноды «%s»"
+
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "нода Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ (новое Ð¸Ð¼Ñ Ð´Ð»Ñ Â«%s») отÑутÑтвует в документе: %s"
+
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "ошибка при закрытии файла переименуемой ноды Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "пуÑтое Ð¸Ð¼Ñ Ð½Ð¾Ð´Ñ‹"
+
#~ msgid "can't open %s: %s"
#~ msgstr "невозможно открыть %s: %s"
@@ -3618,9 +3817,6 @@ msgstr "%s: невозможно открыть %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "УÑÑ‚Ð°Ñ€ÐµÐ²ÑˆÐ°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s не должен быть ÑвÑзан Ñ @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: уÑÑ‚Ð°Ñ€ÐµÐ²ÑˆÐ°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ %s\n"
diff --git a/macros/texinfo/texinfo/po/rw.gmo b/macros/texinfo/texinfo/po/rw.gmo
index 7781453c22..0d78c9cc57 100644
--- a/macros/texinfo/texinfo/po/rw.gmo
+++ b/macros/texinfo/texinfo/po/rw.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/rw.po b/macros/texinfo/texinfo/po/rw.po
index ecb75e2d73..4ca1de3ec5 100644
--- a/macros/texinfo/texinfo/po/rw.po
+++ b/macros/texinfo/texinfo/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 4.7.94\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -279,7 +279,6 @@ msgid "Insert completion"
msgstr "Byuzuye"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr ""
@@ -304,7 +303,7 @@ msgid "found file %s"
msgstr "Ikosa Ibisohoka IDOSIYE"
#: info/footnotes.c:229
-#, fuzzy, c-format
+#, fuzzy
msgid "Footnotes could not be displayed"
msgstr "OYA"
@@ -318,7 +317,7 @@ msgid "---------- Footnotes ----------"
msgstr ""
#: info/indices.c:121 info/indices.c:877
-#, fuzzy, c-format
+#, fuzzy
msgid "Finding index entries..."
msgstr "Umubarendanga Ibyinjijwe"
@@ -328,7 +327,7 @@ msgid "Look up a string in the index for this file"
msgstr "Hejuru a Ikurikiranyanyuguti in i Umubarendanga kugirango iyi IDOSIYE"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
msgid "No indices found"
msgstr "ibimenyetso Byabonetse"
@@ -339,7 +338,7 @@ msgid "Index entry: "
msgstr "Ikinjizwa mu mubarendanga...."
#: info/indices.c:320 info/indices.c:883
-#, fuzzy, c-format
+#, fuzzy
msgid "No indices found."
msgstr "ibimenyetso Byabonetse"
@@ -357,7 +356,7 @@ msgstr ""
"Komandi:"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
msgid "No previous index search string"
msgstr "Ibanjirije Umubarendanga Gushaka Ikurikiranyanyuguti"
@@ -424,7 +423,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Bihari Ibisobanuro Idosiye in ibimenyetso"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
@@ -439,7 +437,6 @@ msgid "Cannot find node '%s'"
msgstr "Gushaka"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -468,7 +465,7 @@ msgstr "i Agaciro Bya IMPINDURAGACIRO"
msgid "Try --help for more information.\n"
msgstr "Ifashayobora kugirango Birenzeho Ibisobanuro"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -558,7 +555,7 @@ msgid ""
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
#, fuzzy
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
@@ -903,17 +900,17 @@ msgid "could not open init file %s"
msgstr "Gufungura Iyinjiza IDOSIYE"
#: info/infokey.c:227
-#, fuzzy, c-format
+#, fuzzy
msgid "key sequence too long"
msgstr "Urufunguzo"
#: info/infokey.c:304
-#, fuzzy, c-format
+#, fuzzy
msgid "missing key sequence"
msgstr "Ibuze Urufunguzo"
#: info/infokey.c:384
-#, fuzzy, c-format
+#, fuzzy
msgid "NUL character (\\000) not permitted"
msgstr "Inyuguti OYA"
@@ -923,12 +920,12 @@ msgid "NUL character (^%c) not permitted"
msgstr "Inyuguti OYA"
#: info/infokey.c:436
-#, fuzzy, c-format
+#, fuzzy
msgid "missing action name"
msgstr "Ibuze Igikorwa Izina:"
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
msgid "cannot bind key sequence to menu-digit"
msgstr "Urufunguzo"
@@ -938,7 +935,7 @@ msgid "unknown action `%s'"
msgstr "Kitazwi Igikorwa"
#: info/infokey.c:503
-#, fuzzy, c-format
+#, fuzzy
msgid "action name too long"
msgstr "Igikorwa Izina:"
@@ -948,22 +945,22 @@ msgid "extra characters following action `%s'"
msgstr "Birenga Inyuguti Igikorwa"
#: info/infokey.c:527
-#, fuzzy, c-format
+#, fuzzy
msgid "missing variable name"
msgstr "Ibuze IMPINDURAGACIRO Izina:"
#: info/infokey.c:536
-#, fuzzy, c-format
+#, fuzzy
msgid "missing `=' immediately after variable name"
msgstr "Ibuze Ako kanya Nyuma IMPINDURAGACIRO Izina:"
#: info/infokey.c:543
-#, fuzzy, c-format
+#, fuzzy
msgid "variable name too long"
msgstr "IMPINDURAGACIRO Izina:"
#: info/infokey.c:567
-#, fuzzy, c-format
+#, fuzzy
msgid "value too long"
msgstr "Agaciro"
@@ -988,7 +985,7 @@ msgid "Read a command name in the echo area and execute it"
msgstr "a Komandi: Izina: in i Ubuso Na Gukora"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
msgid "Cannot execute an 'echo-area' command here"
msgstr "Gukora Komandi:"
@@ -1070,7 +1067,7 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, fuzzy, c-format
+#, fuzzy
msgid "No file index"
msgstr "Umubarendanga Ibyinjijwe"
@@ -1436,7 +1433,6 @@ msgid "Select the most recently selected node"
msgstr "i Byahiswemo"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1500,12 +1496,11 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr ""
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
msgid "Using regular expressions for searches"
msgstr "Ibanjirije Gushaka Ikurikiranyanyuguti"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr ""
@@ -1524,8 +1519,8 @@ msgstr "Kuri i Itangiriro Bya i Umurongo"
msgid "Searching subfile %s ..."
msgstr "Byanze"
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
msgid "Search failed"
msgstr "Byanze"
@@ -1561,157 +1556,155 @@ msgstr "%s%sforIkurikiranyanyuguti"
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr ""
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
msgid "Search under %s: "
msgstr "Byanze"
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
#, fuzzy
msgid "Read a string and search for it case-sensitively"
msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
-#: info/session.c:4630
+#: info/session.c:4633
#, fuzzy
msgid "Read a string and search for it"
msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
-#: info/session.c:4636
+#: info/session.c:4639
#, fuzzy
msgid "Read a string and search backward for it"
msgstr "a Ikurikiranyanyuguti Na Gushaka subira inyuma kugirango"
-#: info/session.c:4644
+#: info/session.c:4647
#, fuzzy
msgid "Repeat last search in the same direction"
msgstr "Iheruka Gushaka in i Icyerekezo"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
#, fuzzy
msgid "No previous search string"
msgstr "Ibanjirije Gushaka Ikurikiranyanyuguti"
-#: info/session.c:4689
+#: info/session.c:4698
#, fuzzy
msgid "Repeat last search in the reverse direction"
msgstr "Iheruka Gushaka in i Ihindurakerekezo Icyerekezo"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
#, fuzzy
msgid "Search interactively for a string as you type it"
msgstr "kugirango a Ikurikiranyanyuguti Nka Ubwoko"
-#: info/session.c:4878
+#: info/session.c:4893
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "Gushaka subira inyuma"
-#: info/session.c:4879
+#: info/session.c:4894
#, fuzzy
msgid "I-search backward: "
msgstr "Gushaka subira inyuma"
-#: info/session.c:4881
+#: info/session.c:4896
#, fuzzy
msgid "Regexp I-search: "
msgstr "Gushaka"
-#: info/session.c:4882
+#: info/session.c:4897
#, fuzzy
msgid "I-search: "
msgstr "Gushaka"
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr ""
-#: info/session.c:5275
+#: info/session.c:5290
#, fuzzy
msgid "Cancel current operation"
msgstr "KIGEZWEHO"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Kuvamo"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
msgid "Display version of Info being run"
msgstr "Kugaragaza Verisiyo Ibisobanuro Na Gusohoka"
-#: info/session.c:5289
+#: info/session.c:5304
#, fuzzy, c-format
msgid "GNU Info version %s"
msgstr "ni ku Verisiyo Bivuye"
-#: info/session.c:5294
+#: info/session.c:5309
#, fuzzy
msgid "Redraw the display"
msgstr "i Kugaragaza"
-#: info/session.c:5331
+#: info/session.c:5346
#, fuzzy
msgid "Quit using Info"
msgstr "ikoresha"
-#: info/session.c:5347
+#: info/session.c:5362
#, fuzzy
msgid "Run command bound to this key's lowercase variant"
msgstr "Komandi: Kuri iyi Inyuguti nto"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
msgid "Unknown command (%s)"
msgstr "Komandi:"
-#: info/session.c:5361
+#: info/session.c:5376
#, fuzzy, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\"ni Sibyo"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
msgid "'%s' is invalid"
msgstr "`%s'ni Sibyo"
-#: info/session.c:5680
+#: info/session.c:5695
#, fuzzy
msgid "Add this digit to the current numeric argument"
msgstr "iyi Kuri i KIGEZWEHO Bikurikije umubare"
-#: info/session.c:5687
+#: info/session.c:5702
#, fuzzy
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Gutangira Cyangwa Gukuba ku 4. i KIGEZWEHO Bikurikije umubare"
@@ -2005,12 +1998,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s:OYA Gusoma Na OYA Kurema"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
@@ -2040,12 +2031,12 @@ msgid "excess command line argument `%s'"
msgstr "Komandi: Umurongo"
#: install-info/install-info.c:2278
-#, fuzzy, c-format
+#, fuzzy
msgid "No input file specified; try --help for more information."
msgstr "Iyinjiza IDOSIYE Ifashayobora kugirango Birenzeho Ibisobanuro"
#: install-info/install-info.c:2280
-#, fuzzy, c-format
+#, fuzzy
msgid "No dir file specified; try --help for more information."
msgstr "IDOSIYE Ifashayobora kugirango Birenzeho Ibisobanuro"
@@ -2064,959 +2055,953 @@ msgstr "Oya Ibisobanuro Icyinjijwe in"
msgid "no entries found for `%s'; nothing deleted"
msgstr "Oya Ibyinjijwe Byabonetse kugirango Cyasibwe"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, fuzzy, perl-format
msgid "could not open %s for writing: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, fuzzy, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
-#: tp/Texinfo/Common.pm:1157
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, fuzzy, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, fuzzy, perl-format
msgid "%s is not a valid split possibility"
msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, fuzzy, perl-format
msgid "could not read %s: %s"
msgstr "Kurema bushyinguro"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, fuzzy, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, fuzzy, perl-format
msgid "@%s: could not find %s"
msgstr "Gushaka"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, fuzzy, perl-format
-msgid "could not open %s: %s"
-msgstr "%s:OYA Gufungura IDOSIYE"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, fuzzy, perl-format
msgid "could not protect hash character in @%s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, fuzzy, perl-format
msgid "empty node name after expansion `%s'"
msgstr "Kuri"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, fuzzy, perl-format
msgid "@%s `%s' previously defined"
msgstr "Makoro"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, fuzzy, perl-format
msgid "here is the previous definition as @%s"
msgstr "ni i Ibanjirije Insobanuro Bya"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, fuzzy, c-format, perl-format
msgid "empty argument in @%s"
msgstr "Kuri"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, fuzzy, perl-format
msgid "error on closing %s: %s"
msgstr "Ikosa Kuri"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, fuzzy, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "Kurema bushyinguro"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, fuzzy, perl-format
msgid "could not create directory `%s': %s"
msgstr "Kurema bushyinguro"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, fuzzy, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@Ishusho IDOSIYE"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
msgid "no argument specified for @U"
msgstr "Izina: kugirango Komandi:"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, fuzzy, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@Ishusho IDOSIYE kugirango OYA"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, fuzzy, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "Gukuraho... IDOSIYE"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
#, fuzzy
msgid "missing type"
msgstr "Ibuze Igikorwa Izina:"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, fuzzy, perl-format
msgid "unrecognized type: %s"
msgstr "%s:Ihitamo"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, fuzzy, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "Gukuraho... IDOSIYE"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
#, fuzzy
msgid "--css-include ended in comment"
msgstr "%s:%d:--IDOSIYE in Icyo wongeraho"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, fuzzy, perl-format
msgid "CSS file %s not found"
msgstr "%cendMakoro OYA Byabonetse"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, fuzzy, perl-format
msgid "could not open --include-file %s: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, fuzzy, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, fuzzy, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, fuzzy, perl-format
msgid "error on closing frame file %s: %s"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, fuzzy, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, fuzzy, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, fuzzy, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "Cyangwa kugirango iyi muri iyi Inyandiko"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, fuzzy, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "Ibikubiyemo in"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, fuzzy, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "Cyangwa kugirango iyi muri iyi Inyandiko"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, fuzzy, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "Ikosa Ibisohoka IDOSIYE"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-#, fuzzy
-msgid "empty node name"
-msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
#, fuzzy
msgid "document without nodes"
msgstr "Ibikubiyemo in iyi"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
#, fuzzy
msgid "document without Top node"
msgstr "Ibikubiyemo in iyi"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, fuzzy, perl-format
msgid "rename %s failed: %s"
msgstr "Gushaka"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(Hanze Bya"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, fuzzy, perl-format
msgid "@node name should not contain `,': %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, fuzzy, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, fuzzy, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "kugirango Umubarendanga Hanze Bya"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
msgid "error on closing image text file %s: %s"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, fuzzy, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@Ishusho IDOSIYE"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, fuzzy, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "Gushaka"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
#, fuzzy
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr "@a Kwambukiranya Indango in Kuri"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, fuzzy, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, fuzzy, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, fuzzy, perl-format
msgid "@%s node name should not contain `:'"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, fuzzy, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "Kuri"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
#, fuzzy
msgid "menu entry node name should not contain `:'"
msgstr "Kuri"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
#, fuzzy
msgid "menu entry name should not contain `:'"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:762
+#, fuzzy, perl-format
+msgid "could not open %s: %s"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, fuzzy, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, fuzzy, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, fuzzy, perl-format
msgid "%c%s requires a name"
msgstr "%c%sa Izina:"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, fuzzy, c-format, perl-format
msgid "bad name for @%s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, fuzzy, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, fuzzy, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%sIbuze Gufunga"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, fuzzy, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%sIbuze Gufunga"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, fuzzy, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, fuzzy, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@Ikitezwe:"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, fuzzy, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, fuzzy, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "ku Umurongo Na:"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "%c%sIbuze Gufunga"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, fuzzy, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "ku Umurongo Na:"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, fuzzy, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ in Makoro ku Bya Izina:"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, fuzzy, c-format, perl-format
msgid "missing name for @%s"
msgstr "in"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, fuzzy, c-format, perl-format
msgid "missing category for @%s"
msgstr "in"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, fuzzy, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
#, fuzzy
msgid "empty multitable"
msgstr "%s:ubusa IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, fuzzy, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, fuzzy, c-format, perl-format
msgid "bad argument to @%s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, fuzzy, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%si kugirango"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, fuzzy, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr "@Ikintu OYA in Kuri"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, fuzzy, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "@Ikintu OYA in Kuri"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, fuzzy, c-format, perl-format
msgid "@%s missing argument"
msgstr "%s:Ibuze IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, fuzzy, c-format, perl-format
msgid "unknown @end %s"
msgstr "Umubarendanga"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, fuzzy, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, fuzzy, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, fuzzy, perl-format
msgid "@%s: could not open %s: %s"
msgstr "Gushaka"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, fuzzy, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "Imisobekere: Izina:"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, fuzzy, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%sOYA Hanze"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+msgid "@part should not be associated with @top"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, fuzzy, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, fuzzy, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
#, fuzzy
msgid "empty node name in menu entry"
msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, fuzzy, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, fuzzy, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "Makoro"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, fuzzy, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ni i Ibanjirije Insobanuro Bya"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, fuzzy, perl-format
msgid "@%s without associated character"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, fuzzy, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "@Ikintu OYA in Kuri"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, fuzzy, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%sCyangwa Nka OYA"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, fuzzy, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "@Ikintu OYA in Kuri"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, fuzzy, c-format, perl-format
msgid "@%s expected braces"
msgstr "%c%sIkitezwe: Ingirwadusodeko"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, fuzzy, c-format, perl-format
msgid "unknown command `%s'"
msgstr "Komandi:"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, fuzzy, perl-format
msgid "undefined flag: %s"
msgstr "kidasobanuye Ibendera"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
#, fuzzy
msgid "bad syntax for @value"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%sni"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%sni"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, fuzzy, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, fuzzy, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%sOYA Mo Imbere Funga"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, fuzzy, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "%s:ubusa IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
#, fuzzy
msgid "@tab before @item"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, fuzzy, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "Inkingi in Ikintu KININI"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
#, fuzzy
msgid "ignoring @tab outside of multitable"
msgstr "Isunika Hanze Bya"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, fuzzy, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "(Hanze Bya"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, fuzzy, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%sOYA Mo Imbere Funga"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, fuzzy, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "in Kuri Gukoresha"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, fuzzy, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%sOYA Hanze Na"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
#, fuzzy
msgid "@dircategory after first node"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, fuzzy, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "Mo Imbere Ubusobanuro mpezarupapuro OYA"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
#, fuzzy
msgid "@direntry after first node"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, fuzzy, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
#, fuzzy
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "Hejuru: in"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "%s:OYA Gufungura IDOSIYE"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
#, fuzzy
msgid "unexpected @"
msgstr "Ikitezwe:"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, fuzzy, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%sOYA Hanze"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, fuzzy, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, fuzzy, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "@Ikintu OYA in Kuri"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, fuzzy, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "%s:Ibuze IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, fuzzy, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, fuzzy, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
#, fuzzy
msgid "@image missing filename argument"
msgstr "@Ishusho Ibuze Izina ry'idosiye:"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, fuzzy, c-format, perl-format
msgid "@%s missing first argument"
msgstr "%s:Ibuze IDOSIYE"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, fuzzy, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "@Ikintu OYA in Kuri"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, fuzzy, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "@Ikintu OYA in Kuri"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
#, fuzzy
msgid "superfluous arguments for node"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, fuzzy, c-format, perl-format
msgid "expected @end %s"
msgstr "Ikitezwe:"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, fuzzy, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, fuzzy, perl-format
msgid "environment command %s as argument to @%s"
msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, fuzzy, perl-format
msgid "empty @%s"
msgstr "Kuri"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, fuzzy, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s:%sBikurikije umubare OYA"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, fuzzy, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "Umubarendanga"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, fuzzy, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "Umubarendanga"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, fuzzy, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "Umubarendanga in"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, fuzzy, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s:%sBikurikije umubare OYA"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s:%sBikurikije umubare OYA"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, fuzzy, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, fuzzy, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, fuzzy, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, fuzzy, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, fuzzy, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
@@ -3045,7 +3030,7 @@ msgstr ""
msgid "@%s not empty"
msgstr "%s:ubusa IDOSIYE"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%sIndango Kuri"
@@ -3055,213 +3040,213 @@ msgstr "%sIndango Kuri"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "Kuri"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, fuzzy, perl-format
msgid "unreferenced node `%s'"
msgstr "%sIndango Kuri"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%sIndango Kuri"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, fuzzy, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Ibikubiyemo Ikintu kugirango Intego"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, fuzzy, perl-format
msgid "empty index key in @%s"
msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, fuzzy, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, fuzzy, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "Ikosa Kuri"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, fuzzy, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, fuzzy, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, fuzzy, perl-format
msgid "l2h: could not open %s: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, fuzzy, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, fuzzy, perl-format
msgid "l2h: could not load %s: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, fuzzy, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, fuzzy, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "Gushaka"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, fuzzy, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "Gushaka"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, fuzzy, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "Kurema Ibisohoka IDOSIYE"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, fuzzy, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "Gushaka"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, fuzzy, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "Kurema Ibisohoka IDOSIYE"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "Ikosa Kuri"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, fuzzy, perl-format
msgid "%s: unknown variable %s"
msgstr "Komandi:"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, fuzzy, perl-format
msgid "%s: unknown variable %s\n"
msgstr "Komandi:"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, fuzzy, perl-format
msgid "could not read init file %s"
msgstr "Gufungura Iyinjiza IDOSIYE"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, fuzzy, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "%s:Kwirengagiza Agaciro"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr ""
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
#, fuzzy
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
@@ -3273,7 +3258,7 @@ msgstr ""
"Inkomoko Kuri Ikindi Imiterere ku Idosiye kugirango kiri kuri interineti Na: "
"Cyangwa"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, fuzzy, perl-format
msgid ""
"General options:\n"
@@ -3297,7 +3282,7 @@ msgstr ""
"Indango Mburabuzi v ni Byakozwe Verisiyo Kugaragaza Verisiyo Ibisobanuro Na "
"Gusohoka"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -3311,7 +3296,7 @@ msgstr ""
"Imiterere Ihitamo Mburabuzi ni Kuri InyandikoGitabo Ibisohoka HTML Ibisohoka "
"xml Ibisohoka Ibisohoka Byuzuye Umwandiko"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
#, fuzzy
msgid ""
"General output options:\n"
@@ -3344,7 +3329,7 @@ msgstr ""
"Cyangwa Ibisohoka Ibisohoka IDOSIYE Umubare Ibyatoranyijwe Ibisohoka Umutwe "
"Na Imibare o Ibisohoka Ibisohoka Kuri bushyinguro NIBA Gutandukanya"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, fuzzy, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3372,7 +3357,7 @@ msgstr ""
"Mburabuzi Igika Ikurura Ikurura Ibika ku Imyanya Mburabuzi ni OYA Ikurura "
"NIBA Gutandukanya Ingano Gutandukanya Idosiye ku Ingano Mburabuzi"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
#, fuzzy
msgid ""
"Options for HTML:\n"
@@ -3387,19 +3372,19 @@ msgid ""
" anchors; default is set only if split.\n"
msgstr "kugirango Gushyiramo Gushyiramo in IMISUSIRE Ibisohoka Gusoma NIBA ni"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
#, fuzzy
msgid ""
"Input file options:\n"
@@ -3415,7 +3400,7 @@ msgstr ""
"Gushyiramo Gushaka Inzira Kuri i Gushyiramo Gushaka Inzira U i "
"IMPINDURAGACIRO Nka Na: Gusiba"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
#, fuzzy
msgid ""
"Conditional processing in input:\n"
@@ -3441,7 +3426,7 @@ msgstr ""
"Oya OYA Na HTML Umwandiko Oya OYA Umwandiko Oya OYA Umwandiko Oya OYA Na "
"Umwandiko Oya OYA Na xml Umwandiko kugirango i Oya Amahitamo Umwandiko"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
#, fuzzy
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
@@ -3455,7 +3440,7 @@ msgstr ""
"NIBA ni ku Na i Ibindi Bidakora NIBA Byuzuye Umwandiko ni ku Na i Ibindi "
"Bidakora NIBA ni ku Na i Ibindi Bidakora"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
#, fuzzy
msgid ""
"Examples:\n"
@@ -3477,80 +3462,319 @@ msgstr ""
"Kwandika HTML Imirongo Umubare Ibyatoranyijwe Kwandika Na: Iriho Imibare Oya "
"Gutandukanya Kwandika IDOSIYE"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, fuzzy, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, fuzzy, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, fuzzy, perl-format
msgid "unknown tree transformation %s"
msgstr "Komandi:"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, fuzzy, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s:Ibuze IDOSIYE"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, fuzzy, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "kugirango Birenzeho Ibisobanuro"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, fuzzy, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, fuzzy, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, fuzzy, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "Ikosa Kuri"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, fuzzy, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, fuzzy, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s:OYA Gufungura IDOSIYE"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+msgid "no matching `@end %s'"
+msgstr "Mbere Impera"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+msgid "unmatched `@end %s'"
+msgstr "Impera Na:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+msgid "@set requires a name"
+msgstr "%c%sa Izina:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+msgid "bad name for @set"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+msgid "@clear requires a name"
+msgstr "%c%sa Izina:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+msgid "bad name for @clear"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+msgid "@unmacro requires a name"
+msgstr "%c%sa Izina:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+msgid "bad name for @unmacro"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+msgid "bad argument to @alias"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+msgid "bad argument to @definfoenclose"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+msgid "empty @columnfractions"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "%s:%sBikurikije umubare OYA"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+msgid "bad argument to @need: %s"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+msgid "bad argument to @headings: %s"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%si kugirango"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+msgid "bad argument to @end: %s"
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+msgid "@include: could not find %s"
+msgstr "Gushaka"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+msgid "@include: could not open %s:"
+msgstr "Gushaka"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%sOYA Hanze"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%sOYA Mo Imbere Funga"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%sOYA Mo Imbere Funga"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+msgid "@subentry should only occur in an index entry"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%sOYA Hanze Na"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+msgid "@%s requires a name"
+msgstr "%c%sa Izina:"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "Kuri"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%sCyangwa Nka OYA"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+msgid "undefined flag: %.*s"
+msgstr "kidasobanuye Ibendera"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+msgid "@%s is obsolete."
+msgstr "%c%sni"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+msgid "@%s is obsolete; %s"
+msgstr "%c%sni"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+msgid "@\\ should only appear in math context"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+msgid "@verb without associated character"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%sCyangwa Nka OYA"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr ""
+
+#, fuzzy
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "Cyangwa kugirango iyi muri iyi Inyandiko"
+
+#, fuzzy
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "Ibikubiyemo in"
+
+#, fuzzy
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "Cyangwa kugirango iyi muri iyi Inyandiko"
+
+#, fuzzy
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "Ikosa Ibisohoka IDOSIYE"
+
+#, fuzzy
+#~ msgid "empty node name"
+#~ msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
+
#, fuzzy
#~ msgid "can't open %s: %s"
#~ msgstr "%s:OYA Gufungura IDOSIYE"
@@ -3571,10 +3795,6 @@ msgstr "%s:OYA Gufungura IDOSIYE"
#~ msgstr "Gushyiraho igihinduka"
#, fuzzy
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "%s:OYA Gufungura IDOSIYE"
-
-#, fuzzy
#~ msgid "%s: option '--%s' doesn't allow an argument\n"
#~ msgstr "%s:Ihitamo Kwemerera"
@@ -4199,10 +4419,6 @@ msgstr "%s:OYA Gufungura IDOSIYE"
#~ msgstr "Imisobekere: OYA"
#, fuzzy
-#~ msgid "%c%s expects `i' or `j' as argument, not `%c'"
-#~ msgstr "%c%sCyangwa Nka OYA"
-
-#, fuzzy
#~ msgid "%c%s expects a single character `i' or `j' as argument"
#~ msgstr "%c%sa UMWE Inyuguti Cyangwa Nka"
@@ -4219,10 +4435,6 @@ msgstr "%s:OYA Gufungura IDOSIYE"
#~ msgstr "%cendMakoro OYA Byabonetse"
#, fuzzy
-#~ msgid "mismatched @end %s with @%s"
-#~ msgstr "Impera Na:"
-
-#, fuzzy
#~ msgid "Too many errors! Gave up.\n"
#~ msgstr "Amakosa Hejuru"
@@ -4438,10 +4650,6 @@ msgstr "%s:OYA Gufungura IDOSIYE"
#~ msgstr "{Agaciro kugirango"
#, fuzzy
-#~ msgid "Reached eof before matching @end %s"
-#~ msgstr "Mbere Impera"
-
-#, fuzzy
#~ msgid "`%.40s...' is too long for expansion; not expanded"
#~ msgstr ""
#~ "`%.Project- Id- Version: basctl\n"
diff --git a/macros/texinfo/texinfo/po/sl.gmo b/macros/texinfo/texinfo/po/sl.gmo
index 54259a3c79..e2121277bd 100644
--- a/macros/texinfo/texinfo/po/sl.gmo
+++ b/macros/texinfo/texinfo/po/sl.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/sl.po b/macros/texinfo/texinfo/po/sl.po
index c9cbf59d31..4132a9997a 100644
--- a/macros/texinfo/texinfo/po/sl.po
+++ b/macros/texinfo/texinfo/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 4.13\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2012-08-10 18:31+0100\n"
"Last-Translator: Klemen Košir <klemen.kosir@gmx.com>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -25,36 +25,43 @@ msgstr "Neznana sistemska napaka"
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: možnost `%s' je dvoumna\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: možnost `%s' je dvoumna\n"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: neprepoznana možnost `%c%s'\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: možnost `%c%s' ne dovoljuje argumenta\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: možnost `%s' zahteva argument\n"
#: gnulib/lib/getopt.c:621
#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
msgid "%s: invalid option -- '%c'\n"
msgstr "%s: neveljavna možnost -- %c\n"
#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:682
#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: možnost zahteva argument -- %c\n"
@@ -68,16 +75,19 @@ msgstr ""
#: gnulib/lib/regcomp.c:141
#, fuzzy
+#| msgid "Error in regular expression `%s': %s"
msgid "Invalid regular expression"
msgstr "Napaka v logiÄnem izrazu `%s': %s"
#: gnulib/lib/regcomp.c:144
#, fuzzy
+#| msgid "invalid encoded character `%s'"
msgid "Invalid collation character"
msgstr "neveljaven kodiran znak `%s'"
#: gnulib/lib/regcomp.c:147
#, fuzzy
+#| msgid "unlikely character %c in @var"
msgid "Invalid character class name"
msgstr "neverjeten znak %c v @var"
@@ -95,11 +105,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:159
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ( or \\("
msgstr "NeujemajoÄ }"
#: gnulib/lib/regcomp.c:162
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched \\{"
msgstr "NeujemajoÄ }"
@@ -113,31 +125,37 @@ msgstr ""
#: gnulib/lib/regcomp.c:171
#, fuzzy
+#| msgid "memory exhausted"
msgid "Memory exhausted"
msgstr "pomnilnik je izÄrpan"
#: gnulib/lib/regcomp.c:174
#, fuzzy
+#| msgid "Error in regular expression `%s': %s"
msgid "Invalid preceding regular expression"
msgstr "Napaka v logiÄnem izrazu `%s': %s"
#: gnulib/lib/regcomp.c:177
#, fuzzy
+#| msgid "Error in regular expression `%s': %s"
msgid "Premature end of regular expression"
msgstr "Napaka v logiÄnem izrazu `%s': %s"
#: gnulib/lib/regcomp.c:180
#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Regular expression too big"
msgstr "Uporaba logiÄnih izrazov za iskanja"
#: gnulib/lib/regcomp.c:183
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ) or \\)"
msgstr "NeujemajoÄ }"
#: gnulib/lib/regcomp.c:676
#, fuzzy
+#| msgid "No previous search string"
msgid "No previous regular expression"
msgstr "Brez niza predhodnega iskanja"
@@ -243,6 +261,7 @@ msgstr "Edina dopolnitev"
#: info/echo-area.c:1049
#, fuzzy, c-format
+#| msgid "%d completions:\n"
msgid "%d completion:\n"
msgid_plural "%d completions:\n"
msgstr[0] "%d dopolnitev:\n"
@@ -253,7 +272,6 @@ msgid "Insert completion"
msgstr "Vstavi dopolnitev"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Izgradnja dopolnitev ..."
@@ -268,16 +286,17 @@ msgstr ""
#: info/filesys.c:150
#, fuzzy, c-format
+#| msgid "Making %s file `%s' from `%s'.\n"
msgid "looking for file %s in %s"
msgstr "Ustvarjanje %s datoteke `%s' iz `%s'.\n"
#: info/filesys.c:236 info/filesys.c:250 info/filesys.c:271
#, fuzzy, c-format
+#| msgid "Find file: "
msgid "found file %s"
msgstr "Najdi datoteko: "
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Sprotnih opomb ni bilo mogoÄe prikazati"
@@ -290,7 +309,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Sprotne opombe ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Iskanje vnosov kazala ..."
@@ -299,7 +317,8 @@ msgid "Look up a string in the index for this file"
msgstr "PoiÅ¡Äi niz v kazalu za to datoteko"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "Najdenega ni nobenega kazala."
@@ -308,17 +327,20 @@ msgid "Index entry: "
msgstr "Vnos kazala: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Najdenega ni nobenega kazala."
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr "Najdeno `%s' v %s. (`\\[next-index-match]' poskuša najti naslednjo.)"
#: info/indices.c:446
#, fuzzy
+#| msgid ""
+#| "Go to the next matching index item from the last `\\[index-search]' "
+#| "command"
msgid ""
"Go to the next matching index item from the last '\\[index-search]' command"
msgstr ""
@@ -326,22 +348,26 @@ msgstr ""
"search]'"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "Brez prejšnjega niza iskanja kazala"
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No more index entries containing '%s'"
msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No index entries containing '%s'"
msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of `%s'..."
msgid "Scanning indices of '%s'..."
msgstr "Preiskovanje kazal od `%s' ..."
@@ -355,6 +381,7 @@ msgstr ""
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "Index entries containing '%s':\n"
msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
@@ -377,31 +404,33 @@ msgstr ""
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No index entries containing '%s'."
msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have `%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "Nobena razpoložljiva podatkovna datoteka nima `%s' v svojih kazalih."
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "V vozliÅ¡Äu `%s' ni predmetov menijev `%s'."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr "Ni mogoÄe najti vozliÅ¡Äa `%s'."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -422,6 +451,7 @@ msgstr ""
#: info/info.c:828 info/infokey.c:560
#, fuzzy, c-format
+#| msgid "Set the value of an Info variable"
msgid "value %s is not valid for variable %s"
msgstr "Nastavi vrednost spremenljivke Info"
@@ -430,7 +460,7 @@ msgstr "Nastavi vrednost spremenljivke Info"
msgid "Try --help for more information.\n"
msgstr "Za veÄ podrobnosti poskusite --help.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -447,6 +477,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "Za `%s' ni najdenih nobenih vnosov kazal\n"
@@ -463,6 +494,13 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILENAME remember user keystrokes in FILENAME.\n"
+#| " -f, --file=FILENAME specify Info file to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -479,6 +517,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILENAME output selected nodes to FILENAME."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -497,11 +540,17 @@ msgstr ""
#: info/info.c:1112
#, fuzzy
+#| msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgid " -b, --speech-friendly be friendly to speech synthesizers"
msgstr " -b, --speech-friendly bodi prijazen do sintetizatorjev govora."
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --subnodes recursively output menu items.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file."
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -515,6 +564,14 @@ msgstr ""
#: info/info.c:1122
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The first non-option argument, if present, is the menu entry to start "
+#| "from;\n"
+#| "it is searched for in all `dir' files along INFOPATH.\n"
+#| "If it is not present, info merges all `dir' files and shows the result.\n"
+#| "Any remaining arguments are treated as the names of menu\n"
+#| "items relative to the initial node visited."
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -532,6 +589,9 @@ msgstr ""
#: info/info.c:1129
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "For a summary of key bindings, type h within Info."
msgid ""
"\n"
"For a summary of key bindings, type H within Info."
@@ -541,6 +601,19 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers start at buffers node within emacs manual\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -570,7 +643,7 @@ msgstr ""
"txt\n"
" info -f ./foo.info prikaži datoteko /foo.info brez iskanja mape"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -582,6 +655,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "Ni mogoÄe najti vozliÅ¡Äa `(%s)%s'."
@@ -595,61 +669,73 @@ msgstr "ToÄka se ne prikaže znotraj vozliÅ¡Äa okna!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "Zadnjega okna ni mogoÄe izbrisati."
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "V tem vozliÅ¡Äu ni menijev."
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "V tem vozliÅ¡Äu ni sprotnih opomb."
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "V tem vozliÅ¡Äu ni navzkrižnih sklicev."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "Za to vozliÅ¡Äe ni kazalcev `%s'."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "Neznan ukaz Info `%c'; za pomoÄ poskusite `?'."
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "Vrsta terminala `%s' ni dovolj napredna za zagon Info."
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "Ste že na zadnji strani tega vozliÅ¡Äa."
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "Ste že na prvi strani tega vozliÅ¡Äa."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "Samo eno okno."
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "KonÄno okno bi bilo premajhno."
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr "Za okno pomoÄi ni dovolj prostora, izbriÅ¡ite okno."
@@ -736,6 +822,7 @@ msgstr "\\%-10[top-node] Pojdi v najviÅ¡je vozliÅ¡Äe tega dokumenta\n"
#: info/infodoc.c:61
#, fuzzy
+#| msgid "\\%-10[dir-node] Go to the main `directory' node.\n"
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
msgstr "\\%-10[dir-node] Pojdi v glavno vozliÅ¡Äe `mape'.\n"
@@ -835,6 +922,7 @@ msgstr "Prikaži sporoÄilo pomoÄi"
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "ObiÅ¡Äite vozliÅ¡Äe Info `(info)Help'"
@@ -849,6 +937,7 @@ msgstr "Opiši tipko: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s je nedoloÄen."
@@ -862,41 +951,43 @@ msgstr "Kje je ukaz: "
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "`%s' ni na nobeni tipki"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s je lahko priklican samo s %s."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s je lahko priklican s %s."
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr "Funkcija z imenom `%s' ne obstaja"
#: info/infomap.c:585
#, fuzzy, c-format
+#| msgid "cannot open input file `%s'"
msgid "could not open init file %s"
msgstr "ni mogoÄe odpreti datoteke vnosa `%s'"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "tipkovno zaporedje je predolgo"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "manjka tipkovno zaporedje"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "znak NUL (\\000) ni dovoljen"
@@ -906,12 +997,12 @@ msgid "NUL character (^%c) not permitted"
msgstr "znak NUL (^%c) ni dovoljen"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "manjka ime dejanja"
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "key sequence too long"
msgid "cannot bind key sequence to menu-digit"
msgstr "tipkovno zaporedje je predolgo"
@@ -921,7 +1012,6 @@ msgid "unknown action `%s'"
msgstr "neznano dejanje `%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "ime dejanja je predolgo"
@@ -931,22 +1021,18 @@ msgid "extra characters following action `%s'"
msgstr "dodatni znaki sledijo dejanju `%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "manjka ime spremenljivke"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "takoj za imenom spremenljivke manjka `='"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "ime spremenljivke je predolgo"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "vrednost je predolga"
@@ -968,7 +1054,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Preberi ime ukaza v podroÄju echo in ga izvrÅ¡i"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an `echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "Ukaza `echo-area' ni mogoÄe izvrÅ¡iti tukaj."
@@ -997,6 +1084,11 @@ msgstr "Ni mogoÄe obdelati datoteke %s.\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -1011,6 +1103,9 @@ msgstr ""
#: info/nodemenu.c:185
#, fuzzy
+#| msgid ""
+#| "Here is the menu of nodes you have recently visited.\n"
+#| "Select one from this menu, or use `\\[history-node]' in another window.\n"
msgid ""
"Here is the menu of nodes you have recently visited.\n"
"Select one from this menu, or use '\\[history-node]' in another window.\n"
@@ -1050,7 +1145,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr ""
@@ -1059,6 +1153,9 @@ msgstr ""
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1199,6 +1296,7 @@ msgstr "Izberi ta predmet menija"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "V tem meniju ni %d predmetov."
@@ -1228,6 +1326,7 @@ msgstr "Sledi xref: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "Sklic je izginil! (%s)."
@@ -1262,11 +1361,13 @@ msgstr "Izberi sklic ali predmet menija, ki se prikazuje v tej vrstici"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr "V vozliÅ¡Äu `%s' ni menijev."
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "Ni mogoÄe najti vozliÅ¡Äa, sklicevanega s strani `%s' v `%s'."
@@ -1304,11 +1405,13 @@ msgstr "Izberi prvo vozliÅ¡Äe v tej datoteki"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "V tem dokumentu ni veÄ vozliÅ¡Ä."
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "Brez `Pred' ali `Gor' za to vozliÅ¡Äe znotraj tega dokumenta."
@@ -1347,11 +1450,13 @@ msgstr "Pridobi stran priroÄnika: "
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "Izberi vozliÅ¡Äe `Top' v tej datoteki"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "Izberi vozliÅ¡Äe `(dir)'"
@@ -1364,7 +1469,6 @@ msgid "Select the most recently selected node"
msgstr "Izberi nedavno izbrano vozliÅ¡Äe"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1378,26 +1482,31 @@ msgstr "Najdi datoteko: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr "Ni mogoÄe najti `%s'."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr "Ni bilo mogoÄe ustvariti izhodne datoteke `%s'."
#: info/session.c:3727
#, fuzzy, c-format
+#| msgid "error writing to `%s'"
msgid "error writing to %s: %s"
msgstr "napaka med branjem v `%s'"
#: info/session.c:3736
#, fuzzy, c-format
+#| msgid "Removing %s\n"
msgid "closing %s"
msgstr "Odstranjevanje %s\n"
#: info/session.c:3785
#, fuzzy, c-format
+#| msgid "Writing node %s..."
msgid "writing node %s..."
msgstr "Zapisovanje vozliÅ¡Äa %s ..."
@@ -1407,16 +1516,19 @@ msgstr "Uporabi cev za vsebino tega vozliÅ¡Äa skozi INFO_PRINT_COMMAND"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr "Ni mogoÄe odpreti cevi v `%s'."
#: info/session.c:3864
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "printing node %s..."
msgstr "Izpisovanje vozliÅ¡Äa %s ..."
#: info/session.c:3872
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "finished printing node %s"
msgstr "Izpisovanje vozliÅ¡Äa %s ..."
@@ -1425,22 +1537,26 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Preklopi uporabo logiÄnih izrazov v iskanjih"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Using regular expressions for searches"
msgstr "Uporaba logiÄnih izrazov za iskanja"
#: info/session.c:3909
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches."
msgid "Using literal strings for searches"
msgstr "Uporaba znakovnih nizov za iskanja"
#: info/session.c:4112
#, fuzzy
+#| msgid "Search continued from the end of the document."
msgid "Search continued from the end of the document"
msgstr "Iskanje se nadaljuje od konca dokumenta."
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the beginning of the document."
msgid "Search continued from the beginning of the document"
msgstr "Iskanje se nadaljuje od zaÄetka dokumenta."
@@ -1449,8 +1565,9 @@ msgstr "Iskanje se nadaljuje od zaÄetka dokumenta."
msgid "Searching subfile %s ..."
msgstr "Iskanje poddatoteke %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "Iskanje je spodletelo."
@@ -1477,6 +1594,7 @@ msgstr " vzvratno"
#: info/session.c:4198
#, fuzzy, c-format
+#| msgid "%s%s%s [%s]: "
msgid "%s%s%s: "
msgstr "%s%s%s [%s]: "
@@ -1484,141 +1602,143 @@ msgstr "%s%s%s [%s]: "
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr ""
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "Iskanje poddatoteke %s ..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Preberi niz in ga iÅ¡Äi obÄutljivo na velikost Ärk"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Preberi niz in ga poiÅ¡Äi"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Preberi niz in ga poiÅ¡Äi v smeri nazaj"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Ponovi zadnje iskanje v isti smeri"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Brez niza predhodnega iskanja"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Ponovi zadnje iskanje v obratni smeri"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Ko se vpisuje niz, ga iÅ¡Äi vzajemno"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Vzvratno I-iskanje logiÄnega izraza: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-iskanje vzvratno: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "I-iskanje logiÄnega izraza: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-iskanje: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Spodletelo "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "PrekliÄi trenutno opravilo"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "KonÄaj"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "prikaži podrobnosti razliÄice in konÄaj"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Osveži zaslon"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "KonÄaj z uporabo Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Zaženi ukaz, doloÄen tej izvedbi tipke z malimi Ärkami"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "Neznan ukaz (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" je neveljaven"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "`%s' is invalid"
msgid "'%s' is invalid"
msgstr "`%s' je neveljaven"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Dodaj to Å¡tevko trenutnemu Å¡tevilskemu argumentu"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "ZaÄni (ali zmnoži s 4) trenutni Å¡tevilski argument"
@@ -1704,6 +1824,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "Pomakni se na naslednji navzkrižni sklic"
@@ -1764,6 +1885,7 @@ msgstr "%s: prazna datoteka"
#: install-info/install-info.c:291
#, fuzzy, c-format
+#| msgid " for %s"
msgid "%s for %s"
msgstr " za %s"
@@ -1798,6 +1920,18 @@ msgstr ""
#: install-info/install-info.c:552
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " --debug report what is being done.\n"
+#| " --delete delete existing entries for INFO-FILE from DIR-"
+#| "FILE;\n"
+#| " don't insert any new entries.\n"
+#| " --description=TEXT the description of the entry is TEXT; used with\n"
+#| " the --name option to become synonymous with the\n"
+#| " --entry option.\n"
+#| " --dir-file=NAME specify file name of Info directory file;\n"
+#| " equivalent to using the DIR-FILE argument.\n"
+#| " --dry-run same as --test."
msgid ""
" --debug report what is being done.\n"
" --delete delete existing entries for INFO-FILE from DIR-FILE;\n"
@@ -1825,6 +1959,21 @@ msgstr ""
#: install-info/install-info.c:565
#, fuzzy
+#| msgid ""
+#| " --entry=TEXT insert TEXT as an Info directory entry.\n"
+#| " TEXT is written as an Info menu item line followed\n"
+#| " by zero or more extra lines starting with "
+#| "whitespace.\n"
+#| " If you specify more than one entry, all are added.\n"
+#| " If you don't specify any entries, they are "
+#| "determined\n"
+#| " from information in the Info file itself.\n"
+#| " When removing, TEXT specifies the entry to remove.\n"
+#| " TEXT is only removed as a last resort, if the\n"
+#| " entry as determined from the Info file is not "
+#| "present,\n"
+#| " and the basename of the Info file isn't found "
+#| "either."
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry,\n"
" overriding any corresponding entry from DIR-FILE.\n"
@@ -1850,6 +1999,19 @@ msgstr ""
#: install-info/install-info.c:574
#, fuzzy
+#| msgid ""
+#| " --help display this help and exit.\n"
+#| " --info-dir=DIR same as --dir-file=DIR/dir.\n"
+#| " --info-file=FILE specify Info file to install in the directory;\n"
+#| " equivalent to using the INFO-FILE argument.\n"
+#| " --item=TEXT same as --entry=TEXT.\n"
+#| " --keep-old do not replace entries, or remove empty sections.\n"
+#| " --menuentry=TEXT same as --name=TEXT.\n"
+#| " --name=TEXT the name of the entry is TEXT; used with --"
+#| "description\n"
+#| " to become synonymous with the --entry option.\n"
+#| " --no-indent do not format new entries in the DIR file.\n"
+#| " --quiet suppress warnings."
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1872,6 +2034,19 @@ msgstr ""
#: install-info/install-info.c:582
#, fuzzy
+#| msgid ""
+#| " --help display this help and exit.\n"
+#| " --info-dir=DIR same as --dir-file=DIR/dir.\n"
+#| " --info-file=FILE specify Info file to install in the directory;\n"
+#| " equivalent to using the INFO-FILE argument.\n"
+#| " --item=TEXT same as --entry=TEXT.\n"
+#| " --keep-old do not replace entries, or remove empty sections.\n"
+#| " --menuentry=TEXT same as --name=TEXT.\n"
+#| " --name=TEXT the name of the entry is TEXT; used with --"
+#| "description\n"
+#| " to become synonymous with the --entry option.\n"
+#| " --no-indent do not format new entries in the DIR file.\n"
+#| " --quiet suppress warnings."
msgid ""
" --maxwidth, --max-width=COL wrap description at column COL.\n"
" --menuentry=TEXT same as --name=TEXT.\n"
@@ -1923,6 +2098,23 @@ msgstr ""
#: install-info/install-info.c:639
#, fuzzy, c-format
+#| msgid ""
+#| "This is the file .../info/dir, which contains the\n"
+#| "topmost node of the Info hierarchy, called (dir)Top.\n"
+#| "The first time you invoke Info you start off looking at this node.\n"
+#| "\n"
+#| "%s\tThis is the top of the INFO tree\n"
+#| "\n"
+#| " This (the Directory node) gives a menu of major topics.\n"
+#| " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+#| " \"h\" gives a primer for first-timers,\n"
+#| " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+#| "\n"
+#| " In Emacs, you can click mouse button 2 on a menu item or cross "
+#| "reference\n"
+#| " to select it.\n"
+#| "\n"
+#| "%s\n"
msgid ""
"This is the file .../info/dir, which contains the\n"
"topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -1958,16 +2150,15 @@ msgstr ""
#: install-info/install-info.c:663
#, fuzzy, c-format
+#| msgid "%s: could not read (%s) and could not create (%s)\n"
msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: ni mogoÄe brati (%s) in ni mogoÄe ustvariti (%s)\n"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY nima ujemajoÄega END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY nima ujemajoÄega START-INFO-DIR-ENTRY"
@@ -1997,17 +2188,16 @@ msgid "excess command line argument `%s'"
msgstr "presežen argument ukazne vrstice `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Navedene ni nobene datoteke vnosa; za veÄ podrobnosti poskusite --help"
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Navedene ni nobene datoteke map; za veÄ podrobnosti poskusite --help"
#: install-info/install-info.c:2301
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not read %s."
msgstr "Ni bilo mogoÄe ustvariti izhodne datoteke `%s'."
@@ -2021,307 +2211,294 @@ msgstr "v `%s' ni nobene datoteke info"
msgid "no entries found for `%s'; nothing deleted"
msgstr "za `%s' ni najdenih nobenih vnosov; niÄ ni izbrisano"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open %s for writing: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid language code"
msgstr "%s ni veljavna koda jezika ISO 639"
-#: tp/Texinfo/Common.pm:1157
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid region code"
msgstr "%s ni veljavna koda jezika ISO 639"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not read %s: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s: could not find %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, fuzzy, perl-format
-msgid "could not open %s: %s"
-msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, fuzzy, perl-format
+#| msgid "macro `%s' previously defined"
msgid "@%s `%s' previously defined"
msgstr "makro `%s' je bil predhodno doloÄen"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, fuzzy, perl-format
+#| msgid "here is the previous definition of `%s'"
msgid "here is the previous definition as @%s"
msgstr "tukaj je predhodna doloÄitev `%s'"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "empty argument in @%s"
msgstr "Slab argument k @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing %s: %s"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directories `%s' or `%s': %s"
msgstr "Ni mogoÄe ustvariti mape `%s': %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directory `%s': %s"
msgstr "Ni mogoÄe ustvariti mape `%s': %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, fuzzy, perl-format
+#| msgid "@image file `%s' unreadable: %s"
msgid "@image file `%s' not found, using `%s'"
msgstr "datoteka @image `%s' je neberljiva: %s"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
+#| msgid "No node name specified for `%c%s' command"
msgid "no argument specified for @U"
msgstr "Za ukaz `%c%s' ni navedenega nobenega imena vozliÅ¡Äa"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, fuzzy, perl-format
+#| msgid "@image file `%s' (for HTML) not readable: %s"
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image datoteka `%s' (za HTML) ni berljiva: %s"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open html refs config file %s: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
#, fuzzy
+#| msgid "missing action name"
msgid "missing type"
msgstr "manjka ime dejanja"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, fuzzy, perl-format
+#| msgid "%s: unrecognized option `--%s'\n"
msgid "unrecognized type: %s"
msgstr "%s: neprepoznana možnost `--%s'\n"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing html refs config file %s: %s"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
#, fuzzy
+#| msgid "%s:%d: --css-file ended in comment"
msgid "--css-include ended in comment"
msgstr "%s:%d: --css-file se je konÄala v komentarju"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open --include-file %s: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing CSS file %s: %s"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, fuzzy, perl-format
+#| msgid "no index entries found for `%s'\n"
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "Za `%s' ni najdenih nobenih vnosov kazal\n"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing frame file %s: %s"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing TOC frame file %s: %s"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing redirection node file %s: %s"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, fuzzy, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "Brez `Pred' ali `Gor' za to vozliÅ¡Äe znotraj tega dokumenta."
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, fuzzy, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "nesklicevano vozliÅ¡Äe `%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
#, fuzzy
+#| msgid "No menu in this node."
msgid "document without nodes"
msgstr "V tem vozliÅ¡Äu ni menijev."
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, fuzzy, perl-format
+#| msgid "(outside of any node)"
msgid "@%s outside of any node"
msgstr "(zunaj vseh vozliÅ¡Ä)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, fuzzy, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, fuzzy, c-format, perl-format
+#| msgid "Entry for index `%s' outside of any node"
msgid "entry for index `%s' outside of any node"
msgstr "Vnos za kazalo `%s' je zunaj vseh vozliÅ¡Ä"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing image text file %s: %s"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "datoteka @image `%s' je neberljiva: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2329,646 +2506,747 @@ msgstr ""
"@strong{Opomba ...} ustvari lažni navzkrižni sklic v Info; ponovno ubesedite "
"za izognitev temu"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, fuzzy, perl-format
+#| msgid "No %sindex entries containing `%s'."
msgid "@%s node name should not contain `%s'"
msgstr "Brez vnosov %skazala, ki vsebuje `%s'."
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, fuzzy, perl-format
+#| msgid "`.' or `,' must follow @%s, not `%c'"
msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' ali `,' morata slediti @%s, ne `%c'"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
#, fuzzy
+#| msgid "`.' or `,' must follow @%s, not `%c'"
msgid "`.' or `,' must follow @xref"
msgstr "`.' ali `,' morata slediti @%s, ne `%c'"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:762
+#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "could not open %s: %s"
+msgstr "%s: ni mogoÄe odpreti --css-file: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s potrebuje ime"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad name for @%s"
msgstr "Slab argument k @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s manjka zaklepaj"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' priÄakovan `%s', toda viden je `%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, fuzzy, perl-format
+#| msgid "No matching `%cend %s'"
msgid "no matching `%cend %s'"
msgstr "Ni ujemajoÄega `%cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, fuzzy, perl-format
+#| msgid "Misplaced %c"
msgid "misplaced %c"
msgstr "NapaÄno postavljen %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, fuzzy, perl-format
+#| msgid "Unmatched `%c%s'"
msgid "unmatched `%c%s'"
msgstr "NeujemajoÄ `%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' called with too many args"
msgstr "Makro `%s' je klican v vrstici %d s preveÄ argumenti"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s missing close brace"
msgid "@%s missing closing brace"
msgstr "%c%s manjka zaklepaj"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' declared without argument called with an argument"
msgstr "Makro `%s' je klican v vrstici %d s preveÄ argumenti"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, fuzzy, c-format, perl-format
+#| msgid "\\ in macro expansion followed by `%s' instead of parameter name"
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ v razširitvi makra, ki mu namesto imena parametra sledi `%s'"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, fuzzy, c-format, perl-format
+#| msgid "missing action name"
msgid "missing name for @%s"
msgstr "manjka ime dejanja"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "unexpected argument on @%s line: %s"
msgstr "Slab argument k @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
#, fuzzy
+#| msgid "%s: empty file"
msgid "empty multitable"
msgstr "%s: prazna datoteka"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "superfluous argument to @%s"
msgstr "Slab argument k @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad argument to @%s"
msgstr "Slab argument k @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s potrebuje argument: oblikovalnik za %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, fuzzy, c-format, perl-format
+#| msgid "%s: option `--%s' doesn't allow an argument\n"
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "%s: možnost `--%s' ne dovoljuje argumenta\n"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing argument"
msgstr "%s: manjka argument datoteke.\n"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown @end %s"
msgstr "Neznano kazalo `%s'"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, fuzzy, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "superfluous argument to @%s %s: %s"
msgstr "Slab argument k @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "bad argument to @%s: %s"
msgstr "Slab argument k @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s: could not open %s: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "neprepoznano ime kodiranja `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, fuzzy, perl-format
+#| msgid "@%s not meaningful outside `@titlepage' environment"
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s ni smiselen zunaj okolja `@titlepage'"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, fuzzy, c-format, perl-format
+#| msgid "No menu in node `%s'."
msgid "empty menu entry name in `%s'"
msgstr "V vozliÅ¡Äu `%s' ni menijev."
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, fuzzy, c-format, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s should not appear in @%s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@end %s should only appear at the beginning of a line"
msgstr "UniÄi do zaÄetka vrstice"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro `%s' je bil predhodno doloÄen"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "tukaj je predhodna doloÄitev `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, fuzzy, c-format, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "use braces to give a command as an argument to @%s"
msgstr "Če želite dati ukaz kot argument v @%s, uporabite oklepaje"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, fuzzy, perl-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s priÄakuje `i' ali `j' kot argument, ne `%c'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s expected braces"
msgid "@%s expected braces"
msgstr "%c%s priÄakovani so oklepaji"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown command `%s'"
msgid "unknown command `%s'"
msgstr "Neznan ukaz `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "nedoloÄena zastavica: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete."
msgstr "%c%s je zastarel"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete; %s"
msgstr "%c%s je zastarel"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@%s should only appear at the beginning of a line"
msgstr "UniÄi do zaÄetka vrstice"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s ni smiselno znotraj bloka `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, fuzzy, c-format, perl-format
+#| msgid "%s: empty file"
msgid "@%s in empty multitable"
msgstr "%s: prazna datoteka"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, fuzzy, c-format, perl-format
+#| msgid "Too many columns in multitable item (max %d)"
msgid "too many columns in multitable item (max %d)"
msgstr "PreveÄ stolpcev v predmetu veÄih razpredelnic (najveÄ %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "prezrtje @tab izven veÄih razpredelnic"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, fuzzy, perl-format
+#| msgid "@%s not meaningful inside `@%s' block"
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s ni smiselno znotraj bloka `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, fuzzy, c-format, perl-format
+#| msgid "Must be in `@%s' environment to use `@%s'"
msgid "must be after `@%s' to use `@%s'"
msgstr "Mora biti v okolju `@%s' za uporabo `@%s'"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s ni smiselen zunaj okolij `@titlepage' in `@quotation'"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, fuzzy, c-format, perl-format
+#| msgid "Footnotes inside footnotes are not allowed"
msgid "region %s inside region %s is not allowed"
msgstr "Sprotne opombe znotraj sprotnih opomb niso dovoljene"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, fuzzy, c-format, perl-format
+#| msgid "@menu seen before first @node, creating `Top' node"
msgid "@%s seen before first @node"
msgstr "@menu je bil viden pred prvim @node, ki je ustvarilo vozliÅ¡Äe `Top'"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"Morda bi vaÅ¡e vozliÅ¡Äe @top moralo biti ovito v @ifnottex namesto @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
#, fuzzy
+#| msgid "Expected `%s'"
msgid "unexpected @"
msgstr "PriÄakovan `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, fuzzy, c-format, perl-format
+#| msgid "@%s not meaningful outside `@float' environment"
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s ni smiselno zunaj okolja `@float'"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image manjka argument imena datoteke"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing first argument"
msgstr "%s: manjka argument datoteke.\n"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "non-hex digits in argument for @U: %s"
msgstr "Slab argument k @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, fuzzy, c-format, perl-format
+#| msgid "Expected `%s'"
msgid "expected @end %s"
msgstr "PriÄakovan `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "Če želite dati ukaz kot argument v @%s, uporabite oklepaje"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "remaining argument on @%s line: %s"
msgstr "Slab argument k @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "environment command %s as argument to @%s"
msgstr "Če želite dati ukaz kot argument v @%s, uporabite oklepaje"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown source index in @%s: %s"
msgstr "Neznano kazalo `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s' in @printindex"
msgid "unknown index `%s' in @printindex"
msgstr "Neznano kazalo `%s' v @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Podprt je samo @%s 10 ali 11, ne `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, fuzzy, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, fuzzy, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s argument mora biti Å¡tevilski, ne `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, fuzzy, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, fuzzy, c-format, perl-format
+#| msgid "Expected @%s on or off, not `%s'"
msgid "expected @%s on or off, not `%s'"
msgstr "PriÄakuje se @%s on ali off, namesto \"%s\""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
@@ -2998,8 +3276,10 @@ msgstr ""
msgid "@%s not empty"
msgstr ""
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, fuzzy, perl-format
+#| msgid ""
+#| "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s sklicevanje na neobstojeÄe vozliÅ¡Äe `%s' (morda nepravilno ustvarjanje "
@@ -3010,216 +3290,234 @@ msgstr ""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nesklicevano vozliÅ¡Äe `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, fuzzy, perl-format
+#| msgid "unreferenced node `%s'"
msgid "%s reference to nonexistent `%s'"
msgstr "nesklicevano vozliÅ¡Äe `%s'"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, fuzzy, perl-format
+#| msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"VozliÅ¡Äu `%s' manjka predmet menija za `%s', kljub temu, da je njegov "
"Zgornji cilj"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open %s: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not load %s: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open %s for writing: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "tex4ht.pm: could not open %s: %s"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, fuzzy, perl-format
+#| msgid "error writing to `%s'"
msgid "error loading %s: %s\n"
msgstr "napaka med branjem v `%s'"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s"
msgstr "neznano dejanje `%s'"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s\n"
msgstr "neznano dejanje `%s'"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
msgid "could not read init file %s"
msgstr "Ni bilo mogoÄe ustvariti izhodne datoteke `%s'."
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, fuzzy, perl-format
+#| msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "%s: Prezrtje neprepoznane vrednosti TEXINFO_OUTPUT_FORMAT `%s'.\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uporaba: %s [MOŽNOST] ... DATOTEKA-TEXINFO ...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
#, fuzzy
+#| msgid ""
+#| "Translate Texinfo source documentation to various other formats, by "
+#| "default\n"
+#| "Info files suitable for reading online with Emacs or standalone GNU "
+#| "Info.\n"
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3231,8 +3529,20 @@ msgstr ""
"datoteke Info, ki so primerne za branje na spletu z Emacs ali samostojnim "
"GNU Info.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, fuzzy, perl-format
+#| msgid ""
+#| "General options:\n"
+#| " --error-limit=NUM quit after NUM errors (default %d).\n"
+#| " --document-language=STR locale to use in translating Texinfo "
+#| "keywords\n"
+#| " for the output document (default C).\n"
+#| " --force preserve output even if errors.\n"
+#| " --help display this help and exit.\n"
+#| " --no-validate suppress node cross-reference validation.\n"
+#| " --no-warn suppress warnings (but not errors).\n"
+#| " -v, --verbose explain what is being done.\n"
+#| " --version display version information and exit.\n"
msgid ""
"General options:\n"
" --document-language=STR locale to use in translating Texinfo keywords\n"
@@ -3261,8 +3571,14 @@ msgstr ""
" -v, --verbose pojasnitev, kaj se dogaja.\n"
" --version prikaži podrobnosti razliÄice in konÄaj.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
+#| msgid ""
+#| "Output format selection (default is to produce Info):\n"
+#| " --docbook output Docbook XML rather than Info.\n"
+#| " --html output HTML rather than Info.\n"
+#| " --xml output Texinfo XML rather than Info.\n"
+#| " --plaintext output plain text rather than Info.\n"
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3278,8 +3594,26 @@ msgstr ""
" --xml izpiši Texinfo XML namesto Info.\n"
" --plaintext izpiÅ¡i obiÄajno besedilo namesto Info.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
#, fuzzy
+#| msgid ""
+#| "General output options:\n"
+#| " -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
+#| " ignoring any @setfilename.\n"
+#| " --no-headers suppress node separators, Node: lines, and "
+#| "menus\n"
+#| " from Info output (thus producing plain "
+#| "text)\n"
+#| " or from HTML (thus producing shorter "
+#| "output);\n"
+#| " also, write to standard output by "
+#| "default.\n"
+#| " --no-split suppress the splitting of Info or HTML "
+#| "output,\n"
+#| " generate only one output file.\n"
+#| " --number-sections output chapter and sectioning numbers.\n"
+#| " -o, --output=FILE output to FILE (or directory if split "
+#| "HTML).\n"
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3320,7 +3654,7 @@ msgstr ""
" --number-sections izpiši poglavje in številke ustvarjanja odsekov.\n"
" -o, --output=DATOTEKA izpiÅ¡i v DATOTEKO (ali mapo, Äe se razdeli HTML).\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3358,8 +3692,17 @@ msgstr ""
" `asis', ohrani obstojeÄi zamik.\n"
" --split-size=NUM razdeli datoteke Info na velikost NUM (privzeto %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
#, fuzzy
+#| msgid ""
+#| "Options for HTML:\n"
+#| " --css-include=FILE include FILE in HTML <style> output;\n"
+#| " read stdin if FILE is -.\n"
+#| " --css-ref=URL generate reference to a CSS file.\n"
+#| " --internal-links=FILE produce list of internal links in FILE.\n"
+#| " --transliterate-file-names\n"
+#| " produce file names in ASCII "
+#| "transliteration.\n"
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3382,20 +3725,28 @@ msgstr ""
" izdelaj imena datotek v transliteraciji "
"ASCII.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
#, fuzzy
+#| msgid ""
+#| "Input file options:\n"
+#| " --commands-in-node-names allow @ commands in node names.\n"
+#| " -D VAR define the variable VAR, as with @set.\n"
+#| " -I DIR append DIR to the @include search path.\n"
+#| " -P DIR prepend DIR to the @include search path.\n"
+#| " -U VAR undefine the variable VAR, as with "
+#| "@clear.\n"
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3412,8 +3763,27 @@ msgstr ""
" -P MAPA pripni MAPO na zaÄetek poti iskanja @include.\n"
" -U SPR razveljavi doloÄitev spremenljivke SPR, tako kot @clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
#, fuzzy
+#| msgid ""
+#| "Conditional processing in input:\n"
+#| " --ifdocbook process @ifdocbook and @docbook even if\n"
+#| " not generating Docbook.\n"
+#| " --ifhtml process @ifhtml and @html even if not generating "
+#| "HTML.\n"
+#| " --ifinfo process @ifinfo even if not generating Info.\n"
+#| " --ifplaintext process @ifplaintext even if not generating plain "
+#| "text.\n"
+#| " --iftex process @iftex and @tex; implies --no-split.\n"
+#| " --ifxml process @ifxml and @xml.\n"
+#| " --no-ifdocbook do not process @ifdocbook and @docbook text.\n"
+#| " --no-ifhtml do not process @ifhtml and @html text.\n"
+#| " --no-ifinfo do not process @ifinfo text.\n"
+#| " --no-ifplaintext do not process @ifplaintext text.\n"
+#| " --no-iftex do not process @iftex and @tex text.\n"
+#| " --no-ifxml do not process @ifxml and @xml text.\n"
+#| "\n"
+#| " Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3450,8 +3820,14 @@ msgstr ""
"\n"
" Za možnosti --no-ifFORMAT obdelaj besedilo @ifnotFORMAT.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
#, fuzzy
+#| msgid ""
+#| " The defaults for the @if... conditionals depend on the output format:\n"
+#| " if generating HTML, --ifhtml is on and the others are off;\n"
+#| " if generating Info, --ifinfo is on and the others are off;\n"
+#| " if generating plain text, --ifplaintext is on and the others are off;\n"
+#| " if generating XML, --ifxml is on and the others are off.\n"
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3467,8 +3843,25 @@ msgstr ""
"izkljuÄeni;\n"
" Äe se ustvarja XML, je --ifxml vkljuÄen in vsi ostali izkljuÄeni;\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
#, fuzzy
+#| msgid ""
+#| "Examples:\n"
+#| " makeinfo foo.texi write Info to foo's "
+#| "@setfilename\n"
+#| " makeinfo --html foo.texi write HTML to @setfilename\n"
+#| " makeinfo --xml foo.texi write Texinfo XML to "
+#| "@setfilename\n"
+#| " makeinfo --docbook foo.texi write DocBook XML to "
+#| "@setfilename\n"
+#| " makeinfo --no-headers foo.texi write plain text to standard "
+#| "output\n"
+#| "\n"
+#| " makeinfo --html --no-headers foo.texi write html without node lines, "
+#| "menus\n"
+#| " makeinfo --number-sections foo.texi write Info with numbered "
+#| "sections\n"
+#| " makeinfo --no-split foo.texi write one Info file however big\n"
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3497,88 +3890,344 @@ msgstr ""
" makeinfo --no-split foo.texi zapiši eno datoteko Info, ne glede na "
"velikost\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "unknown tree transformation %s"
msgstr "neznano dejanje `%s'"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: manjka argument datoteke.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Za veÄ podrobnosti poskusite `%s --help'.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing macro expand file %s: %s\n"
msgstr "napaka med konÄanjem datoteke vnosa `%s'"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open %s for writing: %s\n"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, fuzzy, perl-format
+#| msgid "%s: ignoring second internal links output `%s'.\n"
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: prezrtje drugega notranjega izhoda povezav `%s'.\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: ni mogoÄe odpreti --css-file: %s"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "No matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "Ni ujemajoÄega `%cend %s'"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced {"
+msgstr "NapaÄno postavljen %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "NeujemajoÄ `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s potrebuje ime"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s potrebuje ime"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s potrebuje ime"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "Če želite dati ukaz kot argument v @%s, uporabite oklepaje"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "Če želite dati ukaz kot argument v @%s, uporabite oklepaje"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "Slab argument k @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "Slab argument k @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "Slab argument k @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Podprt je samo @%s 10 ali 11, ne `%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "Slab argument k @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"%s: --paragraph-indent argument mora biti Å¡tevilski/`none'/`asis', ne `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "Slab argument k @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s potrebuje argument: oblikovalnik za %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "NeujemajoÄ `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "Slab argument k @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "Slab argument k @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "@include: could not open %s:"
+msgstr "%s: ni mogoÄe odpreti --css-file: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s ni smiselno znotraj bloka `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s ni smiselno znotraj bloka `@%s'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s ni smiselen zunaj okolij `@titlepage' in `@quotation'"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s potrebuje ime"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s priÄakuje `i' ali `j' kot argument, ne `%c'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "nedoloÄena zastavica: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete."
+msgstr "%c%s je zastarel"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s je zastarel"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s priÄakuje `i' ali `j' kot argument, ne `%c'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced }"
+msgstr "NapaÄno postavljen %c"
+
+#, c-format
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: nedovoljena možnost -- %c\n"
+#, c-format
#~ msgid "%s: option `-W %s' is ambiguous\n"
#~ msgstr "%s: možnost `-W %s' je dvoumna\n"
+#, c-format
#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
#~ msgstr "%s: možnost `-W %s' ne dovoli argumenta\n"
@@ -3597,6 +4246,7 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "CAN'T SEE THIS"
#~ msgstr "TEGA NI MOGOÄŒE VIDETI"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "* Menu: Nodes whose indices contain `%s':\n"
@@ -3634,24 +4284,31 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ "Osnovni ukazi v Oknih Info\n"
#~ "******************************\n"
+#, c-format
#~ msgid " %-10s Quit this help.\n"
#~ msgstr " %-10s KonÄaj to pomoÄ.\n"
+#, c-format
#~ msgid " %-10s Quit Info altogether.\n"
#~ msgstr " %-10s KonÄaj Info v celoti.\n"
+#, c-format
#~ msgid " %-10s Invoke the Info tutorial.\n"
#~ msgstr " %-10s PrikliÄi vodnik Info.\n"
+#, c-format
#~ msgid " %-10s Move to the `next' node of this node.\n"
#~ msgstr " %-10s Pomakni se v `naslednje' vozliÅ¡Äe tega vozliÅ¡Äa.\n"
+#, c-format
#~ msgid " %-10s Move to the `previous' node of this node.\n"
#~ msgstr " %-10s Pomakni se v `predhodno' vozliÅ¡Äe tega vozliÅ¡Äa.\n"
+#, c-format
#~ msgid " %-10s Move `up' from this node.\n"
#~ msgstr " %-10s Pomakni se `gor' iz tega vozliÅ¡Äa.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Pick menu item specified by name.\n"
#~ " Picking a menu item causes another node to be selected.\n"
@@ -3660,22 +4317,28 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ " Izbira predmeta menija povzroÄi, da je izbrano drugo "
#~ "vozliÅ¡Äe.\n"
+#, c-format
#~ msgid " %-10s Follow a cross reference. Reads name of reference.\n"
#~ msgstr " %-10s Sledi navzkrižni sklic. Prebere ime sklica.\n"
+#, c-format
#~ msgid " %-10s Move to the last node seen in this window.\n"
#~ msgstr " %-10s Pomakni se v zadnje videno vozliÅ¡Äe v tem oknu\n"
+#, c-format
#~ msgid " %-10s Skip to next hypertext link within this node.\n"
#~ msgstr ""
#~ " %-10s PreskoÄi na naslednjo hiperbesedilno povezavo v tem vozliÅ¡Äu.\n"
+#, c-format
#~ msgid " %-10s Follow the hypertext link under cursor.\n"
#~ msgstr " %-10s Sledi hiperbesedilni povezavi pod kazalko.\n"
+#, c-format
#~ msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"
#~ msgstr " %-10s Pomakni se v vozliÅ¡Äe `map'. Enakovredno `g (DIR)'.\n"
+#, c-format
#~ msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n"
#~ msgstr " %-10s Premakni se v NajviÅ¡je vozliÅ¡Äe. Enakovredno `g Top'.\n"
@@ -3686,21 +4349,27 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ "Premikanje znotraj vozliÅ¡Äa:\n"
#~ "---------------------\n"
+#, c-format
#~ msgid " %-10s Scroll forward a page.\n"
#~ msgstr " %-10s Pomakni se naprej za eno stran.\n"
+#, c-format
#~ msgid " %-10s Scroll backward a page.\n"
#~ msgstr " %-10s Pomakni se nazaj za eno stran.\n"
+#, c-format
#~ msgid " %-10s Go to the beginning of this node.\n"
#~ msgstr " %-10s Pojdi na zaÄetek tega vozliÅ¡Äa\n"
+#, c-format
#~ msgid " %-10s Go to the end of this node.\n"
#~ msgstr " %-10s Pojdi na konec tega vozliÅ¡Äa\n"
+#, c-format
#~ msgid " %-10s Scroll forward 1 line.\n"
#~ msgstr " %-10s Pomakni se naprej za 1 vrstico.\n"
+#, c-format
#~ msgid " %-10s Scroll backward 1 line.\n"
#~ msgstr " %-10s Pomakni se nazaj za 1 vrstico.\n"
@@ -3711,12 +4380,15 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ "Drugi ukazi:\n"
#~ "---------------\n"
+#, c-format
#~ msgid " %-10s Pick first...ninth item in node's menu.\n"
#~ msgstr " %-10s Izberi prvi ... deveti predmet v meniju vozliÅ¡Äa.\n"
+#, c-format
#~ msgid " %-10s Pick last item in node's menu.\n"
#~ msgstr " %-10s Izberi zadnji predmet v meniju vozliÅ¡Äa.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search for a specified string in the index entries of this Info\n"
#~ " file, and select the node referenced by the first entry "
@@ -3725,6 +4397,7 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ " %-10s PoiÅ¡Äi doloÄen niz v vnosih kazala te datoteke Info in izberi\n"
#~ " vozliÅ¡Äe, sklicevano s prvim najdenim vnosom.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Move to node specified by name.\n"
#~ " You may include a filename as well, as in "
@@ -3734,6 +4407,7 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ " VkljuÄite lahko tudi ime datoteke na naÄin "
#~ "(IME_DATOTEKE)IME_VOZLIÅ ÄŒA.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search forward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3742,6 +4416,7 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ " in izberi vozliÅ¡Äe, v katerem je najdena naslednja "
#~ "pojavitev.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search backward for a specified string,\n"
#~ " and select the node in which the next occurrence is found.\n"
@@ -3750,9 +4425,11 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ " in izberi vozliÅ¡Äe, v katerem je najdena naslednja "
#~ "pojavitev.\n"
+#, c-format
#~ msgid "ESC %s is undefined."
#~ msgstr "ESC %s je nedoloÄen."
+#, c-format
#~ msgid "%s is defined to %s."
#~ msgstr "%s je doloÄen k %s."
@@ -3766,12 +4443,14 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "incorrect number of arguments"
#~ msgstr "neveljavno Å¡tevilo argumentov"
+#, c-format
#~ msgid "cannot create output file `%s'"
#~ msgstr "ni mogoÄe ustvariti datoteke vnosa `%s'"
#~ msgid "section too long"
#~ msgstr "odsek je predolg"
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INPUT-FILE]\n"
#~ "\n"
@@ -3795,31 +4474,38 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ " --help prikaži to pomoÄ in konÄaj\n"
#~ " --version prikaži podrobnosti razliÄice in konÄaj.\n"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too small"
#~ msgstr "Preziranje neveljavne datoteke infokey `%s' - premajhna"
+#, c-format
#~ msgid "Ignoring invalid infokey file `%s' - too big"
#~ msgstr "Preziranje neveljavne datoteke infokey `%s' - prevelika"
+#, c-format
#~ msgid "Error reading infokey file `%s' - short read"
#~ msgstr "Napaka med branjem datoteke infokey `%s' - kratko branje"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
#~ msgstr ""
#~ "Neveljavna datoteka infokey `%s' (slabe magiÄne Å¡tevilke) - zaženite "
#~ "infokey za posodobitev"
+#, c-format
#~ msgid "Your infokey file `%s' is out of date -- run infokey to update it"
#~ msgstr ""
#~ "Vaša datoteka infokey `%s' je zastarela - zaženite infokey za posodobitev"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
#~ msgstr ""
#~ "Neveljavna datoteka infokey `%s' (slaba dolžina odseka) -- zaženite "
#~ "infokey za posodobitev"
+#, c-format
#~ msgid ""
#~ "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
#~ msgstr ""
@@ -3835,6 +4521,7 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ "Slabi podatki v datoteki infokey -- nekatere nastavitve spremenljivk so "
#~ "prezrte"
+#, c-format
#~ msgid "Undefined command: %s"
#~ msgstr "NedoloÄen ukaz: %s"
@@ -3844,9 +4531,11 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "No `Prev' for this node."
#~ msgstr "Brez `Pred' za to vozliÅ¡Äe."
+#, c-format
#~ msgid "Kill node (%s): "
#~ msgstr "UniÄi vozliÅ¡Äe (%s): "
+#, c-format
#~ msgid "Cannot kill node `%s'"
#~ msgstr "VozliÅ¡Äa `%s' ni mogoÄe uniÄiti"
@@ -3862,21 +4551,26 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "Internally used by \\[universal-argument]"
#~ msgstr "Notranja uporaba s \\[universal-argument]"
+#, c-format
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "vrstica branja: zmanjkalo je navideznega pomnilnika!\n"
#~ msgid "--*** Tags out of Date ***"
#~ msgstr "--*** Zastarele oznake ***"
+#, c-format
#~ msgid "-%s---Info: %s, %d lines --%s--"
#~ msgstr "-%s---Info: %s, %d vrstic --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
#~ msgstr "-%s%s-Info: (%s)%s, %d vrstic --%s--"
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr " Poddatoteka: %s"
+#, c-format
#~ msgid "%s: warning: "
#~ msgstr "%s: opozorilo: "
@@ -3886,6 +4580,7 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "fflush error on stdout\n"
#~ msgstr "napaka fflush na stdout\n"
+#, c-format
#~ msgid "arguments to @%s ignored"
#~ msgstr "argumenti k @%s so prezrti"
@@ -3928,18 +4623,22 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "@sc argument all uppercase, thus no effect"
#~ msgstr "argument @sc ima same velike Ärke in zato nima uÄinka"
+#, c-format
#~ msgid "`{' expected, but saw `%c'"
#~ msgstr "priÄakovan je `{', toda viden je bil `%c'"
#~ msgid "end of file inside verb block"
#~ msgstr "konec datoteke znotraj bloka glagolov"
+#, c-format
#~ msgid "`}' expected, but saw `%c'"
#~ msgstr "priÄakovan je `}', toda viden je `%c'"
+#, c-format
#~ msgid "@sp requires a positive numeric argument, not `%s'"
#~ msgstr "@sp potrebuje pozitiven Å¡tevilski argument, ne `%s'"
+#, c-format
#~ msgid "Bad argument to %c%s"
#~ msgstr "Slab argument k %c%s"
@@ -3955,27 +4654,33 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "Missing `}' in @def arg"
#~ msgstr "Manjka `}' v argumentu @def"
+#, c-format
#~ msgid "%s: getwd: %s, %s\n"
#~ msgstr "%s: getwd: %s, %s\n"
+#, c-format
#~ msgid "`%s' omitted before output filename"
#~ msgstr "`%s' je izpuÅ¡Äen pred imenom datoteke izpisa"
+#, c-format
#~ msgid "`%s' omitted since writing to stdout"
#~ msgstr "`%s' je izpuÅ¡Äen od zapisovanja v stdout"
#~ msgid "Output buffer not empty."
#~ msgstr "Medpomnilnik izpisa ni prazen."
+#, c-format
#~ msgid "Requested float type `%s' not previously used"
#~ msgstr "Zahtevana vrsta realnega Å¡tevila `%s' ni bila predhodno uporabljena"
#~ msgid "See "
#~ msgstr "Poglej "
+#, c-format
#~ msgid "`%c%s' needs an argument `{...}', not just `%s'"
#~ msgstr "`%c%s' potrebuje argument `{...}', ne samo `%s'"
+#, c-format
#~ msgid "No closing brace for footnote `%s'"
#~ msgstr "Ni zaklepaja za sprotno opombo `%s'"
@@ -3988,21 +4693,26 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "[unexpected] no html tag to pop"
#~ msgstr "[nepriÄakovano] brez oznake html za prikaz"
+#, c-format
#~ msgid "[unexpected] invalid node name: `%s'"
#~ msgstr "[nepriÄakovano] neveljavno ime vozliÅ¡Äa: `%s'"
+#, c-format
#~ msgid "Info cannot handle `:' in index entry `%s'"
#~ msgstr "Info ne zmore upravljati `:' v vnosu kazala`%s'"
+#, c-format
#~ msgid "Index `%s' already exists"
#~ msgstr "Kazalo `%s' že obstaja"
+#, c-format
#~ msgid "Unknown index `%s' and/or `%s' in @synindex"
#~ msgstr "Neznano kazalo `%s' in/ali `%s' v @synindex"
#~ msgid "(line )"
#~ msgstr "(vrstica )"
+#, c-format
#~ msgid "(line %*d)"
#~ msgstr "(vrstica %*d)"
@@ -4015,9 +4725,11 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "Enumeration stack overflow"
#~ msgstr "PrekoraÄitev sklada oÅ¡tevilÄenja"
+#, c-format
#~ msgid "%cfloat environments cannot be nested"
#~ msgstr "%cfload okolij ni mogoÄe gnezditi"
+#, c-format
#~ msgid "%s requires letter or digit"
#~ msgstr "%s zahteva Ärko ali Å¡tevilko"
@@ -4029,27 +4741,35 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ "@detailmenu je bil viden pred prvim vozliÅ¡Äem, ki je ustvarilo vozliÅ¡Äe "
#~ "`Top'"
+#, c-format
#~ msgid "`%c%s' needs something after it"
#~ msgstr "`%c%s' potrebuje nekaj za sabo"
+#, c-format
#~ msgid "Bad argument `%s' to `@%s', using `%s'"
#~ msgstr "Slab argument `%s' k `@%s', uporaba `%s'"
+#, c-format
#~ msgid "@itemx not meaningful inside `%s' block"
#~ msgstr "@itemx ni smiselen znotraj bloka `%s'"
+#, c-format
#~ msgid "%c%s found outside of an insertion block"
#~ msgstr "%c%s je najden zunaj vstavka bloka"
+#, c-format
#~ msgid "no default territory known for language `%s'"
#~ msgstr "ni privzetega obmoÄja, znanega za jezik `%s'"
+#, c-format
#~ msgid "sorry, encoding `%s' not supported"
#~ msgstr "kodiranje `%s' ni podprto"
+#, c-format
#~ msgid "%c%s expects a single character `i' or `j' as argument"
#~ msgstr "%c%s priÄakuje en znak `i' ali `j' kot argument"
+#, c-format
#~ msgid "%cend macro not found"
#~ msgstr "%cend makra ni mogoÄe najti"
@@ -4059,15 +4779,19 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "@quote-arg is deprecated; arguments are quoted by default"
#~ msgstr "@quote-arg je zastarel; argumenti so privzeto navedeni"
+#, c-format
#~ msgid "mismatched @end %s with @%s"
#~ msgstr "neujemajoÄ @end %s z @%s"
+#, c-format
#~ msgid "Too many errors! Gave up.\n"
#~ msgstr "PreveÄ napak! Opustitev.\n"
+#, c-format
#~ msgid "%s:%d: warning: "
#~ msgstr "%s:%d: opozorilo: "
+#, c-format
#~ msgid ""
#~ "Options for XML and Docbook:\n"
#~ " --output-indent=VAL indent XML elements by VAL spaces (default "
@@ -4081,27 +4805,34 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ " ÄŒe je VAL 0, je prezrljiv presledek "
#~ "opuÅ¡Äen.\n"
+#, c-format
#~ msgid "%s: could not open macro expansion output `%s'"
#~ msgstr "%s: ni mogoÄe odpreti izhoda razÅ¡iritve makra `%s'"
+#, c-format
#~ msgid "%s: ignoring second macro expansion output `%s'.\n"
#~ msgstr "%s: prezrtje drugega izhoda razširitve makra `%s'.\n"
+#, c-format
#~ msgid "%s: could not open internal links output `%s'"
#~ msgstr "%s: ni mogoÄe odpreti notranjega izhoda povezav `%s'"
+#, c-format
#~ msgid "Multiline command %c%s used improperly"
#~ msgstr "VeÄvrstiÄni ukaz %c%s je uporabljen nepravilno"
+#, c-format
#~ msgid "No `%s' found in `%s'"
#~ msgstr "Najdenega ni nobenega `%s' v `%s'"
+#, c-format
#~ msgid ""
#~ "%s: Skipping macro expansion to stdout as Info output is going there.\n"
#~ msgstr ""
#~ "%s: preskok širitve makra v stdout, ker je mesto pridržano za izhod "
#~ "Info.\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing macro output file `%s' due to errors; use --force to "
#~ "preserve.\n"
@@ -4109,12 +4840,14 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ "%s: Odstranjevanje datoteke izpisa makra `%s' zaradi napak; za ohranitev "
#~ "uporabite --force.\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
#~ msgstr ""
#~ "%s: Odstranjevanje datoteke izpisa `%s' zaradi napak; za ohranitev "
#~ "uporabite --force.\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing internal links output file `%s' due to errors; use --force "
#~ "to preserve.\n"
@@ -4125,43 +4858,55 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "NO_NAME!"
#~ msgstr "BREZ_IMENA!"
+#, c-format
#~ msgid "No such file `%s'"
#~ msgstr "Ni takšne datoteke `%s'"
+#, c-format
#~ msgid "@image file `%s' (for text) unreadable: %s"
#~ msgstr "@image datoteka `%s' (za besedilo) je neberljiva: %s"
+#, c-format
#~ msgid "{No value for `%s'}"
#~ msgstr "{Ni vrednosti za `%s'}"
+#, c-format
#~ msgid "Reached eof before matching @end %s"
#~ msgstr "Dosežen je bil konec datoteke pred ujemajoÄim @end %s"
+#, c-format
#~ msgid "`%.40s...' is too long for expansion; not expanded"
#~ msgstr "`%.40s...' je predolg za razširitev, brez razširitve"
#~ msgid "Missing } in @multitable template"
#~ msgstr "Manjka } v predlogi @multitable"
+#, c-format
#~ msgid "[unexpected] cannot select column #%d in multitable"
#~ msgstr ""
#~ "[nepriÄakovano] ni mogoÄe izbrati stolpca Å¡t. %d veÄih razpredelnicah"
+#, c-format
#~ msgid "** Multicolumn output from last row:\n"
#~ msgstr "** Izpis veÄih stolpcev iz zadnje vrste:\n"
+#, c-format
#~ msgid "* column #%d: output = %s\n"
#~ msgstr "* stolpec Å¡t.%d: izpis = %s\n"
+#, c-format
#~ msgid "Node `%s' previously defined at line %d"
#~ msgstr "VozliÅ¡Äe `%s' je predhodno doloÄeno v vrstici %d"
+#, c-format
#~ msgid "Formatting node %s...\n"
#~ msgstr "Oblikovanje vozliÅ¡Äa %s ...\n"
+#, c-format
#~ msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
#~ msgstr "VozliÅ¡Äe `%s' potrebuje ukaz ustvarjanja odsekov (npr. %c%s)"
+#, c-format
#~ msgid "Anchor `%s' and node `%s' map to the same file name"
#~ msgstr "Sidro `%s' in vozliÅ¡Äe `%s' sta preslikana na enako ime datoteke"
@@ -4171,54 +4916,69 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "Rename this anchor or use the `--no-split' option"
#~ msgstr "Preimenujte to sidro ali pa uporabite možnost `--no-split'"
+#, c-format
#~ msgid "Unexpected string at end of split-HTML file `%s'"
#~ msgstr "NepriÄakovan niz na koncu datoteke split-HTML `%s'"
+#, c-format
#~ msgid "Anchors `%s' and `%s' map to the same file name"
#~ msgstr "Sidri `%s' in `%s' sta preslikani na isto ime datoteke"
#~ msgid "@anchor command ignored; references to it will not work"
#~ msgstr "ukaz @anchor je prezrt; sklici nanj ne bodo delovali"
+#, c-format
#~ msgid ""
#~ "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
#~ msgstr ""
#~ "Na naslednje polje vozliÅ¡Äa `%s' ni kazano (morda nepravilno ustvarjanje "
#~ "odsekov?)"
+#, c-format
#~ msgid "This node (%s) has the bad Prev"
#~ msgstr "To vozliÅ¡Äe (%s) ima slab Pred."
+#, c-format
#~ msgid "Prev field of node `%s' not pointed to"
#~ msgstr "Pred. polje vozliÅ¡Äa `%s' ni kazano"
+#, c-format
#~ msgid "This node (%s) has the bad Next"
#~ msgstr "To vozliÅ¡Äe (%s) ima slab Naprej"
+#, c-format
#~ msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
#~ msgstr "`%s' nima polja Gor (morda nepravilno ustvarjanje odsekov?)"
+#, c-format
#~ msgid "Can't remove file `%s': %s"
#~ msgstr "Ni mogoÄe odstraniti datoteke `%s': %s"
+#, c-format
#~ msgid "Appendix %c"
#~ msgstr "Dodatek %c"
+#, c-format
#~ msgid "Internal error (search_sectioning) `%s'!"
#~ msgstr "Notranja napaka (search_sectioning) `%s'!"
+#, c-format
#~ msgid "Internal error (search_sectioning) \"%s\"!"
#~ msgstr "notranja napaka (search_sectioning) \"%s\"!"
+#, c-format
#~ msgid "%c%s is obsolete; use %c%s instead"
#~ msgstr "%c%s je zastarel; namesto tega uporabite %c%s"
+#, c-format
#~ msgid "Node with %ctop as a section already exists"
#~ msgstr "VozliÅ¡Äe z odsekom %ctop že obstaja"
+#, c-format
#~ msgid "Here is the %ctop node"
#~ msgstr "Tukaj je vozliÅ¡Äe %ctop"
+#, c-format
#~ msgid "%ctop used before %cnode, defaulting to %s"
#~ msgstr "%ctop je uporabljen pred %cnode. Uporabljen bo %s"
@@ -4238,6 +4998,7 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "First argument to cross-reference may not be empty"
#~ msgstr "Prvi argument k navzkrižnemu sklicu morda ni prazen"
+#, c-format
#~ msgid "Empty file name for HTML cross reference in `%s'"
#~ msgstr "Prazno ime datoteke za navzkrižni sklic HTML v `%s'"
@@ -4256,17 +5017,21 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ msgid "send output to FILE"
#~ msgstr "pošlji izpis v DATOTEKO"
+#, c-format
#~ msgid "Usage: %s [OPTION]... FILE...\n"
#~ msgstr "Uporaba: %s [IZBIRA] ... DATOTEKA ...\n"
+#, c-format
#~ msgid "Generate a sorted index for each TeX output FILE.\n"
#~ msgstr "Ustvari urejeno kazalo za vsako DATOTEKO izpisa TeX.\n"
+#, c-format
#~ msgid ""
#~ "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
#~ msgstr ""
#~ "ObiÄajno je DATOTEKA ... navedena kot `foo.%c%c' za dokument `foo.texi'.\n"
+#, c-format
#~ msgid ""
#~ "\n"
#~ "Options:\n"
@@ -4274,14 +5039,18 @@ msgstr "%s: ni mogoÄe odpreti --css-file: %s"
#~ "\n"
#~ "Možnosti:\n"
+#, c-format
#~ msgid "failure reopening %s"
#~ msgstr "ponovno odpiranje %s je spodletelo"
+#, c-format
#~ msgid "%s: not a texinfo index file"
#~ msgstr "%s: ni datoteka kazala texinfo"
+#, c-format
#~ msgid "No page number in %s"
#~ msgstr "Brez Å¡tevilk strani v %s"
+#, c-format
#~ msgid "entry %s follows an entry with a secondary name"
#~ msgstr "Vnos %s sledi vnosu z drugotnim imenom"
diff --git a/macros/texinfo/texinfo/po/sv.gmo b/macros/texinfo/texinfo/po/sv.gmo
index b772444d40..3830b312f3 100644
--- a/macros/texinfo/texinfo/po/sv.gmo
+++ b/macros/texinfo/texinfo/po/sv.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/sv.po b/macros/texinfo/texinfo/po/sv.po
index fd2ba8696f..a8e9950df0 100644
--- a/macros/texinfo/texinfo/po/sv.po
+++ b/macros/texinfo/texinfo/po/sv.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: texinfo 6.5.93\n"
+"Project-Id-Version: texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-13 23:23+0100\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-20 15:18+0200\n"
"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
#: gnulib/lib/error.c:195
@@ -42,7 +42,7 @@ msgstr "%s: okänd flagga â€%s%sâ€\n"
#: gnulib/lib/getopt.c:345
#, c-format
msgid "%s: option '%s%s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"%s%s\" tillåter inget argument\n"
+msgstr "%s: flaggan â€%s%s†tillÃ¥ter inget argument\n"
#: gnulib/lib/getopt.c:360
#, c-format
@@ -243,7 +243,6 @@ msgid "Insert completion"
msgstr "Infoga komplettering"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Bygger kompletteringar..."
@@ -271,7 +270,6 @@ msgid "found file %s"
msgstr "hittade fil %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Fotnoter kunde inte visas"
@@ -284,7 +282,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Fotnoter -----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Söker indexposter..."
@@ -293,7 +290,6 @@ msgid "Look up a string in the index for this file"
msgstr "Slå upp en sträng i indexet för denna fil"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Inga index hittades"
@@ -302,7 +298,6 @@ msgid "Index entry: "
msgstr "Indexpost: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Inga index hittades."
@@ -319,7 +314,6 @@ msgstr ""
"kommandot"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Det finns ingen tidigare indexsöksträng"
@@ -415,7 +409,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Inga tillgängliga infofiler har â€%s†i deras index"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Fel vid konvertering av teckenkodning för fil"
@@ -430,7 +423,6 @@ msgid "Cannot find node '%s'"
msgstr "Kan inte hitta noden â€%sâ€"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Inget programnamn angivet"
@@ -459,7 +451,7 @@ msgstr "värde %s är inte giltigt för variabel %s"
msgid "Try --help for more information.\n"
msgstr "Prova --help för mer information.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -553,7 +545,7 @@ msgstr ""
"\n"
"Det första argumentet som inte är en flagga är, om det finns, menyposten\n"
"att börja frÃ¥n. Det söks efter i alla â€dirâ€-filer i INFOPATH.\n"
-"Om den inte finns slår info samman alla \"dir\"-filer och visar resultatet.\n"
+"Om den inte finns slÃ¥r info samman alla â€dirâ€-filer och visar resultatet.\n"
"Alla återstående argument betraktas som namnen på menyposter\n"
"relativa till den först besökta noden."
@@ -593,7 +585,7 @@ msgstr ""
" info --subnodes -o ut.txt emacs dumpa hela emacs-manualen till ut.txt\n"
" info -f ./foo.info visa filen ./foo.info, sök inte i katalogen"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -898,17 +890,14 @@ msgid "could not open init file %s"
msgstr "kan inte öppna initfilen %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "nyckelsekvensen är för lång"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "nyckelsekvens saknas"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-tecknet (\\000) är inte tillåtet"
@@ -918,54 +907,47 @@ msgid "NUL character (^%c) not permitted"
msgstr "NUL-tecknet (^%c) är inte tillåtet"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "åtgärdsnamn saknas"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "kan inte binda nyckelsekvens till menysiffra"
#: info/infokey.c:478
#, c-format
msgid "unknown action `%s'"
-msgstr "okänd åtgärd \"%s\""
+msgstr "okänd Ã¥tgärd â€%sâ€"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "åtgärdsnamnet är för långt"
#: info/infokey.c:516
#, c-format
msgid "extra characters following action `%s'"
-msgstr "extra tecken följer på åtgärden \"%s\""
+msgstr "extra tecken följer pÃ¥ Ã¥tgärden â€%sâ€"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "variabelnamn saknas"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
-msgstr "\"=\" saknas direkt efter variabelnamnet"
+msgstr "â€=†saknas direkt efter variabelnamnet"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "variabelnamnet är för långt"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "värdet är för långt"
#: info/infokey.c:613
#, c-format
msgid "\"%s\", line %u: "
-msgstr "\"%s\", rad %u: "
+msgstr "â€%sâ€, rad %u: "
#: info/m-x.c:64
msgid "Read the name of an Info command and describe it"
@@ -980,7 +962,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Läs ett kommandonamn i echo-området och kör det"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Kan inte köra ett â€echo-areaâ€-kommando här"
@@ -1065,7 +1046,6 @@ msgid "Show all matching files"
msgstr "Visa alla matchande filer"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Inget filindex"
@@ -1374,7 +1354,6 @@ msgid "Select the most recently selected node"
msgstr "Välj den senast valda noden"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Ingen tidigare nod i historik"
@@ -1435,12 +1414,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Växla användningen av reguljära uttryck i sökningar"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Använder reguljära uttryck i sökningar"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Använder ordagranna strängar i sökningar"
@@ -1457,8 +1434,7 @@ msgstr "Sökningen fortsatte från början av dokumentet"
msgid "Searching subfile %s ..."
msgstr "Söker i underfilen %s..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Sökningen misslyckades"
@@ -1530,169 +1506,166 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Söksträng för kort"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Gå tillbaka till senaste träff från %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Inga fler träffar"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Genomsök denna nod och undernoder efter en sträng"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Söker i under %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Gå till nästa matchning i Info-underträd"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Ingen aktiv sökning"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Gå till föregående matchning i Info-underträd"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Läs en sträng och sök efter den skiftlägeskänsligt"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Läs en sträng och sök efter den"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Läs en sträng och sök baklänges efter den"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Upprepa den senaste sökningen i samma riktning"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Ingen tidigare söksträng"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Upprepa den senaste sökningen i omvänd riktning"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Töm visade sökträffar"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Sök interaktivt efter en sträng allteftersom du skriver den"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "I-sök med reguljärt uttryck baklänges: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-sök baklänges: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "I-sök med reguljärt uttryck: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-sök: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Misslyckas "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Avbryt pågående åtgärd"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Avsluta"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Visa vilken version av Info som kör"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info version %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Rita om displayen"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Avsluta användandet av Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Kör kommando som är knutet till denna tangents gemena variant"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Okänt kommando (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
-msgstr "\"%s\" är ogiltigt"
+msgstr "â€%s†är ogiltigt"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "â€%s†är ogiltigt"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Lägg till denna siffra till det aktuella numeriska argumentet"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Börja (eller multiplicera med 4) det numeriska argumentet"
#: info/variables.c:67
msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr "När detta är \"On\" visas och försvinner fotnoter automatiskt"
+msgstr "När detta är â€On†visas och försvinner fotnoter automatiskt"
#: info/variables.c:71
msgid "When \"On\", creating or deleting a window resizes other windows"
msgstr ""
-"När detta är \"On\" ändrar skapande eller borttagande av ett fönster\n"
+"När detta är â€On†ändrar skapande eller borttagande av ett fönster\n"
"storleken på andra fönster"
#: info/variables.c:75
msgid "When \"On\", flash the screen instead of ringing the bell"
-msgstr ""
-"När detta är \"On\" blinkar skärmen till istället för att klockan ringer"
+msgstr "När detta är â€On†blinkar skärmen till istället för att klockan ringer"
#: info/variables.c:79
msgid "When \"On\", errors cause the bell to ring"
-msgstr "När detta är \"On\" gör fel att klockan ringer"
+msgstr "När detta är â€On†gör fel att klockan ringer"
#: info/variables.c:83
msgid "When \"On\", Info garbage collects files which had to be uncompressed"
-msgstr "När detta är \"On\" skräpsamlar Info filer som behövde packas upp"
+msgstr "När detta är â€On†skräpsamlar Info filer som behövde packas upp"
#: info/variables.c:86
msgid "When \"On\", the portion of the matched search string is highlighted"
-msgstr "När detta är \"On\" markeras delen av den matchade söksträngen"
+msgstr "När detta är â€On†markeras delen av den matchade söksträngen"
#: info/variables.c:90
msgid "Controls what happens when scrolling is requested at the end of a node"
@@ -1708,11 +1681,11 @@ msgstr "Antalet rader att rulla då markören flyttas utanför fönstret"
#: info/variables.c:103
msgid "Controls whether scroll-behavior affects cursor movement commands"
-msgstr "Styr huruvida \"scroll-behavior\" påverkar flyttkommandon för markören"
+msgstr "Styr huruvida â€scroll-behavior†pÃ¥verkar flyttkommandon för markören"
#: info/variables.c:107
msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr "När detta är \"On\" accepterar och visar Info ISO Latin-tecken"
+msgstr "När detta är â€On†accepterar och visar Info ISO Latin-tecken"
#: info/variables.c:111
msgid ""
@@ -1817,7 +1790,7 @@ msgstr "%s för %s"
#: install-info/install-info.c:530
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tProva \"%s --help\" för en fullständig lista med flaggor.\n"
+msgstr "\tProva â€%s --help†för en fullständig lista med flaggor.\n"
#: install-info/install-info.c:538
#, c-format
@@ -2003,9 +1976,9 @@ msgstr ""
"%s\tDetta är översta noden i INFO-trädet\n"
"\n"
" Denna nod (katalognoden) erbjuder en meny med huvudrubriker.\n"
-" Att skriva \"q\" avslutar, \"H\" visar alla Info-kommandon, \"d\"\n"
-" återvänder hit, \"h\" visar en hjälp för förstagångsanvändare,\n"
-" \"mEmacs<Retur>\" besöker Emacs-manualen, osv.\n"
+" Att skriva â€q†avslutar, â€H†visar alla Info-kommandon, â€dâ€\n"
+" Ã¥tervänder hit, â€h†visar en hjälp för förstagÃ¥ngsanvändare,\n"
+" â€mEmacs<Retur>†besöker Emacs-manualen, osv.\n"
"\n"
" I Emacs kan du klicka med musknapp 2 på en menypost eller korsreferens\n"
" för att välja den.\n"
@@ -2018,12 +1991,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kunde inte läsa (%s) och kunde inte skapa (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY utan matchande END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY utan matchande START-INFO-DIR-ENTRY"
@@ -2040,25 +2011,23 @@ msgstr "%s: Ange Info-filen endast en gång.\n"
#: install-info/install-info.c:2200
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
-msgstr "Extra reguljärt uttryck angivet, ignorerar \"%s\""
+msgstr "Extra reguljärt uttryck angivet, ignorerar â€%sâ€"
#: install-info/install-info.c:2212
#, c-format
msgid "Error in regular expression `%s': %s"
-msgstr "Fel i reguljära uttrycket \"%s\": %s"
+msgstr "Fel i reguljära uttrycket â€%sâ€: %s"
#: install-info/install-info.c:2274
#, c-format
msgid "excess command line argument `%s'"
-msgstr "för många kommandoradsargument \"%s\""
+msgstr "för mÃ¥nga kommandoradsargument â€%sâ€"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Ingen indatafil angiven; prova --help för mer information."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Ingen katalogfil angiven; prova --help för mer information."
@@ -2070,31 +2039,31 @@ msgstr "Kunde inte läsa %s."
#: install-info/install-info.c:2448
#, c-format
msgid "no info dir entry in `%s'"
-msgstr "ingen info-katalogpost i \"%s\""
+msgstr "ingen info-katalogpost i â€%sâ€"
#: install-info/install-info.c:2696
#, c-format
msgid "no entries found for `%s'; nothing deleted"
-msgstr "inga poster hittades för \"%s\"; ingenting togs bort"
-
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+msgstr "inga poster hittades för â€%sâ€; ingenting togs bort"
+
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "kunde inte öppna %s för skrivning: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"flygga ditt @contents-kommando om du vill ha innehållet efter titelsidan"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2102,283 +2071,240 @@ msgstr ""
"flytta dina @shortcontents- och @contents-kommando om du vill ha innehållet "
"efter titelsidan"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s är inte en giltig landskod"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s är inte en giltig regionkod"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s är inte en giltig delningsmöjlighet"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "kunde inte läsa %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "fel vid stängning av @verbatiminclude-fil %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "%s: kunde inte hitta %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "inge nod att byta namn på"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "noder utan ett nytt namn vid filslut"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "kunde inte öppna %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "att använda en nodfil (â€%sâ€) med nytt namn är förÃ¥ldrat"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "kunde inte skydda hashtecken i @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "tomt nodnamn efter expansion â€%sâ€"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s â€%s†är redan definierat"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "här är den tidigare definitionen av @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "tomt argument i @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: utmatning inkompatibel med delning"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "fel vid stängning av %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "kunde inte skapa kataloger â€%s†eller â€%sâ€: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "kunde inte skapa katalogen â€%sâ€: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image-filen â€%s†hittades inte, använder â€%sâ€"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "inget argument angivet för @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-filen â€%s†(för HTML) hittades inte, använder â€%sâ€"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "rått format %s konverterades inte"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "kunde inte öppna konfigurationsfil för html-refs %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "saknar typ"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "okänd typ: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "fel vid stängning av html-referenskonfigurationsfil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "sträng stängs inte i css-fil"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include slutade med kommentar"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import avslutades inte i css-fil"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS-fil %s hittades inte"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "kunde inte öppna --include-fil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "fel vid stängning av CSS-fil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "ingen htmlxref.cnf-post hittad för â€%sâ€"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "fel vid stängning av ramfil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "fel vid stängning av TOC-ramfil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "hanterare %s för steg %s prioritet %s misslyckades"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "måste ange en titel med ett titelkommando eller @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "fel vid stängning av omdirigeringsnodsfil %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "gammalt namn för â€%s†är en nod i dokumentet"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "fil tomt för namnändrad nod â€%sâ€"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "mÃ¥lnod (nytt namn för â€%sâ€) finns inte dokument: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "fel vid stängning av nodomdirigeringsfil %s som bytt namn: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "tomt nodnamn"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "syntax för en extern nod använd för â€%sâ€"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "dokument utan noder"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "dokument utan Top-nod"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "misslyckades med att byta namn på %s: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s utmatat mer än en gång: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s utanför alla noder"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "@node-namn borde innehÃ¥lla â€,â€: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Indexpost i @%s med : producerar ogiltig Info: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "post för index â€%s†är utanför alla noder"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "fel vid stängning av bildtextfil %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
-msgstr "@image-filen \"%s\" är oläslig: %s"
+msgstr "@image-filen â€%s†är oläslig: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "kunde inte hitta @image-fil â€%s.txt†eller alternativ text"
# Är det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt som
# orsakar problem?
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2386,7 +2312,7 @@ msgstr ""
"@strong{Obs...} skapar en falsk korsreferens i Info; formulera om för att "
"undvika detta"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "@%s korsreferensnamn bör inte innehÃ¥lla â€:â€"
@@ -2399,296 +2325,320 @@ msgstr "@%s korsreferensnamn bör inte innehÃ¥lla â€:â€"
# Please don't use this type of construct, use two complete sentences
# instead and an outer if statement.
#
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "@%s nodnamn bör inte innehÃ¥lla â€%sâ€"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "@%s-nodnamn borde inte innehÃ¥lla â€:â€"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "â€.†eller â€,†mÃ¥ste följa pÃ¥ @xref, inte %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "â€.†eller â€,†mÃ¥ste följa pÃ¥ @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "nodnamn för menyobjekt borde inte innehÃ¥lla â€%sâ€"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "nodnamn för menyobjekt borde inte innehÃ¥lla â€:â€"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "namn för menyobjekt borde inte innehÃ¥lla â€:â€"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "kunde inte öppna %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "multipla @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "felaktigt eller tomt formellt argument till @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "felaktig argumentsyntax till @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s kräver ett namn"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "felaktigt namn för @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s anträffades innan @%s avslutningsparentes"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s anträffades innan @%s avslutningsparentes"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s saknar avslutande klammer"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s saknar avslutande avskiljarsekvens: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx borde inte inleda @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx måste följa på @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s har text men inte @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
-msgstr "\"@end\" förväntade \"%s\", men såg \"%s\""
+msgstr "â€@end†förväntade â€%sâ€, men sÃ¥g â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s anträffades före @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "inge matchning â€%cend %sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "felplacerat %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "omatchat â€%c%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "makro â€%s†anropades med för mÃ¥nga argument"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s saknar avslutande klammer"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "makro â€%s†deklarerat utan argument, anropades med ett argument"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ i @%sa-expansion följdes av â€%s†istället för parameternamn eller \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "saknar namn för @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "saknar kategori för @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "oväntat argument på @%s-rad: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "tom multitabell"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "överflödigt argument till @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "felaktigt argument till @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s kräver ett argument: formateraren för %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"kommando @%s som inte accepterar något argument i klammerparenteser borde "
"inte finnas på @%s-rad"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "accentkommando â€@%s†inte tillÃ¥tet som @%s-argument"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s saknar argument"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "okänd @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "överflödigt argument till @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "felaktigt argument till @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: kunde inte öppna %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "kodningen â€%s†är inte en kanonisk texinfo-kodning"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
-msgstr "okänt kodningsnamn \"%s\""
+msgstr "okänt kodningsnamn â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s efter första elementet"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s är inte meningsfullt utanför @multitabell-rad"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part borde inte associeras med @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node föregår @%s, men delar kanske inte associeras med noder"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "syntax för en extern nod använd för â€%sâ€"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "tomt namn för menyobjekt i â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "tomt nodnamn i menyobjekt"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s borde inte förekomma i @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s ska bara uppträda vid böjran på en rad"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
-msgstr "makrot \"%s\" är redan definierat"
+msgstr "makrot â€%s†är redan definierat"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
-msgstr "här är den tidigare definitionen av \"%s\""
+msgstr "här är den tidigare definitionen av â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "omdefinierar Texinfo-språkkommando: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s utan associerat tecken"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr "@%s definierat med noll eller fler än ett argument bör anropas med {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2696,345 +2646,358 @@ msgstr ""
"makroanrop nästlat för djupt (sätt MAX_NESTED_MACROS för att åsidosätta; "
"aktuellt värde %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"rekursivt anrop av makro %s är inte tillåtet; använd @rmacro om det behövs"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "apostrofkommando â€@%s†fÃ¥r inte följa pÃ¥ blanksteg"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "använd klamrar för att ge ett kommando som ett argument till @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
-msgstr "%c%s förväntar â€i†eller â€j†som argument, inte â€%sâ€"
+msgstr "%c%s förväntar sig â€i†eller â€j†som argument, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "accentkommando â€@%s†fÃ¥r inte efterföljas av nyrad"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s förväntade klamrar"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "okänt kommando â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "odefinierad flagga: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "felaktig syntax för @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s är föråldrat."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s är föråldrat; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s borde enbart uppträda vid början på en rad"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s borde endast förekomma i rubriker eller fotnoter"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
-msgstr "@%s är inte meningsfullt inuti \"@%s\"-block"
+msgstr "@%s är inte meningsfullt inuti â€@%sâ€-block"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s i tom multitabell"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab före @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "för många kolumner i multitabellsobjekt (max %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "ignorerar @tab utanför multitabell"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s utanför tabell eller lista"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s är inte tillÃ¥tet inuti â€@%sâ€-block"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s borde endast förekomma i en indexpost"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "fler än två nivåer av index underposter tillåts"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "mÃ¥ste vara efter â€@%s†för att använda â€@%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
-"@%s är inte meningsfullt utanför \"@titlepage\"- och \"@quotation\"-omgivning"
+"@%s är inte meningsfullt utanför â€@titlepageâ€- och â€@quotationâ€-omgivning"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory efter första noden"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "region %s inuti region %s är inte tillåtet"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry efter första noden"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu i ogiltig kontext"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s sågs innan första @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "din @top-nod ska kanske packas i @ifnottex istället för @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s borde endast förekomma i en indexpost"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s borde endast förekomma i matematikkontext"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "oväntat @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s är inte meningsfullt utanför â€@floatâ€-omgivning"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s borde vara direkt under â€@floatâ€"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "hoppar över multipla @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "kommando @%s accepterar inga argument"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "kommando @%s saknar nod- eller extern manual-argument"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "i @%s finns ett tomt korsreferensnamn efter expansion â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "i @%s finns en tom korsreferenstitel efter expansion â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image saknar filnamnsargument"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "%s: saknar första argumentet"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "icke-hexsiffror i argument till @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "färre än fyra hexsiffror i argument till @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "argument till @U överstiger största Unicode 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "överflödiga argument för nod"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "förväntade @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s borde endas acceptera ett @-kommando som argument, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "återstående argument på @%s-rad: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "miljökommando %s som argument till @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "tom @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "kolumndecimal inte ett nummer: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp argument mÃ¥ste vara numeriskt, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "reserverat indexnamn %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "okänt källindex i @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "okänt destinationsindex i @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s leder till en sammanfogning av %s med sig själv, hoppar över"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "okänt index â€%s†i @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "skriver ut ett index â€%s†sammanfogat med et annat, â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "prindindex före dokument börjar: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
-msgstr "@%s argument mÃ¥ste vara â€top†eller â€bottomâ€, inte \"%s\""
+msgstr "@%s argument mÃ¥ste vara â€top†eller â€bottomâ€, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
-msgstr "Endast @%s 10 eller 11 stöds, inte \"%s\""
+msgstr "Endast @%s 10 eller 11 stöds, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "@%s argument mÃ¥ste vara â€separate†eller â€endâ€, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s argument mÃ¥ste vara â€onâ€, â€off†eller â€oddâ€, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"@paragraphindent-argument mÃ¥ste vara numeriskt/â€noneâ€/â€asis†inte, â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"@firstparagraphindent-argument mÃ¥ste vara â€none†eller â€insertâ€, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
-msgstr "@exampleindent-argument mÃ¥ste vara numeriskt/â€asis\", inte â€%sâ€"
+msgstr "@exampleindent-argument mÃ¥ste vara numeriskt/â€asisâ€, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "förväntade @%s on eller off, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"@kbdinputstyle-argument mÃ¥ste vara â€codeâ€/â€exampleâ€/â€distinctâ€, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "@allowcodebreaks-argument mÃ¥ste vara â€true†eller â€falseâ€, inte â€%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "@urefbreakstyle-argument mÃ¥ste vara â€afterâ€/â€beforeâ€/â€noneâ€, inte â€%sâ€"
@@ -3063,7 +3026,7 @@ msgstr "inget avsnittskommando associerat med @%s"
msgid "@%s not empty"
msgstr "@%s inte tomt"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s-referens till icke-existerande node â€%sâ€"
@@ -3073,105 +3036,105 @@ msgstr "@%s-referens till icke-existerande node â€%sâ€"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s postnodsnamn â€%s†skiljer sig frÃ¥n %s namn â€%sâ€"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
-msgstr "orefererad nod \"%s\""
+msgstr "orefererad nod â€%sâ€"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "nod â€%s†är %s för â€%s†i avsnittsuppdelning men inte i meny"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "nod %s â€%s†i meny â€%s†och i avsnittsuppdelning â€%s†skiljer sig Ã¥t"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "nod â€%s†är %s för â€%s†i meny men inte avsnittsuppdelning"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "%s-pekare â€%s†(för nod â€%sâ€) skiljer sig frÃ¥n %s namn â€%sâ€"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s-referens till icke-existerande â€%sâ€"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "nod â€%s†saknar menyobjekt för â€%s†trots att den är dess Up-mÃ¥l"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "för â€%sâ€, upp i meny â€%s†och upp â€%s†matchar inte"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s till â€%sâ€, skiljer sig frÃ¥n %s namn â€%sâ€"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "tom indexnyckel i @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: kunde inte öppna %s för skrivning: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: fel vid stängning %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: kunde inte öppna latexfil %s för skrivning: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: L2H_TMP-katalog innehåller en punkt"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: aktuell katalog innehåller en punkt"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: kommando misslyckades: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: bild har ogiltig utökning: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: att byta namn på %s till %s misslyckades: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: kunde inte öppna %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: slut på @%s-objekt %d hittades inte"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3180,12 +3143,12 @@ msgstr ""
"latex2html.pm: behandling producerade %d HTML-objekt; förväntade %d, antalet "
"objekt som hittats i dokumentet"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: kunde inte avgöra fragment %d för @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3194,47 +3157,47 @@ msgstr ""
"l2h: kunde inte extrahera fragment %d för @%s med utmatningsräknare %d från "
"HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: kunde inte läsa in %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: kunde inte öppna %s för skrivning: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: kunde inte öppna %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: chdir %s misslyckades: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: kan inte återgå till tidigare katalog: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: utdatafil saknas: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: kommando misslyckades: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: slut på @%s-objekt %d hittades inte"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3243,12 +3206,12 @@ msgstr ""
"latex2html.pm: behandling producerade %d HTML-objekt; förväntade %d, antalet "
"objekt som hittats i dokumentet för @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: utdata har inget HTML-objekt för @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3257,37 +3220,37 @@ msgstr ""
"latex2html.pm: behandling hämtade %d HTML-objekt; förväntade %d, antalet "
"objekt som hittats i dokumentet för @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "fel vid inläsning av %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: okänd variabel %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: okänd variabel %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "kunde inte läsa initfil %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "ignorerar okänt TEXINFO_OUTPUT_FORMAT-värde â€%sâ€.\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3302,7 +3265,7 @@ msgstr ""
"beteende är identiskt och beror inte på namnet det installeras under.\n"
"\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3336,7 +3299,7 @@ msgstr ""
" -v, --verbose förklara vad som görs.\n"
" --version visa versionsinformation och avsluta.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3356,7 +3319,7 @@ msgstr ""
" efter att ha kontrollerat giltighet för "
"TEXINFO-FIL.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3403,7 +3366,7 @@ msgstr ""
" placera utdatafilen där.\n"
" Annars anger DEST namnet på utdatafilen.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3432,20 +3395,20 @@ msgstr ""
" --fill-column=ANTAL radbryt Info-rader vid ANTAL tecken\n"
" (standardvärde %d).\n"
" --footnote-style=STIL generera fotnoter i Info som följer STIL:\n"
-" \"separate\" för att placera fotnoter i sin\n"
+" â€separate†för att placera fotnoter i sin\n"
" egen nod,\n"
-" \"end\" för att placera fotnoter i slutet\n"
+" â€end†för att placera fotnoter i slutet\n"
" av den nod där de är definierade\n"
" (standardalternativ).\n"
" --paragraph-indent=VÄRDE gör indrag i Info-stycken med VÄRDE\n"
" blanksteg (standardvärde %d).\n"
-" Om VÄRDE är \"none\" görs inga indrag; om\n"
-" VÄRDE är \"asis\" bevaras befintliga\n"
+" Om VÄRDE är â€none†görs inga indrag; om\n"
+" VÄRDE är â€asis†bevaras befintliga\n"
" indrag.\n"
" --split-size=ANTAL dela upp Info-filer vid storleken ANTAL\n"
" (standardvärde %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3472,7 +3435,7 @@ msgstr ""
" ankare; standard sätts endast vid delning.\n"
"\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3481,7 +3444,7 @@ msgstr ""
" --output-indent=VÄR gör ingenting, behålls på grund av "
"kompatibilitet.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3489,7 +3452,7 @@ msgstr ""
"Flaggor för DVI/PS/PDF:\n"
" --Xopt=FLG skicka FLG till texi2dvi; får repeteras.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3511,7 +3474,7 @@ msgstr ""
" -U VARIABEL odefiniera variabeln VARIABEL, som med "
"@clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3548,7 +3511,7 @@ msgstr ""
"\n"
" Dessutom, för flaggorna --no-ifFORMAT, behandla @ifnotFORMAT-text.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3564,7 +3527,7 @@ msgstr ""
" om vanlig text genereras är --ifplaintext på och de andra av;\n"
" om XML genereras är --ifxml på och de andra av.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3596,66 +3559,66 @@ msgstr ""
" makeinfo --no-split apa.texi skriv en Info-fil hur stor den än "
"är\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
-"%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte "
-"\"%s\".\n"
+"%s: argumentet --footnote-style mÃ¥ste vara â€separate†eller â€endâ€, inte "
+"â€%sâ€.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
-"%s: argumentet --paragraph-indent måste vara numeriskt/\"none\"/\"asis\", "
-"inte \"%s\".\n"
+"%s: argumentet --paragraph-indent mÃ¥ste vara numeriskt/â€noneâ€/â€asisâ€, inte "
+"â€%sâ€.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr "%s: vid generering av %s får endast en indata-FIL anges med -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "--Xopt flagga utan utskrift"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "okänd trädtransformation %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "hoppar över uppdelning för format %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: filargument saknas.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Prova \"%s --help\" för mer information.\n"
+msgstr "Prova â€%s --help†för mer information.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"fill_gaps_in_sectioning-transformation returnerade inget resultat. Inget "
"avsnitt?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "fel vid stängning av makroexpansionsfil %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "kunde inte öppna %s för skrivning: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3663,21 +3626,252 @@ msgstr ""
"insert_nodes_for_sectioning_commans-transformering returnerade inget "
"resultat. Inget avsnitt?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: fel vid stängning %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: fel vid stängning av intern länkfil %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: kunde inte öppna %s för skrivning: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "inget matchande â€@end %sâ€"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "felplacerat {"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "omatchat â€@end %sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set kräver ett namn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "felaktigt namn för @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear kräver ett namn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "felaktigt namn för @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro kräver ett namn"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "felaktigt namn för @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+"@clickstyle borde endast acceptera ett @-kommando som argument, inte â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "miljökommando %s som argument till @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "felaktigt argument till @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "felaktigt argument till @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "tom @columnfractions"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "felaktigt argument till @printindex: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Endast @fonttextsize 10 eller 11 stöds, inte â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "@footnotestyle-argument mÃ¥ste vara â€separate†eller â€endâ€, inte â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+"@setchapternewpage argument mÃ¥ste vara â€onâ€, â€off†eller â€oddâ€, inte â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "felaktigt argument till @need: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "@firstparagraph-argument mÃ¥ste vara â€none†eller â€insertâ€, inte â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "felaktigt argument till @headings: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s kräver ett argument: formateraren för @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "omatchat â€@endâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "överflödigt argument till @end %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "felaktigt argument till @end: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: kunde inte hitta %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: kunde inte öppna %s:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename efter första elementet"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions är inte meningsfullt utanför @multitabell-rad"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node föregår @part, men delar kanske inte associeras med noder"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s är inte meningsfullt inuti â€@%sâ€-block"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s är inte tillÃ¥tet inuti â€@copyingâ€-block"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry borde endast förekomma i en indexpost"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@author är inte meningsfullt utanför â€@titlepageâ€- och â€@quotationâ€-omgivning"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s kräver ett namn"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "felaktigt eller tomt @%s formellt argument: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless förväntar sig â€i†eller â€j†som argument, inte â€%câ€"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "odefinierad flagga: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s är föråldrat."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s är föråldrat; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ borde endast förekomma i matematikkontext"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb utan associerat tecken"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless förväntar sig â€i†eller â€j†som argument, inte â€%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "felplacerat }"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "inge nod att byta namn på"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "noder utan ett nytt namn vid filslut"
+
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr "att använda en nodfil (â€%sâ€) med nytt namn är förÃ¥ldrat"
+
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "gammalt namn för â€%s†är en nod i dokumentet"
+
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "fil tomt för namnändrad nod â€%sâ€"
+
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "mÃ¥lnod (nytt namn för â€%sâ€) finns inte dokument: %s"
+
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "fel vid stängning av nodomdirigeringsfil %s som bytt namn: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "tomt nodnamn"
+
#~ msgid "can't open %s: %s"
#~ msgstr "kan inte ta bort filen %s: %s"
@@ -3695,9 +3889,6 @@ msgstr "%s: kunde inte öppna %s för skrivning: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Föråldrad variabel %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s borde inte associeras med @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: föråldrad variabel %s\n"
diff --git a/macros/texinfo/texinfo/po/texinfo.pot b/macros/texinfo/texinfo/po/texinfo.pot
index 5c8239397d..06d183f96e 100644
--- a/macros/texinfo/texinfo/po/texinfo.pot
+++ b/macros/texinfo/texinfo/po/texinfo.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: GNU texinfo 6.6\n"
+"Project-Id-Version: GNU texinfo 6.6dev\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -241,7 +241,6 @@ msgid "Insert completion"
msgstr ""
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr ""
@@ -265,7 +264,6 @@ msgid "found file %s"
msgstr ""
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr ""
@@ -278,7 +276,6 @@ msgid "---------- Footnotes ----------"
msgstr ""
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr ""
@@ -287,7 +284,6 @@ msgid "Look up a string in the index for this file"
msgstr ""
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr ""
@@ -296,7 +292,6 @@ msgid "Index entry: "
msgstr ""
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr ""
@@ -311,7 +306,6 @@ msgid ""
msgstr ""
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr ""
@@ -371,7 +365,6 @@ msgid "No available info files have '%s' in their indices"
msgstr ""
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
@@ -386,7 +379,6 @@ msgid "Cannot find node '%s'"
msgstr ""
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -415,7 +407,7 @@ msgstr ""
msgid "Try --help for more information.\n"
msgstr ""
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -504,7 +496,7 @@ msgid ""
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -793,17 +785,14 @@ msgid "could not open init file %s"
msgstr ""
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr ""
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr ""
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr ""
@@ -813,12 +802,10 @@ msgid "NUL character (^%c) not permitted"
msgstr ""
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr ""
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr ""
@@ -828,7 +815,6 @@ msgid "unknown action `%s'"
msgstr ""
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr ""
@@ -838,22 +824,18 @@ msgid "extra characters following action `%s'"
msgstr ""
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr ""
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr ""
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr ""
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr ""
@@ -875,7 +857,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr ""
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr ""
@@ -949,7 +930,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr ""
@@ -1252,7 +1232,6 @@ msgid "Select the most recently selected node"
msgstr ""
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1313,12 +1292,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr ""
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr ""
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr ""
@@ -1335,8 +1312,7 @@ msgstr ""
msgid "Searching subfile %s ..."
msgstr ""
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr ""
@@ -1370,140 +1346,138 @@ msgstr ""
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr ""
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr ""
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr ""
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr ""
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr ""
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr ""
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr ""
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr ""
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr ""
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr ""
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr ""
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr ""
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr ""
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr ""
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr ""
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr ""
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr ""
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr ""
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr ""
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr ""
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr ""
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr ""
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr ""
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr ""
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr ""
@@ -1775,12 +1749,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr ""
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
@@ -1810,12 +1782,10 @@ msgid "excess command line argument `%s'"
msgstr ""
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
@@ -1834,939 +1804,933 @@ msgstr ""
msgid "no entries found for `%s'; nothing deleted"
msgstr ""
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr ""
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr ""
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
@@ -2795,7 +2759,7 @@ msgstr ""
msgid "@%s not empty"
msgstr ""
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
@@ -2805,213 +2769,213 @@ msgstr ""
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr ""
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr ""
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr ""
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr ""
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr ""
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr ""
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr ""
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr ""
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3020,7 +2984,7 @@ msgid ""
"the behavior is identical, and does not depend on the installed name.\n"
msgstr ""
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3039,7 +3003,7 @@ msgid ""
" --version display version information and exit.\n"
msgstr ""
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3050,7 +3014,7 @@ msgid ""
" after checking validity of TEXINFO-FILE.\n"
msgstr ""
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3077,7 +3041,7 @@ msgid ""
" Otherwise, DEST names the output file.\n"
msgstr ""
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3099,7 +3063,7 @@ msgid ""
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3113,19 +3077,19 @@ msgid ""
" anchors; default is set only if split.\n"
msgstr ""
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3136,7 +3100,7 @@ msgid ""
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3156,7 +3120,7 @@ msgid ""
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3166,7 +3130,7 @@ msgid ""
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3183,76 +3147,280 @@ msgid ""
" makeinfo --no-split foo.texi write one Info file however big\n"
msgstr ""
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr ""
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr ""
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr ""
diff --git a/macros/texinfo/texinfo/po/tr.gmo b/macros/texinfo/texinfo/po/tr.gmo
index a042f36c81..7b7488947c 100644
--- a/macros/texinfo/texinfo/po/tr.gmo
+++ b/macros/texinfo/texinfo/po/tr.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/tr.po b/macros/texinfo/texinfo/po/tr.po
index fa023bca4d..577ac3ae83 100644
--- a/macros/texinfo/texinfo/po/tr.po
+++ b/macros/texinfo/texinfo/po/tr.po
@@ -1,15 +1,15 @@
-# translation of texinfo-6.5.90.po to Turkish
+# translation of texinfo-6.6.90.po to Turkish
# Copyright (C) 2002, 2004, 2007, 2008, 2012, 2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the texinfo package.
-# texinfo-6.5.90 Türkçe Çevirisi
+# texinfo-6.6.90 Türkçe Çevirisi
# Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2002, 2004, 2007, 2008, 2012, 2015.
# Mehmet Kececi <mkececi@mehmetkececi.com>, 2017, 2019.
msgid ""
msgstr ""
-"Project-Id-Version: texinfo 6.5.93\n"
+"Project-Id-Version: texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-13 12:57+0300\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-26 15:59+0300\n"
"Last-Translator: Mehmet Kececi <mkececi@mehmetkececi.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
"Language: tr\n"
@@ -243,7 +243,6 @@ msgid "Insert completion"
msgstr "Tamamlamayı yerleştir"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Tamamlamaları oluşturuyor..."
@@ -267,7 +266,6 @@ msgid "found file %s"
msgstr "dosya %s bulundu"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Dipnotlar gösterilemedi"
@@ -280,7 +278,6 @@ msgid "---------- Footnotes ----------"
msgstr "----------- Dipnotlar ---------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Ä°ndeks girdilerini buluyor..."
@@ -289,7 +286,6 @@ msgid "Look up a string in the index for this file"
msgstr "Bu dosyada indeks içinde bir dizgeyi arar"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Hiç indis bulunamadı"
@@ -298,7 +294,6 @@ msgid "Index entry: "
msgstr "Ä°ndeks giriÅŸi: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Hiç indis yok."
@@ -315,7 +310,6 @@ msgstr ""
"Son '\\[index-search]' komutundan bir sonraki eşleşen indeks öğesine git"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Daha önce bir indeks arama dizgesi yok"
@@ -381,7 +375,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Mevcut bilgi dosyalarından hiçbirisinin indisinde '%s' yok"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Dosya karakter kodlamasını dönüştürmede hata"
@@ -396,7 +389,6 @@ msgid "Cannot find node '%s'"
msgstr "'%s' düğümü bulunamadı"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Program adı verilmedi"
@@ -425,7 +417,7 @@ msgstr "%s değeri %s değişkeni için geçerli değil"
msgid "Try --help for more information.\n"
msgstr "Daha fazla bilgi için --help seçeneğini kullanın.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -565,7 +557,7 @@ msgstr ""
" tüm elkitabını out.txt'e çıkartır\n"
" info -f ./foo.info dir aramadan ./foo.info dosyasını gösterir"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -870,17 +862,14 @@ msgid "could not open init file %s"
msgstr "init dosyası %s açılamadı"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "anahtar sıralaması çok uzun"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "anahtar sıralaması kayıp"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL karakterine (\\000) izin verilmiyor"
@@ -890,12 +879,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "NUL karakterine (^%c) izin verilmiyor"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "kayıp eylem adı"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "anahtar sıralaması menü-rakamına bağlanamadı"
@@ -905,7 +892,6 @@ msgid "unknown action `%s'"
msgstr "bilinmeyen eylem `%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "eylem adı çok uzun"
@@ -915,22 +901,18 @@ msgid "extra characters following action `%s'"
msgstr "`%s' eylemini izleyen fazladan karakterler"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "kayıp değişken adı"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "değişken adından hemen sonra kayıp `='"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "değişken adı çok uzun"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "değer çok uzun"
@@ -952,7 +934,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Eko alanından komut ismini okur ve onu çalıştırır"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Bir 'eko-alanı' komutu burada çalıştırılamaz"
@@ -1038,7 +1019,6 @@ msgid "Show all matching files"
msgstr "Eşleşen tüm dosyaları göster"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Dosya indeksi yok"
@@ -1347,7 +1327,6 @@ msgid "Select the most recently selected node"
msgstr "En son seçilen düğümü seçer"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Geçmişte daha önceki bir düğüm yok"
@@ -1408,12 +1387,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Aramalarda düzenli ifade kullanımına geç"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Aramalarda düzenli ifade kullanılıyor"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Aramalarda yazılı dizge kullanılıyor"
@@ -1430,8 +1407,7 @@ msgstr "Arama, belgenin başından sürdürülüyor"
msgid "Searching subfile %s ..."
msgstr "%s altdosyası aranıyor ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Arama başarısız"
@@ -1465,140 +1441,138 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Arama dizgesi çok kısa"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "%s'den son karşılaşmaya geri dönüyor"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Daha fazla eÅŸleÅŸme yok"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Bu düğümü ve alt düğümleri bir dizi için ara"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "%s altdosyası aranıyor:"
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Info alt-ağacında bir sonraki eşleşmeye git"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Etkin arama yok"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Info alt-ağacındaki önceki eşleşmeye git"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Bir dizge okur ve onu büyük/küçük harf duyarlı şekilde arar"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Bir dizge okur ve (onu) arar"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Bir dizge okur ve (onu) geriye doÄŸru arar"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Son aramayı aynı yönde yineler"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Daha önceden arama dizgesi yok"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Son aramayı ters yönde yineler"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Görüntülenen eşleşmiş aramaları sil"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Bir dizgeyi siz yazarken etkileÅŸimli ÅŸekilde arar"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Düzenli ifade I-arama, geriye doğru: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-arama, geriye doÄŸru: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Düzenli ifade I-arama: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-arama: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Başarılamıyor "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Mevcut iÅŸlemi iptal eder"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Çık"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Çalışan Ino'nun sürüm bilgisini görüntüler"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info sürüm %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Görüntüyü yeniden çizer"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Info'dan çıkar"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Bu tuşun küçük harfine atanmış komutu yürütür"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Bilinmeyen komut (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" geçersiz"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "'%s' geçersiz"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Mevcut sayısal argümana bu sayıyı ekle"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Mevcut sayısal argümanı başlat (veya 4'le çarp)"
@@ -1952,12 +1926,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: (%s) okunamıyor ve (%s) oluşturulamıyor"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "EÅŸleÅŸen END-INFO-DIR-ENTRY'siz START-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "EÅŸleÅŸen START-INFO-DIR-ENTRY'siz END-INFO-DIR-ENTRY"
@@ -1987,12 +1959,10 @@ msgid "excess command line argument `%s'"
msgstr "fazladan komut satırı argümanı `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Girdi dosyası belirtilmemiş; daha fazla bilgi için --help deneyin."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "dizin dosyası belirtilmemiş; daha fazla bilgi için --help deneyin."
@@ -2011,25 +1981,25 @@ msgstr "`%s' içinde info dizin girdisi yok"
msgid "no entries found for `%s'; nothing deleted"
msgstr "`%s' için girdi bulunamadı; hiçbir şey silinmedi"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "%s yazmak için açılamıyor: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"başlık sayfasının ardındaki içeriği istiyorsanız @contents komutunu hareket "
"ettir"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2037,283 +2007,238 @@ msgstr ""
"başlık sayfasından sonra içeriği istiyorsanız @shortcontents ve @contents "
"komutlarınızı hareket ettirin"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s geçerli bir dil kodu değildir"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s geçerli bir bölge kodu değildir"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s geçerli bir bölme olasılığı değildir"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "%s okunamıyor: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "%s @verbatiminclude dosyasını kapatmada hata: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: %s bulunamıyor"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "yeniden adlandırılacak düğüm yok"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "dosya sonunda yeni adı olmayan düğümler"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "%s açılamıyor: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "yeniden adlandırılmış düğüm dosyası (`%s') kullanımdan kaldırıldı"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "@%s içindeki sayı karakteri korunamıyor"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "`%s' açılımından sonra boş düğüm adı"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s `%s' daha önce tanımlanmış"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "işte @%s olarak önceki tanım"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "@%s'de boş argüman"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: çıktı bölmeyle uyumsuz"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "%s'i kapatmada hata: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "`%s' ya da `%s' dizinleri oluşturulamıyor: %3$s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "`%s' dizini oluşturulamıyor: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "@image dosyası `%s' bulunamıyor, `%s' kullanılacak"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "@U için argüman belirtlimedi"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image dosyası `%s' (HTML için) bulunamadı, `%s' kullanılacak"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "ham biçem %s dönüştürülmedi"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "%s html başvuru ayar dosyası açılamıyor: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "kayıp tür"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "bilinmeyen tür: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "%s html başvuru ayar dosyasını kapatmada hata: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "css dosyasında dizge kapatılmadı"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include yorum içinde sonlandı"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "css dosyasında @import bitmedi"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "CSS dosyası %s bulunamadı"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "--include-file %s açılamadı: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "CSS dosyası %s'i kapatmada hata: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "`%s' için htmlxref.cnf girdisi bulunamadı"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "çerçeve dosyası %s'i kapatmada hata: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "TOC çerçeve dosyası %s'i kapatmada hata: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "evre %s öncelik %3$s'in kotarıcısı %s başarısız"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "başlık komutu ya da @top ile bir başlık belirlemelisiniz"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "yeniden yönlendirme düğüm dosyası %s'i kapatmada hata: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "`%s' nin önceki adı bu belgenin bir düğümüdür"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "yeniden adlandırılmış `%s' düğüm dosyası boş"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "hedef düğüm (`%s' nin yeni adı) belgede yok: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"yeniden adlandırılmış düğüm yeniden yönlendirme dosyası %s'i kapatmada hata: "
-"%s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "boş düğüm adı"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "`%s' için kullanılan bir harici düğümün sözdizimi"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "düğümsüz belge"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "Top düğümü olmayan belge"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "%s yeniden adlandırma başarısız: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s çıktısı birden fazla: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s tüm düğümlerin dışında"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "@node adı `,' içermemeli: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Dizin girdisi @%s ile : geçersiz Info üretiyor: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "`%s' indeks girdisi tüm düğümlerin dışında"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "imge metin dosyası %s'i kapatmada hata: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image dosyası `%s' okunamıyor: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "@image dosyası `%s.txt' ya da alternatif metin bulunamadı"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2321,300 +2246,324 @@ msgstr ""
"@strong{Not...} Info'da sahte bir çapraz-başvuru oluşturur; bundan kaçınmak "
"için yazımı değiştirin"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "@%s çapraz-başvuru adı `:' içermemeli"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "@%s düğüm adı `%s' içermemeli"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "@%s düğüm adı `:' içermemeli"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' ya da `,' @xref'i izlemelidir, `%s'i deÄŸil"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "`.' ya da `,' @xref'i izlemelidir"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "menü girdisi düğüm adı `%s' içermemeli"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "menü girdisi düğüm adı `:' içermemeli"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "menü girdi adı `:' içermemeli"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "%s açılamıyor: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "çok sayıda @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "hatalı ya da boş @%s resmi argümanı: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "@%s argümanı için hatalı sözdizimi: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s bir isim gerektirir"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "@%s için kötü isim"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s, @%s'in kapama küme parantezinden önce görüldü"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s, @%s'in kapama küme parantezinden önce görüldü"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s Kapanış parantezi eksik"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s kayıp kapanış sınır belirteci sıralı ögeleri: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx başlamamalı @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx, @item'dan sonra gelmeli"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s'in metni var fakat @item'ı yok"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' `%s' beklerdi, `%s' gördü"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s, @end'den önce görüldü %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "eÅŸleÅŸen `%cend %s' yok"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "yanlış yerleştirilmiş %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "eÅŸleÅŸmeyen `%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "makro `%s' çok sayıda arg.la çağrıldı"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s kapanış parantezi eksik"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr "makro `%s' argümansız tanımlandı, argümanla kullanıldı"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "@%s açılımındaki \\ parametre adı veya \\ yerine `%s' i izliyor"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "@%s için kayıp isim"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "@%s için kayıp kategori"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "@%s satırında beklenmedik argüman: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "boş çoklutablo"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "@%s'e fazladan argüman"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "@%s'ye hatalı argüman"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s bir argüman gerektirir: %c öğesi için biçimlendirici"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"@%s komutu küme parantezi içinde argüman kabul etmiyor @%s satırında olmamalı"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "vurgu komutu `@%s' in @%s argümanı olmasına izin verilmiyor"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s kayıp argüman"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "bilinmeyen @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "@%s %s'e fazladan argüman: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "@%s'e hatalı argüman: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: %s açılamıyor: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "`%s' kodlaması kanonik bir texinfo kodlaması değil"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "tanınmayan kodlama adı `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "ilk unsurdan sonra @%s"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s yalnızca bir @multitable satırında anlamlıdır"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part @top ile ilintili olmamalı"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
"@node @%s'den önce geliyor, fakat parçaları düğümlerle ilişkili olmayabilir"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "`%s' için kullanılan bir harici düğümün sözdizimi"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "`%s' de boş menü girdi adı"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "menü girdisinde boş düğüm adı"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s @%s'de görülmemeli"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s sadece bir satırın başında görünmelidir"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro `%s' daha önce tanımlanmış"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "işte `%s' nin önceki tanımı"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "Texinfo dil komutu yeniden tanımlanıyor: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "iliÅŸkili karakteri olmayan @%s"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr "sıfırla tanımlanmış @%s ya da birden çok argüman {} ile çağrılmalı"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2622,345 +2571,358 @@ msgstr ""
"makro çağrısı çok içiçe (geçersiz kılmak için MAX_NESTED_MACROS'u atayın; "
"mevcut deÄŸer %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"%s makrosunun özyineli çağrısına izin verilmiyor; gerekirse @rmacro kullanın"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "`@%s' aksan komutundan sonra beyaz boÅŸluk gelmemeli"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "@%s'e argüman olarak bir komut vermek için küme parantezleri kullanın"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s argüman olarak `i' ya da `j' gerektirir, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "`@%s' aksan komutundan sonra yeni satır gelmemelidir"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s küme parantezi bekledi"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "bilinmeyen komut `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "tanımlanmamış bayrak: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "@value için bozuk sözdizimi"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s kullanımdan kalkmış."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s kullanımdan kalkmış; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s sadece bir satırın başında görünmelidir"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s yalnızca alt ya da üst kısımda görülmelidir"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "`@%s' bloğu içinde @%s anlamlı değil"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "boÅŸ @multitable'de @%s"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@item'den önce @tab"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "çok-tablolu ögede, çok fazla sütun (maks %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "çok-tablolunun dışındaki @tab yoksayılıyor"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "tablo ya da liste dışında @%s"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "`@%s' bloğu içinde @%s'e izin verilmez"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s yalnızca indeks bağlamında görünmelidir"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr "ikiden fazla indeks alt seviyesine izin verilmez"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "`@%s' kullanmak için `@%s' den sonra ol(un)malıdır"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "`@titlepage' ve `@quotation' çevreleri dışında @%s anlamlı değil"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "ilk düğümden sonra @dircategory"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "%s bölgesi içinde %s bölgesine izin verilmez"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "ilk düğümden sonra @direntry"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu geçersiz bağlamda"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "ilk @node öncesinde @%s görüldü"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"belki de sizin @top düğümünüz, @ifinfo'dan ziyade @ifnottex içine "
"sarılmalıdır?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s yalnızca indeks bağlamında görünmelidir"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s yalnızca matematik bağlamında görünmelidir"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "beklenmedik @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "`@float' çevresi dışında @%s anlamlı değil"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s, `@float' ın hemen altında olmalıdır"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "çok sayıda @%s yok sayılıyor"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "@%s komutu argüman kabul etmez"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "@%s komutunda bir düğüm ya da harici manüel argüman eksik"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "@%s'de `%s' açılımından sonra boş çapraz başvuru adı"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "@%s'de `%s' açılımından sonra boş çapraz başvuru başlığı"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image eksik dosyaadı argümanı"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s'de eksik ilk argüman"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "@U için olan argümanda hex olmayan rakamlar: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "@U için olan argümanda dörtten az sayıda hex rakam: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "@U için olan argüman Unicode maksimumu olan 0x10FFF'yi aşıyor: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "düğüm için çok fazla argüman"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "@end beklenirdi %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr ""
"@%s bağımsız değişken olarak yalnızca bir @-command kabul etmelidir, `%s' "
"deÄŸil"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "@%s satırında kalan argüman: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "@%s'e argüman olarak çevre komutu %s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "boÅŸ @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "sütun kesiri numara değil: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "@sp arg sayısal olmalıdır `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "ayrılmış dizin adı %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "@%s'de bilinmeyen kaynak dizini: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "@%s'de bilinmeyen hedef dizini: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s, %s'in kendi içine kaynaşmasına yol açar, yok sayılıyor"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "@printindex içinde bilinmeyen indeks `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "`%s' içine birleştirilmiş bir diğer `%s' dizini yazdırılıyor"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "Belge başlangıcından önce printindex: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "@%s arg `top' ya da `bottom' olmalıdır, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Yalnızca @%s 10 ya da 11 destekleniyor, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "@%s arg `separate' ya da `end' olmalıdır, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s arg `on', `off' veya `odd' olmalıdır, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "@paragrafindent arg sayısal/'none'/`asis' olmalıdır, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "@firstparagraphindent arg `none' ya da `insert' olmalıdır, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "@exampleindent arg sayısal/`asis' olmalıdır, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "@%s açık ya da kapalı bekleniyordu, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr "@kbdinputstyle arg `code'/`example'/`distinct' olmalıdır, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "@allowcodebreaks arg `true' ya da `false' olmalıdır, `%s' değil"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "@urefbreakstyle arg `after'/`before'/`none' olmalıdır, `%s' değil"
@@ -2990,7 +2952,7 @@ msgstr "@%s ile ilintili bir bölümleme komutu yok"
msgid "@%s not empty"
msgstr "@%s boÅŸ deÄŸil"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "varolmayan düğüm `%s' e @%s referansı"
@@ -3000,107 +2962,107 @@ msgstr "varolmayan düğüm `%s' e @%s referansı"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s girdi düğüm adı `%s', %s adından farklı `%s'"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "başvurulmamış düğüm `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "düğüm `%s' `%3$s' için bölümlemede %s fakat menüde değil"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "düğüm %s `%3$s' menüsündeki `%s' ve bölümlemedeki `%4$s' farklı"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "düğüm `%s' menüdeki `%s' için %s fakat bölümlemede değil"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "`%s' %s göstergesi (düğüm `%s' için) `%s' %s adından farklı"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "varolmayan düğüm `%s' e %s referansı"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"düğüm `%s', Yukarı hedefi olmasına karşın, `%s' için eksik menü öğesi "
"içeriyor"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "`%s' için, menü `%s' deki yukarı ve `%s' yukarısı eşleşmiyor"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "`%s' e @%s, `%s' %s adından farklı"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "@%s'de boş dizin anahtarı"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm %s'i yazmak için açamıyor: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: %s'i kapatmada hata: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: latex dosyası %s yazmak için açılamıyor: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: L2H_TMP dizini bir nokta içeriyor"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: mevcut dizin bir nokta içeriyor"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: komut başarılı omadı: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: resmin geçersiz uzantısı var: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: %s'in %s olarak yeniden adlandırılması başarısız: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: %s açılamıyor: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: @%s ögesinin sonu %d bulunamadı"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3109,59 +3071,59 @@ msgstr ""
"latex2html.pm: işleme HTML'de %d öğe üretti; %d bekleniyordu, belgede "
"bulunan öğe sayısı"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: %d parçası @%s için belirlenemedi"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr "l2h: %d parçası, @%s için HTML'den çıktı sayacı %d ile çıkarılamadı"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: %s yüklenemedi: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: %s yazmak için açılamıyor: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: %s açılamadı: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: %s dizinine geçme başarısız: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: başlangıç dizinine dönülemedi: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: çıktı dosyası kayıp: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: komut başarısız: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: @%s sonu %d ögesi bulunamadı"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3170,12 +3132,12 @@ msgstr ""
"tex4ht.pm: işleme HTML'de %d öge üretti; %d bekleniyordu, @%s için belgede "
"bulunan öge sayısı"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: çıktıda @%s %s için hiç HTML ögesi yok"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3184,37 +3146,37 @@ msgstr ""
"tex4ht.pm: işleme HTML'de %d öge toparladı; %d bekleniyordu, @%s için "
"belgede bulunan öge sayısı"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "%s yüklenirken hata: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: bilinmeyen deÄŸiÅŸken %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%sÅž bilinmeyen deÄŸiÅŸken %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "init dosyası %s okunamıyor"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "tanınamayan TEXINFO_OUTPUT_FORMAT değeri `%s' yok sayılıyor.\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Kullanım: %s [SEÇENEK]... TEXINFO-DOSYASI...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3229,7 +3191,7 @@ msgstr ""
"Bu program genellikle hem `makeinfo', hem de `texi2any' ÅŸeklinde kurulur;\n"
"davranış, kurulum adından bağımsız olarak, özdeştir.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3265,7 +3227,7 @@ msgstr ""
" -v, --verbose ne yapılıyor olduğunu açıklar.\n"
" --version sürüm bilgisini görüntüler ve çıkar.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3285,7 +3247,7 @@ msgstr ""
" belirtilen çıktıyı oluşturmak için "
"texi2dvi'ı çağırır.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3337,7 +3299,7 @@ msgstr ""
" Aksi halde, HEDEF çıktı dosyasını "
"adlandırır.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3378,7 +3340,7 @@ msgstr ""
" --spilt-size=NUM Info dosyalarını NUM boyutuna böler (öntanımlı "
"%d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3404,7 +3366,7 @@ msgstr ""
"dosyaları üretir;\n"
" öntanımlısı yalnızca bölünmüşse atanır.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3413,7 +3375,7 @@ msgstr ""
" --output-indent=DEĞ hiçbir şey yapmaz, uyumluluk için "
"korunmuÅŸtur.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3421,7 +3383,7 @@ msgstr ""
"DVI/PS/PDF için Seçenekler:\n"
" --Xopt=OPT OPT'i texi2dvi'e aktar; yinelenebilir.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3441,7 +3403,7 @@ msgstr ""
" -P DIR \t\tDIR'ı @include arama yolu başına ekler.\n"
" -U VAR \t\tVAR değişkeni tanımsız, @clear ile olduğu gibi.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3477,7 +3439,7 @@ msgstr ""
"\n"
" Ayrıca --no-ifFORMAT seçenekleri için @ifnotFORMAT metnini işler.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3493,7 +3455,7 @@ msgstr ""
" eğer salt metin oluşturuluyorsa, --ifplaintext açık, diğerleri kapalıdır;\n"
" eğer XML oluşturuluyorsa, --ifxml açık, deiğerleri kapalıdır.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3523,63 +3485,63 @@ msgstr ""
" makeinfo --no-split foo.texi ne büyüklükte olursa olsun tek Info "
"dosyası yazar\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style arg. `separate' ya da `end' olmalıdır, `%s' değil.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent arg. sayısal/`none'/`asis' olmalıdır, `%s' değil.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: %s oluşturulurken -o ile yalnızca bir girdi DOSYAsı belirtilebilir\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "yazdırılmış çıktı olmadan--Xopt seçeneği"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "bilinmeyen ağaç dönüşümü %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "%s biçemi için bölme yok sayılıyor"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: dosya argümanı eksik.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr "fill_gaps_in_sectioning dönüşümü sonuç geri döndürmedi. Bölüm yok mu?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "%s makro genişletme dosyasını kapatmada hata: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "%s yazmak için açılamıyorı: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3587,21 +3549,254 @@ msgstr ""
"insert_nodes_for_sectioning_commands dönüşümü sonuç geri döndürmüyor. Bölüm "
"yok mu?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: %s'i kapatmada hata: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: %s dahili bağlantı dosyasını kapatmada hata: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: %s yazmak için açılamıyorı: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "eÅŸleÅŸen `@end %s' yok"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "yanlış yerleştirilmiş {"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "eÅŸleÅŸmeyen `@end %s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "@set bir isim gerektirir"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "@set için kötü isim"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "@clear bir isim gerektirir"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "@clear için kötü isim"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "@unmacro bir isim gerektirir"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "@unmacro için kötü isim"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr ""
+"@clickstyle bağımsız değişken olarak yalnızca bir @-command kabul etmelidir, "
+"`%s' deÄŸil"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "@alias'a argüman olarak çevre komutu %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "@alias'a hatalı argüman"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "@definfoenclose'a hatalı argüman"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "@columnfractions'da boş argüman"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "@printindex'e hatalı argüman: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Yalnızca @fonttextsize 10 veya 11 destekleniyor, `%s' değil"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "@footnotestyle arg `separate' veya `end' olmalıdır, `%s' değil"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "@setchapternewpage arg `on', `off' veya `odd' olmalıdır, `%s' değil"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "@need'e hatalı argüman: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "@firstparagraph arg `none' veya `insert' olmalıdır, `%s' değil"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "@headings'e hatalı argüman: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s bir argüman gerektirir: @item öğesi için biçimlendirici"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "eÅŸleÅŸmeyen `@end'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "@end %s'e fazladan argüman: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "@end'e kötü argüman: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: %s bulunamıyor"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: %s açılamıyor:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "ilk unsurdan sonra @setfilename"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions yalnızca bir @multitable satırında anlamlıdır"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+"@node @part'den önce geliyor, fakat parçaları düğümlerle ilişkili olmayabilir"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s bloğu içinde @%s anlamlı değil"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "`@copying' bloğu içinde @%s'e izin verilmez"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry yalnızca indeks bağlamında görünmelidir"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "`@titlepage' ve `@quotation' çevreleri dışında @author anlamlı değil"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s bir isim gerektirir"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "hatalı ya da boş @%s resmi argümanı: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless argüman olarak `i' ya da `j' gerektirir, `%c' değil"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "tanımlanmamış bayrak: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s kullanımdan kalkmış."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s kullanımdan kalkmış; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ yalnızca matematik bağlamında görünmelidir"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "iliÅŸkili karakteri olmayan @verb"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless argüman olarak `i' ya da `j' gerektirir, `%s' değil"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "yanlış yerleştirilmiş }"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "yeniden adlandırılacak düğüm yok"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "dosya sonunda yeni adı olmayan düğümler"
+
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr "yeniden adlandırılmış düğüm dosyası (`%s') kullanımdan kaldırıldı"
+
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "`%s' nin önceki adı bu belgenin bir düğümüdür"
+
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "yeniden adlandırılmış `%s' düğüm dosyası boş"
+
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "hedef düğüm (`%s' nin yeni adı) belgede yok: %s"
+
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "yeniden adlandırılmış düğüm yeniden yönlendirme dosyası %s'i kapatmada "
+#~ "hata: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "boş düğüm adı"
+
#~ msgid "can't open %s: %s"
#~ msgstr "%s açılamıyor: %s"
@@ -3617,9 +3812,6 @@ msgstr "%s: %s yazmak için açılamıyorı: %s\n"
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Kullanım dışı değişken %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s @top ile ilintili olmamalı"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: kullanım dışı değişken %s\n"
diff --git a/macros/texinfo/texinfo/po/uk.gmo b/macros/texinfo/texinfo/po/uk.gmo
index c4d11e5053..bee719e238 100644
--- a/macros/texinfo/texinfo/po/uk.gmo
+++ b/macros/texinfo/texinfo/po/uk.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/uk.po b/macros/texinfo/texinfo/po/uk.po
index 717b306a02..5d10dc3bb9 100644
--- a/macros/texinfo/texinfo/po/uk.po
+++ b/macros/texinfo/texinfo/po/uk.po
@@ -7,12 +7,12 @@
# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2015, 2016, 2017, 2019.
msgid ""
msgstr ""
-"Project-Id-Version: texinfo 6.5.93\n"
+"Project-Id-Version: texinfo 6.6.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2019-02-12 21:27+0200\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-08-20 12:39+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 19.03.70\n"
+"X-Generator: Lokalize 19.11.70\n"
#: gnulib/lib/error.c:195
msgid "Unknown system error"
@@ -246,7 +246,6 @@ msgid "Insert completion"
msgstr "Ð’Ñтавити доповненнÑ"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Побудова ÑпиÑку доповнень..."
@@ -270,7 +269,6 @@ msgid "found file %s"
msgstr "знайдено файл %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ виноÑки"
@@ -283,7 +281,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- ВиноÑки ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Триває пошук пунктів покажчика..."
@@ -292,7 +289,6 @@ msgid "Look up a string in the index for this file"
msgstr "Знайти Ñ€Ñдок у покажчику цього файла"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Ðе знайдено покажчиків"
@@ -301,7 +297,6 @@ msgid "Index entry: "
msgstr "Пункт покажчика: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Ðе знайдено покажчиків."
@@ -319,7 +314,6 @@ msgstr ""
"«\\[index-search]»"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Ðемає попередніх Ñ€Ñдків пошуку у покажчику"
@@ -384,7 +378,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Жоден доÑтупний файл info не міÑтить «%s» у покажчику"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби змінити ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñимволів у файлі"
@@ -399,7 +392,6 @@ msgid "Cannot find node '%s'"
msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ вузол «%s»"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Ðе вказано назви програми"
@@ -428,7 +420,7 @@ msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s Ñ” некоректним Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— %s"
msgid "Try --help for more information.\n"
msgstr "Спробуйте --help, щоб отримати більше інформації.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -570,7 +562,7 @@ msgstr ""
" info -f ./foo.info проÑто показати файл ./foo.info, без пошуку у "
"каталозі"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -881,17 +873,14 @@ msgid "could not open init file %s"
msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл ініціалізації %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "поÑлідовніÑÑ‚ÑŒ клавіш занадто довга"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "відÑÑƒÑ‚Ð½Ñ Ð¿Ð¾ÑлідовніÑÑ‚ÑŒ клавіш"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "Ñимвол NUL (\\000) не дозволений"
@@ -901,12 +890,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "Ñимвол NUL (^%c) не дозволений"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "пропущено назву дії"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "не можна пов’Ñзувати поÑлідовніÑÑ‚ÑŒ клавіш із цифрою меню"
@@ -916,7 +903,6 @@ msgid "unknown action `%s'"
msgstr "невідома Ð´Ñ–Ñ `%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "назва дії занадто довга"
@@ -926,22 +912,18 @@ msgid "extra characters following action `%s'"
msgstr "зайві Ñимволи піÑÐ»Ñ Ð´Ñ–Ñ— `%s'"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "пропущено назву змінної"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "пропущено знак `=' одразу піÑÐ»Ñ Ð½Ð°Ð·Ð²Ð¸ змінної"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "назва змінної занадто довга"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ довге"
@@ -963,7 +945,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Читає назву команди з Ñ€Ñдка повідомлень та запуÑкає Ñ—Ñ—"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Ðеможливо запуÑтити команду «echo-area» звідÑи"
@@ -1048,7 +1029,6 @@ msgid "Show all matching files"
msgstr "Показати уÑÑ– відповідні файли"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Ðемає покажчика файлів"
@@ -1359,7 +1339,6 @@ msgid "Select the most recently selected node"
msgstr "Позначити оÑтанній з позначених вузлів"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "У журналі немає попереднього вузла"
@@ -1420,12 +1399,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Перемикнути викориÑÑ‚Ð°Ð½Ð½Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¸Ñ… виразів під Ñ‡Ð°Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Під Ñ‡Ð°Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ викориÑтовуватимутьÑÑ Ñ„Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ñ– вирази"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Під Ñ‡Ð°Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ викориÑтовуватимутьÑÑ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ñ– Ñ€Ñдки"
@@ -1442,8 +1419,7 @@ msgstr "Пошук продовжено з початку документа"
msgid "Searching subfile %s ..."
msgstr "Пошук підфайлу %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Помилка пошуку"
@@ -1477,140 +1453,138 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "РÑдок пошуку Ñ” надто коротким"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "ПовертаємоÑÑ Ð´Ð¾ оÑтаннього відповідника від %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Це був оÑтанній результат"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Шукати Ñ€Ñдок у цьому вузлі Ñ– уÑÑ–Ñ… підлеглих вузлах"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Пошук у %s: "
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Перейти до наÑтупного відповідника у піддереві Info"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Ðемає активного пошуку"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Перейти до попереднього відповідника у піддереві Info"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Прочитати Ñ€Ñдок та знайти його, враховуючи регіÑÑ‚Ñ€"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Прочитати Ñ€Ñдок та знайти його"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Прочитати Ñ€Ñдок та знайти його у попередньому текÑÑ‚Ñ–"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Повторити попередній пошук у тому ж напрÑмі"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Ðема попереднього Ñ€Ñдку пошуку"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Повторити пошук у зворотньому напрÑмі"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Явно показані результати пошуку"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Шукати Ñ€Ñдок інтерактивно, поки ви його набираєте"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "I-пошук назад за формальним виразом: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "I-пошук назад: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "I-пошук за формальним виразом: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "I-пошук: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Ðевдалий "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "СкаÑувати поточну операцію"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Завершено"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Показати верÑÑ–ÑŽ запущеного екземплÑра Info"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info верÑÑ–Ñ— %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Оновити зображеннÑ"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Вийти з Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "ЗапуÑтити команду, призначену цій клавіші у нижньому регіÑтрі"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Ðевідома команда (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "невірна поÑлідовніÑÑ‚ÑŒ \"%s\""
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "«%s» є некоректним"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Додати цю цифру до поточного чиÑлового аргументу"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Ініціювати (чи помножити на 4) поточний чиÑловий аргумент"
@@ -1966,12 +1940,10 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ (%s) Ñ– не вдалоÑÑ Ñтворити (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY без відповідного END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY без відповідного START-INFO-DIR-ENTRY"
@@ -2001,13 +1973,11 @@ msgid "excess command line argument `%s'"
msgstr "зайвий аргумент `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Ðе вказано вхідних файлів; Ñпробуйте --help, щоб отримати більше інформації."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Ðе вказано файл каталогу; Ñпробуйте --help, щоб отримати більше інформації."
@@ -2027,24 +1997,24 @@ msgstr "немає запиÑу info dir у `%s'"
msgid "no entries found for `%s'; nothing deleted"
msgstr "у `%s' запиÑів не знайдено; нічого не вилучено"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"переÑуньте команду @contents, Ñкщо піÑÐ»Ñ Ñ‚Ð¸Ñ‚ÑƒÐ»ÑŒÐ½Ð¾Ñ— Ñторінки має бути текÑÑ‚"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2052,284 +2022,238 @@ msgstr ""
"переÑуньте команди @shortcontents Ñ– @contents, Ñкщо піÑÐ»Ñ Ñ‚Ð¸Ñ‚ÑƒÐ»ÑŒÐ½Ð¾Ñ— Ñторінки "
"має бути текÑÑ‚"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s не є коректним кодом мови"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s не є коректним кодом регіону"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "%s не Ñ” коректною можливіÑÑ‚ÑŽ поділу"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "помилка під Ñ‡Ð°Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ð° @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "немає вузла Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "вузли без нової назви наприкінці файла"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "викориÑÑ‚Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° перейменованих вузлів («%s») вважаєтьÑÑ Ð·Ð°Ñтарілим"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "не вдалоÑÑ ÐµÐºÑ€Ð°Ð½ÑƒÐ²Ð°Ñ‚Ð¸ Ñимвол решітки у @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ Ð½Ð°Ð·Ð²Ð° вузла піÑÐ»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Â«%s»"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s «%s» визначено раніше"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "попереднє Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñк @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "порожній аргумент у @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: виведені дані неÑуміÑні із поділом"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "помилка під Ñ‡Ð°Ñ Ñпроби закрити %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "не вдалоÑÑ Ñтворити каталок «%s» або «%s»: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "не вдалоÑÑ Ñтворити каталог «%s»: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "не знайдено файл @image «%s», викориÑтовуємо «%s»"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "не вказано аргументу @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "не знайдено файл @image «%s» (Ð´Ð»Ñ HTML), викориÑтовуємо «%s»"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "формат необроблених даних %s не перетворено"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл налаштувань поÑилань html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "пропущено тип"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "нерозпізнаний тип: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "помилка під Ñ‡Ð°Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ð° налаштувань поÑилань html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "незавершений Ñ€Ñдок у файлі css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "--css-include завершуєтьÑÑ ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€ÐµÐ¼"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "незавершений Ð·Ð°Ð¿Ð¸Ñ @import у файлі css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "Файл CSS %s не знайдено"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ --include-файл %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "помилка під Ñ‡Ð°Ñ Ñпроби закрити файл CSS %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "не знайдено запиÑу htmlxref.cnf Ð´Ð»Ñ Â«%s»"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "помилка під Ñ‡Ð°Ñ Ñпроби закрити файл фрейма %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "помилка під Ñ‡Ð°Ñ Ñпроби закрити файл фрейма зміÑту %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "помилка обробника %s на етапі %s, пріоритетніÑÑ‚ÑŒ %s"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "Ñлід вказати заголовок за допомогою команди title або @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "помилка під Ñ‡Ð°Ñ Ñпроби закрити файл переÑпрÑÐ¼Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÑƒÐ·Ð»Ð° %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "Ñтарою назвою Ð´Ð»Ñ Â«%s» Ñ” вузол документа"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "файл перейменованого вузла «%s» є порожнім"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-"вузол Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ (нова назва Ð´Ð»Ñ Â«%s») перебуває за межами документа: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-"помилка під Ñ‡Ð°Ñ Ñпроби Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ð° переÑпрÑÐ¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ вузла, "
-"%s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ Ð½Ð°Ð·Ð²Ð° вузла"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "ÑинтакÑÐ¸Ñ Ð´Ð»Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½ÑŒÐ¾Ð³Ð¾ вузла викориÑтано Ð´Ð»Ñ Â«%s»"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "документ без вузлів"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "документ без вузла Top"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "Ñпроба Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ %s зазнала невдачі: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ @%s декілька разів: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s поза межами будь-Ñкого вузла"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "назва @node не повинна міÑтити «,»: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ° у @%s з : призводить до некоректного Info: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "пункт покажчика «%s» ззовні будь-Ñкого вузла"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "помилка під Ñ‡Ð°Ñ Ñпроби закрити файл текÑту Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Ðеможливо прочитати файл @image `%s': %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr "не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ файл @image «%s.txt» або текÑÑ‚-замінник"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2337,303 +2261,327 @@ msgstr ""
"@strong{Note...} Ñтворює хибні перехреÑні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñƒ Info; переформулюйте, "
"уникаючи цього"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "у назві перехреÑного поÑÐ¸Ð»Ð°Ð½Ð½Ñ @%s не повинно міÑтитиÑÑ Â«:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "У назві вузла @%s не повинно міÑтитиÑÑ Â«%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "у назві вузла @%s не повинно міÑтитиÑÑ Â«:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "піÑÐ»Ñ @xref має бути «.» або «,», але не %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "піÑÐ»Ñ @xref має бути «.» або «,»"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "у назві вузла пункту меню не повинно бути «%s»"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "у назві вузла пункту меню не повинно бути «:»"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "у назві пункту меню не повинно бути «:»"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "декілька @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "помилковий або порожній формальний аргумент @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "помилковий ÑинтакÑÐ¸Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñƒ @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s вимагає вказати назву"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "помилкова назва @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s розташовано до кінцевої дужки @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s розташовано до кінцевої дужки @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s не має завершальної фігурної дужки"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "у @%s не виÑтачає кінцевої поÑлідовноÑÑ‚Ñ–-роздільника: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx не може починатиÑÑ Ð· @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx Ñлід викориÑтовувати піÑÐ»Ñ @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s міÑтить текÑÑ‚ без @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "`@end' очікує `%s', натоміÑÑ‚ÑŒ отримано `%s'"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s розташовано до @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "не знайдено відповідного `%cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "неправильно розташоване %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "«%c%s» без відповідника"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«%s» викликано з надмірною кількіÑÑ‚ÑŽ аргументів"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s не має завершальної фігурної дужки"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr ""
"Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Â«%s» оголошено без аргументу, з Ñким його Ñлід викликати"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "за \\ у розгортанні @%s Ñлідує «%s» заміÑÑ‚ÑŒ назви параметра або \\"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "не виÑтачає назви @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "не виÑтачає категорії Ð´Ð»Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "неочікуваний аргумент у Ñ€Ñдку @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "порожнє Ñередовище multitable"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "зайвий аргумент @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "помилковий аргумент до @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s потребує аргументу: форматер Ð´Ð»Ñ %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"команда @%s, що не приймає аргументів у дужках, не повинна розташовуватиÑÑ Ñƒ "
"Ñ€Ñдку @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "команду акцентуваннÑ, «@%s», не можна викориÑтовувати у аргументі @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "не виÑтачає аргументу @%s"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "невідома команда @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "зайвий аргумент @%s, %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "помилковий аргумент @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Â«%s» не Ñ” канонічним кодуваннÑм texinfo"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "невідома назва ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ `%s'"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s піÑÐ»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ елемента"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s має ÑÐµÐ½Ñ Ð»Ð¸ÑˆÐµ у Ñ€Ñдку @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr "@part не повинно бути пов’Ñзано з @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr "@node передує @%s, але чаÑтини не можна пов’Ñзувати з вузлами"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "ÑинтакÑÐ¸Ñ Ð´Ð»Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½ÑŒÐ¾Ð³Ð¾ вузла викориÑтано Ð´Ð»Ñ Â«%s»"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ Ð½Ð°Ð·Ð²Ð° пункту меню у «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ Ð½Ð°Ð·Ð²Ð° вузла у пункті меню"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s не повинно бути у @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s не повинно бути на початку Ñ€Ñдка"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ `%s' вже було визначене"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "попереднє Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ `%s' тут"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "Ð¿ÐµÑ€ÐµÐ²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ мови Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s без пов’Ñзаного Ñимволу"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"команду @%s, визначену без аргументів або з понад одним аргументом, Ñлід "
"викликати з дужками, {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2641,351 +2589,366 @@ msgstr ""
"виклик Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð¾ надто глибоко (вÑтановіть більше Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ "
"MAX_NESTED_MACROS; поточне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ â€” %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
"не можна рекурÑивно викликати Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s; Ñкщо потрібно, "
"ÑкориÑтайтеÑÑ @rmacro"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "піÑÐ»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð°ÐºÑ†ÐµÐ½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Â«@%s» має бути Ñимвол пробілу"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "викориÑтовуйте дужки, щоб передати команду Ñк аргумент до @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s потрібен аргумент «i» або «j», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "піÑÐ»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð°ÐºÑ†ÐµÐ½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Â«@%s» має бути Ñимвол розриву Ñ€Ñдка"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s потрібні дужки"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "невідома команда «%s»"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "невідомий прапорець: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "помилковий ÑинтакÑÐ¸Ñ Ð´Ð»Ñ @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s Ñ” заÑтарілим."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s Ñ” заÑтарілим; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s не повинно бути на початку Ñ€Ñдка"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s має бути розташовано лише у верхньому або нижньому колонтитулі"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s не має ÑенÑу уÑередині блоку `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s у порожньому multitable"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab перед @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "занадто багато Ñтовпчиків у об’єкті multitable (макÑимум %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "пропуÑкаєтьÑÑ @tab зовні multitable"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s поза межами таблиці або ÑпиÑку"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s не можна викориÑтовувати вÑередині блоку «@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr "@%s має викориÑтовуватиÑÑ Ð»Ð¸ÑˆÐµ у запиÑÑ– покажчика"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+"не можна викориÑтовувати більше ніж два рівні вкладеноÑÑ‚Ñ– Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñів "
+"покажчика"
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "має бути розташовано піÑÐ»Ñ Â«@%s», щоб можна було кориÑтуватиÑÑ Â«@%s»"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
-msgstr "@%s не має ÑенÑу ззовні оточень `@titlepage' та `@quotation'"
+msgstr "@%s не має ÑенÑу поза Ñередовищами «@titlepage» та «@quotation»"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory піÑÐ»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ вузла"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "не можна викориÑтовувати регіон %s вÑередині регіону %s"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry піÑÐ»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ вузла"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu у некоректному контекÑÑ‚Ñ–"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s розташовано перед першим @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"мабуть, ваш вузол @top повинен бути обгорнутий у @ifnottex заміÑÑ‚ÑŒ @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s має викориÑтовуватиÑÑ Ð»Ð¸ÑˆÐµ у запиÑÑ– покажчика"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s має викориÑтовуватиÑÑ Ð»Ð¸ÑˆÐµ у контекÑÑ‚Ñ– формул"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "неочікуване @"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s не має ÑенÑу ззовні Ñередовища «@float»"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s має бути розташовано одразу під «@float»"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "ігноруємо зайві @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "команді @%s не передаютьÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ð¸"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "у команді @%s не виÑтачає аргументу вузла або зовнішнього підручника"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
"у @%s виÑвлено порожню назву перехреÑного поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Â«%s»"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
"у @%s виÑвлено порожній заголовок перехреÑного поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ñ–ÑÐ»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ "
"«%s»"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "не вказано аргумент назви файлу Ð´Ð»Ñ @image"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "у @%s не виÑтачає першого аргументу"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "нешіÑтнадцÑткові цифри у аргументі @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "менше за 4 шіÑтнадцÑткові цифри у аргументі @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
"аргумент @U перевищує за розміром макÑимальний розмір Ð´Ð»Ñ Unicode, 0x10FFFF: "
"%s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "зайві аргументи Ð´Ð»Ñ Ð²ÑƒÐ·Ð»Ð°"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "мало бути @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s приймає Ñк аргумент лише @-команди, але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "залишковий аргумент у Ñ€Ñдку @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "команда Ñередовища %s Ñк аргумент @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "порожній Ð·Ð°Ð¿Ð¸Ñ @%s"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "чаÑтка Ñтовпчика не Ñ” чиÑлом: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "аргументом @sp має бути чиÑло, а не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "зарезервована назва індекÑу %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "невідомий Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð¶ÐµÑ€ÐµÐ»Ð° у @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "невідомий Ñ–Ð½Ð´ÐµÐºÑ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñƒ @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr "@%s призведе до Ð¾Ð±â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ %s з Ñамим Ñобою, ігноруємо"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "невідомий Ñ–Ð½Ð´ÐµÐºÑ Â«%s» у @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "друкуємо покажчик «%s» об’єднаний з іншим, «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "printindex до початку документа: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "аргументом @%s має бути «top» або «bottom», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "ПідтримуютьÑÑ Ð»Ð¸ÑˆÐµ @%s 10 чи 11, а не `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "аргументом @%s має бути «separate» або «end», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "аргументом @%s має бути «on», «off» або «odd», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"аргументом @paragraphindent має бути чиÑло, «none» або «asis», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"аргументом @firstparagraphindent має бути «none» або «insert», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "аргументом @exampleindent має бути чиÑло або «asis», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "@%s мало бути on або off, але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"аргументом @kbdinputstyle має бути «code»/«example»/«distinct», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "аргументом @allowcodebreaks має бути «true» або «false», але не «%s»"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"аргументом @urefbreakstyle має бути «after»/«before»/«none», але не «%s»"
@@ -3015,7 +2978,7 @@ msgstr "з @%s не пов’Ñзано жодної команди Ñтрукт
msgid "@%s not empty"
msgstr "@%s не є порожнім"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s поÑилаєтьÑÑ Ð½Ð° відÑутній вузол «%s»"
@@ -3025,107 +2988,107 @@ msgstr "@%s поÑилаєтьÑÑ Ð½Ð° відÑутній вузол «%s»"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "назва вузла запиÑу @%s, «%s», відрізнÑєтьÑÑ Ð²Ñ–Ð´ назви %s, «%s»"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "вузол, на Ñкий нема поÑилань `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr "вузол «%s» Ñ” вузлом %s Ð´Ð»Ñ Â«%s» у Ñтруктурі розділів, але не у меню"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
"виÑвлено відмінноÑÑ‚Ñ– у запиÑах вузла %s «%s» у меню «%s» Ñ– у Ñтруктурі "
"розділів «%s»"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "вузол «%s» Ñ” вузлом %s Ð´Ð»Ñ Â«%s» у меню, але не у Ñтруктурі розділів"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "вказівник %s, «%s», (Ð´Ð»Ñ Ð²ÑƒÐ·Ð»Ð° «%s») відрізнÑєтьÑÑ Ð²Ñ–Ð´ назви %s, «%s»"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s поÑилаєтьÑÑ Ð½Ð° відÑутній «%s»"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "вузол `%s' не має пункту меню Ð´Ð»Ñ `%s', хоча й Ñ” його горішнім вузлом"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "Ð´Ð»Ñ Â«%s», вгору меню «%s» Ñ– вгору «%s» відрізнÑÑŽÑ‚ÑŒÑÑ Ð¾Ð´Ð¸Ð½ від одного"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s до «%s», відрізнÑєтьÑÑ Ð²Ñ–Ð´ назви %s, «%s»"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "порожній ключ індекÑу у @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: помилка під Ñ‡Ð°Ñ Ñпроби закрити %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл latex %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу даних: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: назва каталогу L2H_TMP міÑтить крапку"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: назва поточного каталогу міÑтить крапку"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: не вдалоÑÑ ÑƒÑпішно виконати команду: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: ÑÑƒÑ„Ñ–ÐºÑ Ð½Ð°Ð·Ð²Ð¸ файла Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñ” некоректним: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: Ñпроба Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ %s на %s завершилаÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: не знайдено Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñу @%s з номером %d"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3134,12 +3097,12 @@ msgstr ""
"latex2html.pm: оброблÑємо Ñтворені %d запиÑів у HTML; мало бути %d, "
"кількіÑÑ‚ÑŒ запиÑів, знайдених у документі"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: не вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ фрагмент %d Ð´Ð»Ñ @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3148,47 +3111,47 @@ msgstr ""
"l2h: не вдалоÑÑ Ð²Ð¸Ð´Ð¾Ð±ÑƒÑ‚Ð¸ фрагмент %d Ð´Ð»Ñ @%s з лічильником Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ %d з "
"HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: не вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу даних: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: помилка під Ñ‡Ð°Ñ Ñпроби змінити каталог на %s: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: не вдалоÑÑ Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ÑÑ Ð´Ð¾ початкового каталогу: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: не вказано файла Ð´Ð»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: помилка команди: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: не знайдено Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñу @%s з номером %d"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3197,12 +3160,12 @@ msgstr ""
"tex4ht.pm: оброблÑємо Ñтворені %d запиÑів у HTML; мало бути %d, кількіÑÑ‚ÑŒ "
"запиÑів, знайдених у документі Ð´Ð»Ñ @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: у виведених даних немає запиÑу HTML Ð´Ð»Ñ @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3211,37 +3174,37 @@ msgstr ""
"tex4ht.pm: оброблÑємо отримані %d запиÑів у HTML; мало бути %d, кількіÑÑ‚ÑŒ "
"запиÑів, знайдених у документі Ð´Ð»Ñ @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "помилка під Ñ‡Ð°Ñ Ñпроби Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: невідома змінна %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: невідома змінна %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ файл ініціалізації %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "пропуÑкаємо невідоме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ TEXINFO_OUTPUT_FORMAT «%s».\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Usage: %s [ПÐРÐМЕТР]... ФÐЙЛ-TEXINFO...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3257,7 +3220,7 @@ msgstr ""
"«texi2any»;\n"
"поведінка цих компонентів є однаковою і не залежить від назви програми.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3294,7 +3257,7 @@ msgstr ""
" -v, --verbose опиÑувати, що буде робитиÑÑ.\n"
" --version показати інформацію про верÑÑ–ÑŽ й вийти.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3314,7 +3277,7 @@ msgstr ""
" піÑÐ»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ коректноÑÑ‚Ñ– файла ФÐЙЛ-"
"TEXINFO.\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3369,7 +3332,7 @@ msgstr ""
" У інших випадках, ПРИЗÐÐЧЕÐÐЯ визначає назву "
"файла-результату.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3409,7 +3372,7 @@ msgstr ""
" --split-size=ЧИСЛО розбивати файли Info, Ñкщо їхній розмір "
"перевищує ЧИСЛО (типово %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3437,7 +3400,7 @@ msgstr ""
" типово вÑтановлюєтьÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ–Ð»ÐµÐ½Ð¸Ñ… "
"документів.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3446,7 +3409,7 @@ msgstr ""
" --output-indent=VAL нічого не робити, збережено Ð´Ð»Ñ Ð·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½Ð¾Ñ— "
"ÑуміÑноÑÑ‚Ñ–.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3455,7 +3418,7 @@ msgstr ""
" --Xopt=ПÐРÐМЕТР передати ПÐРÐМЕТР texi2dvi; можна "
"викориÑтовувати декілька разів.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3478,7 +3441,7 @@ msgstr ""
" -U ЗМІÐÐÐ Ñкинути Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð—ÐœÐ†ÐÐОЇ, те ж Ñаме, що "
"@clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3515,7 +3478,7 @@ msgstr ""
"\n"
" Параметри --no-ifФОРМÐТ також вмикають обробку текÑту у @ifnotФОРМÐТ.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3531,7 +3494,7 @@ msgstr ""
" Ñкщо Ñтворюємо проÑтий текÑÑ‚ - --ifplaintext ввімкнено, а інші вимкнено;\n"
" Ñкщо Ñтворюємо XML - --ifxml ввімкнено, а інші вимкнено.\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3566,68 +3529,68 @@ msgstr ""
" makeinfo --no-split foo.texi запиÑати вÑе в один файл Info (він "
"буде великим)\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: аргумент до --footnote-style має бути `separate' чи `end', а не `%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: аргумент до --paragraph-indent має бути чиÑлом, `none' чи `asis', а не `"
"%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ %s, за допомогою -o можна вказувати лише один файл вхідних "
"даних\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "викориÑтано параметр --Xopt без Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ñ€ÑƒÐºÐ¾Ð²Ð°Ð½Ð¾Ð³Ð¾ виведеннÑ"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "невідоме Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ–Ñ”Ñ€Ð°Ñ€Ñ…Ñ–Ñ— %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "ігноруємо поділ Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñƒ %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: не вказано аргумент назви файлу.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Спробуйте `%s --help', щоб отримати більше інформації.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ fill_gaps_in_sectioning не дало ніÑких результатів. Ðемає "
"розділу?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr ""
"помилка під Ñ‡Ð°Ñ Ñпроби закрити файл Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð¼Ð°ÐºÑ€Ð¾Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3635,21 +3598,255 @@ msgstr ""
"ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ insert_nodes_for_sectioning_commands не дало ніÑких "
"результатів. Ðемає розділу?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: помилка під Ñ‡Ð°Ñ Ñпроби закрити %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: помилка під Ñ‡Ð°Ñ Ñпроби закрити файл внутрішніх поÑилань %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу даних: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, c-format
+msgid "no matching `@end %s'"
+msgstr "не знайдено відповідного «@end %s»"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+msgid "misplaced {"
+msgstr "неправильно розташована {"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, c-format
+msgid "unmatched `@end %s'"
+msgstr "«@end %s» без відповідника"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+msgid "@set requires a name"
+msgstr "%set потребує Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ð·Ð²Ð¸"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr "помилкова назва у @set"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+msgid "@clear requires a name"
+msgstr "%clear потребує Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ð·Ð²Ð¸"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr "помилкова назва у @clear"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+msgid "@unmacro requires a name"
+msgstr "%unmacro потребує Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ð·Ð²Ð¸"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr "помилкова назва у @unmacro"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, c-format
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@clickstyle приймає Ñк аргумент лише @-команди, але не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, c-format
+msgid "environment command %s as argument to @alias"
+msgstr "команда Ñередовища %s Ñк аргумент @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+msgid "bad argument to @alias"
+msgstr "помилковий аргумент до @alias"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+msgid "bad argument to @definfoenclose"
+msgstr "помилковий аргумент до @definfoenclose"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr "порожнє @columnfractions"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, c-format
+msgid "bad argument to @printindex: %s"
+msgstr "помилковий аргумент @printindex: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Передбачено підтримку лише @fonttextsize 10 чи 11, але не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, c-format
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"аргументом до @footnotestyle має бути «separate» чи «end», але не «%s»."
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+"аргументом @setchapternewpage має бути «on», «off» або «odd», але не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, c-format
+msgid "bad argument to @need: %s"
+msgstr "помилковий аргумент @need: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, c-format
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "аргументом @firstparagraph має бути «none» або «insert», але не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, c-format
+msgid "bad argument to @headings: %s"
+msgstr "помилковий аргумент @headings: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, c-format
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s потребує аргументу: заÑіб Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ @item"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+msgid "unmatched `@end'"
+msgstr "«@end» без відповідника"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr "зайвий аргумент @end, %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, c-format
+msgid "bad argument to @end: %s"
+msgstr "помилковий аргумент @end: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr "@include: не вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr "@include: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s:"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr "@setfilename піÑÐ»Ñ Ð¿ÐµÑ€ÑˆÐ¾Ð³Ð¾ елемента"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@columnfractions має ÑÐµÐ½Ñ Ð»Ð¸ÑˆÐµ у Ñ€Ñдку @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr "@node передує @part, але чаÑтини не можна пов’Ñзувати з вузлами"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, c-format
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s не має ÑенÑу уÑередині блоку %s"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, c-format
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s не можна викориÑтовувати вÑередині блоку «@copying»"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr "@subentry має викориÑтовуватиÑÑ Ð»Ð¸ÑˆÐµ у запиÑÑ– покажчика"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@author не має ÑенÑу поза Ñередовищами «@titlepage» та «@quotation»"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, c-format
+msgid "@%s requires a name"
+msgstr "@%s вимагає вказати назву"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr "помилковий або порожній формальний аргумент @%s: "
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "@dotless потрібен аргумент «i» або «j», але не «%c»"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr "невідомий прапорець: %.*s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, c-format
+msgid "@%s is obsolete."
+msgstr "@%s Ñ” заÑтарілим."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, c-format
+msgid "@%s is obsolete; %s"
+msgstr "@%s Ñ” заÑтарілим; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr "@\\ має викориÑтовуватиÑÑ Ð»Ð¸ÑˆÐµ у контекÑÑ‚Ñ– формул"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr "@verb без пов’Ñзаного Ñимволу"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, c-format
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "@dotless потрібен аргумент «i» або «j», але не «%s»"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+msgid "misplaced }"
+msgstr "неправильно розташована }"
+
+#~ msgid "no node to be renamed"
+#~ msgstr "немає вузла Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "вузли без нової назви наприкінці файла"
+
+#~ msgid "using a renamed nodes file (`%s') is deprecated"
+#~ msgstr ""
+#~ "викориÑÑ‚Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° перейменованих вузлів («%s») вважаєтьÑÑ Ð·Ð°Ñтарілим"
+
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "Ñтарою назвою Ð´Ð»Ñ Â«%s» Ñ” вузол документа"
+
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "файл перейменованого вузла «%s» є порожнім"
+
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr ""
+#~ "вузол Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ (нова назва Ð´Ð»Ñ Â«%s») перебуває за межами документа: %s"
+
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr ""
+#~ "помилка під Ñ‡Ð°Ñ Ñпроби Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ð° переÑпрÑÐ¼ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ "
+#~ "вузла, %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ Ð½Ð°Ð·Ð²Ð° вузла"
+
#~ msgid "can't open %s: %s"
#~ msgstr "не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s: %s"
@@ -3665,9 +3862,6 @@ msgstr "%s: не вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу дани
#~ msgid "Obsolete variable %s\n"
#~ msgstr "ЗаÑтаріла змінна %s\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s не повинно бути пов’Ñзано з @top"
-
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: заÑтаріла змінна %s\n"
diff --git a/macros/texinfo/texinfo/po/vi.gmo b/macros/texinfo/texinfo/po/vi.gmo
index 0d9c8bf8ed..dead655a5d 100644
--- a/macros/texinfo/texinfo/po/vi.gmo
+++ b/macros/texinfo/texinfo/po/vi.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/vi.po b/macros/texinfo/texinfo/po/vi.po
index 129fd367bc..587a4dc503 100644
--- a/macros/texinfo/texinfo/po/vi.po
+++ b/macros/texinfo/texinfo/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 6.3.92\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-07-11 14:12+0700\n"
"Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -244,7 +244,6 @@ msgid "Insert completion"
msgstr "Chèn từ gợi ý"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "Äang xây dá»±ng các từ gợi ý…"
@@ -268,7 +267,6 @@ msgid "found file %s"
msgstr "tìm thấy tập tin %s"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "Không thể hiển thị cước chú"
@@ -282,7 +280,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- Cước chú -----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "Äang tìm mục nhập chỉ mục…"
@@ -291,7 +288,6 @@ msgid "Look up a string in the index for this file"
msgstr "Tra tìm chuỗi trong chỉ mục cho tập tin này"
#: info/indices.c:213
-#, c-format
msgid "No indices found"
msgstr "Không tìm thấy chỉ mục"
@@ -300,7 +296,6 @@ msgid "Index entry: "
msgstr "Mục nhập chỉ mục: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "Không tìm thấy chỉ mục."
@@ -317,7 +312,6 @@ msgstr ""
"cuối cùng"
#: info/indices.c:457
-#, c-format
msgid "No previous index search string"
msgstr "Không có chuỗi tìm kiếm chỉ mục kế trước"
@@ -385,7 +379,6 @@ msgid "No available info files have '%s' in their indices"
msgstr "Không có tập tin thông tin sẵn sàng chứa “%s†trong chỉ mục"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr "Gặp lỗi khi chuyển đổi bộ mã ký tự tập tin"
@@ -400,7 +393,6 @@ msgid "Cannot find node '%s'"
msgstr "Không thể tìm thấy nút thông tin “%sâ€"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr "Chưa đưa ra tên chương trình"
@@ -429,7 +421,7 @@ msgstr "giá trị %s là không hợp lệ với biến %s"
msgid "Try --help for more information.\n"
msgstr "Hãy thử lệnh trợ giúp “--help†để xem thông tin thêm.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -567,7 +559,7 @@ msgstr ""
" info -f ./foo.info hiển thị tập tin “./foo.infoâ€, không tìm kiếm "
"thư mục"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -875,17 +867,14 @@ msgid "could not open init file %s"
msgstr "không thể mở tập tin khởi tạo %s"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "chuỗi phím quá dài"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "thiếu chuỗi phím"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "không cho phép ký tự vô giá trị (\\000)"
@@ -895,12 +884,10 @@ msgid "NUL character (^%c) not permitted"
msgstr "không cho phép ký tự vô giá trị (^%c)"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "thiếu tên hành động"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr "không thể buộc chuỗi phím vào trình đơn số"
@@ -910,7 +897,6 @@ msgid "unknown action `%s'"
msgstr "hành Ä‘á»™ng lạ “%sâ€"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "tên hành động quá dài"
@@ -920,22 +906,18 @@ msgid "extra characters following action `%s'"
msgstr "có ký tá»± thêm nằm sau hành Ä‘á»™ng “%sâ€"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "thiếu tên biến"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "thiếu ký tự bằng “=†ngay sau tên biến"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "tên biến quá dài"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "giá trị quá dài"
@@ -957,7 +939,6 @@ msgid "Read a command name in the echo area and execute it"
msgstr "Äá»c tên lệnh trong vùng phản hồi và thá»±c hiện nó"
#: info/m-x.c:134
-#, c-format
msgid "Cannot execute an 'echo-area' command here"
msgstr "Không thể thực hiện lệnh “echo-area†ở đây"
@@ -1040,7 +1021,6 @@ msgid "Show all matching files"
msgstr "Hiển thị má»i tập tin khá»›p mẫu"
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "Không có chỉ mục tập tin"
@@ -1348,7 +1328,6 @@ msgid "Select the most recently selected node"
msgstr "Chá»n nút má»›i chá»n"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr "Không có nút mới hơn trong lịch sử"
@@ -1411,12 +1390,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "Bật/tắt khả năng sử dụng biểu thức chính quy khi tìm kiếm"
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr "Dùng biểu thức chính quy khi tìm kiếm"
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr "Dùng chuỗi nghĩa chữ khi tìm kiếm"
@@ -1433,8 +1410,7 @@ msgstr "Tiến trình tìm kiếm đã tiếp tục từ đầu của tài liệ
msgid "Searching subfile %s ..."
msgstr "Äang tìm kiếm tập tin phụ %s…"
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
msgid "Search failed"
msgstr "Gặp lỗi khi tìm kiếm"
@@ -1468,140 +1444,138 @@ msgstr "%s%s%s: "
msgid "Search string too short"
msgstr "Chuỗi tìm kiếm quá ngắn"
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr "Trở lại đến chỗ khớp cuối từ %s"
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr "Không tìm thấy thêm nữa"
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr "Tìm một chuỗi trong nút này và nút con"
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, c-format
msgid "Search under %s: "
msgstr "Tìm kiếm dưới %s:"
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr "Äi đến chá»— khá»›p kế tiếp trong cây-con Info"
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr "Không có tìm kiếm nào hiện đang hoạt động"
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr "Äi đến chá»— khá»›p kế trÆ°á»›c trong cây-con Info"
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Äá»c chuá»—i và tìm kiếm nó, có phân biệt HOA/thÆ°á»ng"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Äá»c chuá»—i và tìm kiếm nó"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Äá»c chuá»—i và tìm kiếm theo hÆ°á»›ng ngược"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "Làm lại việc tìm kiếm cuối với cùng hướng"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "Không có chuỗi tìm kiếm trước"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "Làm lại việc tìm kiếm cuối, vỠngược phía hướng"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr "Xóa trình bày khớp mẫu"
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "Tìm kiếm tương tác chuỗi đang gõ"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "Tìm kiếm ngược I dùng biểu thức chính quy: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "Tìm kiếm ngược I: "
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "Tìm kiếm I dùng biểu thức chính quy: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "Tìm kiếm I: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "Äang thất bại "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "Hủy thao tác đang chạy"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "Thoát"
-#: info/session.c:5287
+#: info/session.c:5302
msgid "Display version of Info being run"
msgstr "Hiển thị thông tin phiên bản của Info đang chạy"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info phiên bản %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "Vẽ lại màn hình"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "Thoát khá»i Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "Chạy lệnh đã đóng kết đến biến thế chữ thÆ°á»ng của phím này"
-#: info/session.c:5358
+#: info/session.c:5373
#, c-format
msgid "Unknown command (%s)"
msgstr "Lệnh lạ (%s)"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "“%s†không hợp lệ"
-#: info/session.c:5362
+#: info/session.c:5377
#, c-format
msgid "'%s' is invalid"
msgstr "“%s†không hợp lệ"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "Thêm chữ số này vào đối số thuộc số hiện tại"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Bắt đầu (hoặc nhân với 4) đối số thuộc số hiện tại)"
@@ -1951,14 +1925,12 @@ msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: không thể Ä‘á»c (%s) và không thể tạo (%s)"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
"Có “START-INFO-DIR-ENTRY†(mục nhập thư mục Info đầu) mà không có “END-INFO-"
"DIR-ENTRY†(mục nhập thư mục Info kết thúc) tương ứng"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
"Có “END-INFO-DIR-ENTRY†(mục nhập thư mục Info kết thúc) mà không có “START-"
@@ -1990,14 +1962,12 @@ msgid "excess command line argument `%s'"
msgstr "đối số dòng lệnh thừa “%sâ€"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"ChÆ°a ghi rõ tập tin nhập vào; Hãy chạy dùng tùy chá»n “--help†để xem thông "
"tin thêm."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Chưa ghi rõ tập tin thư mục. Hãy chạy lệnh trợ giúp “--help†để xem thông "
@@ -2018,24 +1988,24 @@ msgstr "không có mục nhập thÆ° mục Info trong “%sâ€"
msgid "no entries found for `%s'; nothing deleted"
msgstr "không tìm thấy mục nhập cho “%s†nên không xóa gì"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr "không thể mở “%s†để ghi: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
"di chuyển lệnh @contents của bạn nếu bạn muốn các ná»™i dung sau trang tiêu Ä‘á»"
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
@@ -2043,282 +2013,239 @@ msgstr ""
"di chuyển lệnh @shortcontents và @contents của bạn nếu bạn muốn các nội dung "
"sau trang tiêu Ä‘á»"
-#: tp/Texinfo/Common.pm:1152
-#, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, c-format, perl-format
msgid "%s is not a valid language code"
msgstr "%s không phải mã ngôn ngữ hợp lệ"
-#: tp/Texinfo/Common.pm:1157
-#, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, c-format, perl-format
msgid "%s is not a valid region code"
msgstr "%s không phải mã vùng hợp lệ"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr "“%s†không phải là khả năng chia tách (split) hợp lệ"
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr "không thể Ä‘á»c %s: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "gặp lỗi khi đóng tập tin @verbatiminclude %s: %s"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr "@%s: không tìm thấy %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr "không có nút nào được đổi tên"
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr "các nút không có tên mới tại cuối tập tin"
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr "không thể mở %s: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, fuzzy, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr "Gặp lỗi khi đóng tập tin nút được đổi tên %s: %s"
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr "không thể bảo vệ ký tự băm trong @%s"
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr "tên nút trống rá»—ng sau phần mở rá»™ng “%sâ€"
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, perl-format
msgid "@%s `%s' previously defined"
msgstr "@%s “%s†đã định nghĩa từ trước"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, perl-format
msgid "here is the previous definition as @%s"
msgstr "ở đây có định nghĩa trước như là @%s"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, c-format, perl-format
msgid "empty argument in @%s"
msgstr "đối số trống rỗng trong @%s"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr "%s: kết xuất không tương thích với split (chia tách)"
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, perl-format
msgid "error on closing %s: %s"
msgstr "gặp lỗi khi đóng %s: %s"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, perl-format
msgid "could not create directories `%s' or `%s': %s"
msgstr "không thể tạo các thÆ° mục “%s†hay “%sâ€: %s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, perl-format
msgid "could not create directory `%s': %s"
msgstr "không thể tạo thÆ° mục “%sâ€: %s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, perl-format
msgid "@image file `%s' not found, using `%s'"
msgstr "không tìm thấy tập tin @image “%sâ€, Ä‘ang dùng “%sâ€"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
msgid "no argument specified for @U"
msgstr "chưa chỉ định đối số cho @U"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Tập tin @image “%s†(cho HTML) không Ä‘á»c được, dùng “%sâ€"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr "định dạng thô %s không được chuyển đổi"
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr "không thể mở tập tin cấu hình dùng để tham chiếu html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
msgid "missing type"
msgstr "thiếu kiểu"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, perl-format
msgid "unrecognized type: %s"
msgstr "không nhận ra kiểu: %s"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "gặp lỗi khi đóng tập tin cấu hình tham chiếu cho html %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr "chuỗi chưa được đóng trong tập tin css"
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr "“--css-include†kết thúc tại phần ghi chú"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr "@import chưa hoàn thiện trong tập tin css"
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr "không tìm thấy tập tin CSS %s"
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, perl-format
msgid "could not open --include-file %s: %s"
msgstr "không thể mở --include-file %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "gặp lỗi khi đóng tập tin CSS %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, perl-format
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "không tìm thấy mục htmlxref.cnf dành cho “%sâ€"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, perl-format
msgid "error on closing frame file %s: %s"
msgstr "gặp lỗi khi đóng tập tin khung (frame) %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "gặp lỗi khi đóng tập tin khung (frame) TOC %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr "bộ tiếp hợp %s của trạng thái %s mức ưu tiên %s gặp lỗi"
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr "phải chỉ định một tiêu đỠcùng với lệnh title hay @top"
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "gặp lỗi khi đóng tập tin nút chuyển hướng %s: %s"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "tên cũ dành cho “%s†là một nút tài liệu"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "tập tin trống rá»—ng cho nút được đổi tên “%sâ€"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr "nút đích (tên má»›i cho “%sâ€) không ở trong tài liệu: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr "gặp lỗi khi đóng tập tin nút chuyển hướng được đổi tên %s: %s"
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr "tên nút rỗng"
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr "cú pháp cho nút mở rá»™ng được dùng cho “%sâ€"
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
msgid "document without nodes"
msgstr "tài liệu chẳng có nút nào cả"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr "tài liệu không có nút “Äỉnhâ€"
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr "đổi tên %s gặp lỗi: %s"
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr "@%s kết xuất nhiá»u hÆ¡n má»™t: %s"
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, perl-format
msgid "@%s outside of any node"
msgstr "@%s nằm ngoài má»i nút"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr "tên @node không được chứa “,â€: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr "Mục chỉ số trong @%s với: sản sinh Info không hợp lệ: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, c-format, perl-format
msgid "entry for index `%s' outside of any node"
msgstr "mục nhập cho chỉ mục “%s†nằm ở ngoài má»i nút"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, perl-format
msgid "error on closing image text file %s: %s"
msgstr "gặp lỗi khi đóng tập tin ảnh dạng text %s: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Không thể Ä‘á»c tập tin @image “%sâ€: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
"không thể tìm thấy tập tin @image “%s.txt†mà cũng không có chữ thay thế"
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2326,302 +2253,328 @@ msgstr ""
"“@strong{Note…}†tạo một tham chiếu chéo giả trong Info; hãy sửa đổi để "
"tránh nó"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr "tên tham chiếu chéo @%s không được phép chứa “:â€"
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr "tên nút @%s không được chứa “%sâ€"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr "tên nút @%s không được chứa dấu hai chấm “:â€"
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, perl-format
msgid "`.' or `,' must follow @xref, not %s"
msgstr "“.†hay “,†phải theo sau @xref, không phải %s"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
msgid "`.' or `,' must follow @xref"
msgstr "“.†hay “,†phải theo sau @xref"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr "tên mục trình Ä‘Æ¡n không được chứa “%sâ€"
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr "tên nút mục trình Ä‘Æ¡n không được chứa dấu hai chấm “:â€"
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr "tên mục trình Ä‘Æ¡n không được chứa dấu hai chấm “:â€"
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr "không thể mở %s: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "nhiá»u @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr "đối số có dạng thức sai hoặc trống rỗng @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr "cú pháp sai cho đối số @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s cần đến tên"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr "tên sai cho @%s"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr "@end %s có vẻ trước dấu ngoặc ôm đóng @%s"
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr "@%s có vẻ trước dấu ngoặc ôm đóng @%s"
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, perl-format
msgid "%c%s missing closing brace"
msgstr "%c%s: thiếu dấu ngoặc móc đóng"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "@%s thiếu dãy giới hạn đóng: %s}"
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr "@itemx không được bắt đầu bằng @%s"
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr "@itemx phải theo sau @item"
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr "@%s có nội dung nhưng không có @item"
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "“@end†cần “%sâ€, nhÆ°ng lại nhận được “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr "@%s có vẻ trước @end %s"
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, perl-format
msgid "no matching `%cend %s'"
msgstr "“%cend %s†không đủ cặp"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, perl-format
msgid "misplaced %c"
msgstr "%c không đúng chỗ"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, perl-format
msgid "unmatched `%c%s'"
msgstr "“%c%s†chưa khớp cặp"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, c-format, perl-format
msgid "macro `%s' called with too many args"
msgstr "vÄ© lệnh “%s†được gá»i vá»›i quá nhiá»u đối số"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s thiếu dấu ngoặc móc đóng"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, c-format, perl-format
msgid "macro `%s' declared without argument called with an argument"
msgstr ""
"vÄ© lệnh “%s†được khai báo không có đối số nhÆ°ng lại được gá»i cùng vá»›i đối số"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "“\\†trong phần mở rá»™ng @%s theo sau “%s†thay vì tên tham số hay “\\â€"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, c-format, perl-format
msgid "missing name for @%s"
msgstr "thiếu tên cho @%s"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr "thiếu category cho @%s"
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr "gặp đối số bất thÆ°á»ng trên dòng @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
msgid "empty multitable"
msgstr "đa-bảng rỗng"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, c-format, perl-format
msgid "superfluous argument to @%s"
msgstr "đối số không cần thiết cho @%s"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, c-format, perl-format
msgid "bad argument to @%s"
msgstr "đối số sai cho @%s"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s cần thiết một đối số: bộ định dạng cho %citem"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
"lệnh @%s không chấp nhận đối số trong dấu ngoặc ôm không thể ở dòng @%s"
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, c-format, perl-format
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "lệnh nhấn mạnh accen “@%s†không cho phép đối số @%s"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, c-format, perl-format
msgid "@%s missing argument"
msgstr "@%s thiếu đối số"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, c-format, perl-format
msgid "unknown @end %s"
msgstr "không hiểu @end %s"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr "đối số không cần thiết cho @%s %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, c-format, perl-format
msgid "bad argument to @%s: %s"
msgstr "đối số sai cho @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr "@%s: không thể mở %s: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr "bảng mã “%s†không phải là bảng mã “canonical texinfoâ€"
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "không nhận ra tên bảng mã “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr "@%s sau phần tử thứ nhất"
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr "@%s chỉ có nghĩa khi ở dòng @multitable"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+#, fuzzy
+#| msgid "@%s should not be associated with @top"
+msgid "@part should not be associated with @top"
+msgstr "@%s không được tổ hợp cùng với @top"
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
"@node đứng trước @%s, nhưng bộ phận của nó không được tổ hợp cùng với các nút"
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr "cú pháp cho nút mở rá»™ng được dùng cho “%sâ€"
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, c-format, perl-format
msgid "empty menu entry name in `%s'"
msgstr "tên mục trình Ä‘Æ¡n trống rá»—ng trong “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr "tên nút trống trong mục trình đơn"
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr "@%s không được xuất hiện trong @%s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, c-format, perl-format
msgid "@end %s should only appear at the beginning of a line"
msgstr "@end %s chỉ nên xuất hiện ở đầu một dòng"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "vĩ lệnh “%s†được định nghĩa trước"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "đây là lá»i định nghÄ©a trÆ°á»›c của “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr "định nghĩa lại lệnh ngôn ngữ Texinfo: @%s"
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr "@%s mà không tổ hợp cùng ký tự"
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
"@%s được định nghÄ©a vá»›i không hay nhiá»u hÆ¡n má»™t đối số mà nó được gá»i vá»›i {}"
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
@@ -2629,293 +2582,306 @@ msgstr ""
"vÄ© lệnh gá»i lồng nhau quá sâu (đặt MAX_NESTED_MACROS để đè lên giá trị này; "
"giá trị hiện tại %d)"
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr "gá»i đệ qui macro %s là không được phép; dùng @rmacro nếu thấy cần"
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr "lệnh nhấn mạnh “@%s†không cho phép có khoảng trắng đi theo"
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, c-format, perl-format
msgid "use braces to give a command as an argument to @%s"
msgstr "dùng dấu ngoặc móc {} để đưa ra lệnh dạng đối số tới @%s"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s cần “i†hay “j†làm đối số, không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr "lệnh nhấn mạnh “@%s†không cho phép có dòng mới đi theo sau"
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, c-format, perl-format
msgid "@%s expected braces"
msgstr "@%s cần dấu ngoặc móc {}"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, c-format, perl-format
msgid "unknown command `%s'"
msgstr "không hiểu lệnh “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "chÆ°a định nghÄ©a cá»: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr "cú pháp sai đối với @value"
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s quá cũ."
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s quá cũ; %s"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, c-format, perl-format
msgid "@%s should only appear at the beginning of a line"
msgstr "@%s chỉ nên xuất hiện đầu tại đầu dòng"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr "@%s chỉ được phép xuất hiện tại phần đầu hoặc chân"
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s không có nghÄ©a bên trong khối “@%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, c-format, perl-format
msgid "@%s in empty multitable"
msgstr "@%s trong multitable trống rỗng"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr "@tab trÆ°á»›c @item"
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, c-format, perl-format
msgid "too many columns in multitable item (max %d)"
msgstr "quá nhiá»u cá»™t trong mục Ä‘a bảng (tối Ä‘a là %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "đang bỠqua @tab bên ngoài đa bảng"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr "@%s nằm ngoài bảng hay danh sách"
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, perl-format
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s không được phép nằm bên trong khối “@%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "@%s should only appear in math context"
+msgid "@%s should only appear in an index entry"
+msgstr "@%s chỉ được phép xuất hiện trong ngữ cảnh toán há»c"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr "phải sau “@%s†để dùng “@%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "@%s không có nghÄ©a bên ngoài môi trÆ°á»ng “@titlepage†và “@quotationâ€"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr "@dircategory sau nút đầu tiên"
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "vùng %s nằm trong vùng %s là không hợp lệ"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr "@direntry sau nút đầu tiên"
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr "@menu trong ngữ cảnh không hợp lệ"
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, c-format, perl-format
msgid "@%s seen before first @node"
msgstr "@%s có vẻ trước @node"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"có lẽ nút “@top†(đỉnh) của bạn nên được bao bá»c bằng @ifnottex thay cho "
"@ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "@%s chỉ được phép xuất hiện trong ngữ cảnh toán há»c"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr "@%s chỉ được phép xuất hiện trong ngữ cảnh toán há»c"
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
msgid "unexpected @"
msgstr "gặp @ bất thÆ°á»ng"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, c-format, perl-format
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s không có nghÄ©a nếu ở bên ngoài môi trÆ°á»ng “@float†(dấu chấm Ä‘á»™ng)"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr "@%s phải dÆ°á»›i “@floatâ€"
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr "bá» qua nhiá»u @%s"
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr "lệnh @%s không chấp nhận đối số"
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr "lệnh @%s thiếu một nút hay tham số thủ công mở rộng"
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr "trong @%s tên tham chiếu chéo sau phần mở rá»™ng “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr "trong @%s tiêu đỠtham chiếu chéo trống rỗng sau “%s†mở rộng"
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image thiếu đối số tên tập tin"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, c-format, perl-format
msgid "@%s missing first argument"
msgstr "@%s thiếu đối số đầu tiên"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr "chữ số không phải dạng thập lục phân trong đối số cho @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr "có ít hơn bốn chữ số dạng thập lục trong đối số cho @U: %s"
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr "đối số cho @U vượt quá mức tối đa Unicode 0x10FFFF: %s"
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr "các đối số thừa cho nút"
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, c-format, perl-format
msgid "expected @end %s"
msgstr "cần @end %s"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, perl-format
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "@%s chỉ có thể cấp nhận @-command là đối số, không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr "đối số còn lại trên dòng @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, perl-format
msgid "environment command %s as argument to @%s"
msgstr "lệnh môi trÆ°á»ng %s nhÆ° là tham số cho @%s"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr "@%s rá»—ng"
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr "số lượng cột không phải là một con số: %s"
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, c-format, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "đối số @sp phải là má»™t con số, không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr "đã đảo ngược tên chỉ mục %s"
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, c-format, perl-format
msgid "unknown source index in @%s: %s"
msgstr "không hiểu chỉ mục nguồn trong @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr "không hiểu chỉ mục đích trong @%s: %s"
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
"@%s dẫn Ä‘Æ°á»ng đến má»™t hòa trá»™n của %s trong chính bản thân nó, Ä‘ang bá» qua"
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, c-format, perl-format
msgid "unknown index `%s' in @printindex"
msgstr "không hiểu chỉ mục “%s†trong @printindex"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr "Ä‘ang in bảng mục lục “%s†đã hòa trá»™n vá»›i má»™t cái khác, “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr "in mục lục trước khi tài liệu bắt đầu: @printindex %s"
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, c-format, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr ""
"đối số “@%s†phải là:\n"
@@ -2923,12 +2889,12 @@ msgstr ""
" * bottom đáy\n"
"chứ không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Chỉ há»— trợ @%s 10 hay 11, không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
@@ -2937,13 +2903,14 @@ msgstr ""
" * end cuối\n"
"không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "@%s Ä‘.số phải là “onâ€, “off†hoặc “oddâ€, không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, c-format, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
"đối số “@paragraphindent†(thụt lỠđoạn văn) phải là:\n"
@@ -2952,7 +2919,7 @@ msgstr ""
" * asis như thế\n"
"chứ không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
@@ -2961,8 +2928,8 @@ msgstr ""
" * insert chèn\n"
"chứ không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, c-format, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"đối số “@exampleindent†(thụt lỠví dụ) phải là:\n"
@@ -2971,19 +2938,19 @@ msgstr ""
" * asis như thế\n"
"chứ không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr "cần @%s bật hay tắt, không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
"Ä‘.số @kbdinputstyle phải là “codeâ€/“exampleâ€/“distinctâ€, không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, c-format, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"đối số “@allowcodebreaks†(cho phép ngắt mã) phải là:\n"
@@ -2991,8 +2958,8 @@ msgstr ""
" * false sai\n"
"chứ không phải “%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, c-format, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"đối số “@urefbreakstyle†phải là một trong số:\n"
@@ -3026,7 +2993,7 @@ msgstr "không có lệnh chương nào tổ hợp cùng với @%s"
msgid "@%s not empty"
msgstr "@%s không trống rỗng"
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "@%s tham chiếu đến nút chÆ°a tồn tại “%sâ€"
@@ -3036,107 +3003,107 @@ msgstr "@%s tham chiếu đến nút chÆ°a tồn tại “%sâ€"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr "@%s tên nút mục trình Ä‘Æ¡n “%s†khác biệt vá»›i %s tên “%sâ€"
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "nút chÆ°a được tham chiếu “%sâ€"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
"nút “%s†là %s dành cho “%s†trong phần chương nhưng không có trong trình đơn"
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr "nút %s “%s†trong trình đơn “%s†và trong chương “%s†khác nhau"
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr "nút “%s†là %s cho “%s†trong trình đơn nhưng mà không ở trong chương"
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr "con trá» %s “%s†(cho nút “%sâ€) khác vá»›i %s tên “%sâ€"
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%s tham chiếu đến nÆ¡i mà chÆ°a có “%sâ€"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"nút “%s†không có mục trình Ä‘Æ¡n cho “%sâ€, không kể nút này là đích Lên của nó"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr "cho “%sâ€, nhảy lên trong trình Ä‘Æ¡n “%s†và lên “%s†không khá»›p"
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr "@%s thành “%sâ€, khác vá»›i %s tên “%sâ€"
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr "khóa chỉ mục trống rỗng trong @%s"
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "chm.pm: không thể mở %s để ghi: %s\n"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr "chm.pm: gặp lỗi khi đang đóng %s: %s"
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "l2h: không thể mở tập tin latex “%s†để ghi: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr "l2h: thư mục L2H_TMP chứa dấu chấm"
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr "l2h: thư mục hiện tại có chứa dấu chấm"
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr "l2h: lệnh thực hiện không thành công: %s"
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr "l2h: ảnh có phần đuôi mở rộng không hợp lệ: %s"
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr "l2h: đổi tên %s thành %s gặp lỗi: %s"
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr "l2h: không thể mở %s: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr "latex2html.pm: không tìm thấy kết của @%s mục %d"
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3145,12 +3112,12 @@ msgstr ""
"latex2html.pm: xử lý thủ tục %d mục trong HTML; cần %d, ; là số mục được tìm "
"thấy trong tài liệu"
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr "l2h: không thể xác định mảnh %d cho @%s"
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3158,47 +3125,47 @@ msgid ""
msgstr ""
"l2h: không thể trích xuất mảnh %d cho @%s với con đếm kết xuất %d từ HTML"
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr "l2h: không thể tải %s: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr "l2h: không thể mở %s để ghi: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr "tex4ht.pm: không thể mở %s: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr "tex4ht.pm: chdir %s gặp lỗi: %s"
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr "tex4ht.pm: không thể trả vỠthư mục khởi tạo: %s"
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr "tex4ht.pm: thiếu tập tin đầu ra: %s"
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr "tex4ht.pm: lệnh gặp lỗi: %s"
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr "tex4ht.pm: không tìm thấy cuối của @%s mục %d"
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
@@ -3207,12 +3174,12 @@ msgstr ""
"tex4ht.pm: xử lý thủ tục %d mục trong HTML; cần %d, con số được tìm thấy "
"trong tài liệu dành cho @%s"
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr "tex4ht.pm: kết xuất không có mục HTML cho @%s %s"
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3221,39 +3188,39 @@ msgstr ""
"tex4ht.pm: xử lý tìm lại %d mục trong HTML; cần %d, con số được tìm thấy "
"trong tài liệu dành cho @%s"
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr "lỗi tải %s: %s\n"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, perl-format
msgid "%s: unknown variable %s"
msgstr "%s: không hiểu biến %s"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, perl-format
msgid "%s: unknown variable %s\n"
msgstr "%s: không hiểu biến %s\n"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, perl-format
msgid "could not read init file %s"
msgstr "không thể Ä‘á»c tập tin khởi tạo %s"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr ""
"bỠqua giá trị không chấp nhận được “TEXINFO_OUTPUT_FORMAT†(định dạng xuất "
"Texinfo) “%sâ€\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Cách dùng: %s [TÙY-CHỌN]… TẬP-TIN-TEXTINFO…\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3268,7 +3235,7 @@ msgstr ""
"ChÆ°Æ¡ng trình này thÆ°á»ng được cài cùng cả “makeinfo†và “texi2anyâ€;\n"
"chúng làm cùng nhiệm vụ, không phụ thuộc vào tên được cài đặt.\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3307,7 +3274,7 @@ msgstr ""
" -v, --verbose diễn tả việc đang được làm \n"
" --version hiển thị thông tin phiên bản rồi thoát.\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3326,7 +3293,7 @@ msgstr ""
" sau khi kiểm tra tính hợp lệ của TẬP-TIN-"
"INFO\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3375,7 +3342,7 @@ msgstr ""
" đặt tập tin kết xuất ở đây.\n"
" Nếu không, tên ÄÃCH là tập tin kết xuất.\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3422,7 +3389,7 @@ msgstr ""
" --split-size=SỠchia tách các tập tin Info ở kích cỡ SỠ(mặc "
"định là %d).\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3448,7 +3415,7 @@ msgstr ""
" --node-files tạo ra các tập tin chuyển hướng cho các nút\n"
" và điểm neo; mặc định chỉ được đặt nếu tách.\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
@@ -3456,7 +3423,7 @@ msgstr ""
"Các tùy chá»n cho XML và Docbook:\n"
" --output-indent=VAL chẳng làm gì, giữ lại để tương thích.\n"
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
@@ -3464,7 +3431,7 @@ msgstr ""
"Tùy chá»n cho DVI/PS/PDF:\n"
" --Xopt=OPT chuyển TÙY-CHỌN cho texi2dvi; có thể lặp lại.\n"
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3486,7 +3453,7 @@ msgstr ""
"kiếm @include.\n"
" -U BIẾN hủy định nghĩa biến này, giống như @clear.\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3524,7 +3491,7 @@ msgstr ""
" Äồng thá»i, đối vá»›i các tùy chá»n “--no-ifÄỊNH_DẠNGâ€, phải xá»­ lý văn bản "
"@ifnotÄỊNH_DẠNG.\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3540,7 +3507,7 @@ msgstr ""
" nếu tạo chữ dạng thô thì bật “--ifplaintext†và các cái khác bị tắt;\n"
" nếu tạo XML thì bật “--ifxml†và các cái khác bị tắt;\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3571,7 +3538,7 @@ msgstr ""
" makeinfo --no-split phu.texi ghi một tập tin Info, bất chấp kích "
"cỡ tối đa\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
@@ -3580,7 +3547,7 @@ msgstr ""
" * end cuối\n"
"không phải “%sâ€.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
@@ -3590,54 +3557,54 @@ msgstr ""
" * asis như thế\n"
"không phải “%sâ€.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
"%s: khi đang tạo %s, chỉ một TẬP-TIN đầu vào có thể được chỉ ra cùng với tùy "
"chá»n -o\n"
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr "tùy chá»n --Xopt không in ra kết xuất"
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, perl-format
msgid "unknown tree transformation %s"
msgstr "không hiểu sự biến đổi cây %s"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr "bỠqua việc chia cắt cho định dạng %s"
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: thiếu đối số tập tin.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Hãy thử lệnh trợ giúp “%s --help†để xem thông tin thêm.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
"chuyển đổi dạng fill_gaps_in_sectioning không trả vỠkết quả nào. Không có "
"chương nào à?"
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "gặp lỗi khi đóng tập tin vĩ lệnh mở rộng %s: %s\n"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr "không thể mở “%s†để ghi: %s\n"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
@@ -3645,24 +3612,303 @@ msgstr ""
"sự biến đổi insert_nodes_for_sectioning_commands không trả vỠkết quả. Không "
"có chương nào à?"
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr "%s: lỗi đóng tập tin %s: %s\n"
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: gặp lỗi khi đóng tập tin liên kết nội tại %s: %s\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, perl-format
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: không thể mở “%s†để ghi: %s\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "no matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "“%cend %s†không đủ cặp"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced {"
+msgstr "%c không đúng chỗ"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "“%c%s†chưa khớp cặp"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s cần đến tên"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @set"
+msgstr "tên sai cho @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s cần đến tên"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @clear"
+msgstr "tên sai cho @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s cần đến tên"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "bad name for @%s"
+msgid "bad name for @unmacro"
+msgstr "tên sai cho @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "@%s should only accept an @-command as argument, not `%s'"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "@%s chỉ có thể cấp nhận @-command là đối số, không phải “%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "environment command %s as argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "lệnh môi trÆ°á»ng %s nhÆ° là tham số cho @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "đối số sai cho @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "đối số sai cho @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "empty argument in @%s"
+msgid "empty @columnfractions"
+msgstr "đối số trống rỗng trong @%s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "đối số sai cho @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "Chỉ há»— trợ @%s 10 hay 11, không phải “%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr ""
+"%s: đối số “--footnote-style†(kiểu dáng cước chú) phải là:\n"
+" * separate riêng\n"
+" * end cuối\n"
+"không phải “%sâ€.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "@%s arg must be `on', `off' or `odd', not `%s'"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "@%s Ä‘.số phải là “onâ€, “off†hoặc “oddâ€, không phải “%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "đối số sai cho @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr ""
+"đối số “@firstparagraphindent†(thụt lỠđoạn văn đầu) phải là:\n"
+" * none không gì\n"
+" * insert chèn\n"
+"chứ không phải “%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "đối số sai cho @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s cần thiết một đối số: bộ định dạng cho %citem"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "“%c%s†chưa khớp cặp"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "superfluous argument to @%s %s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "đối số không cần thiết cho @%s %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "đối số sai cho @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "@%s: could not find %s"
+msgid "@include: could not find %s"
+msgstr "@%s: không tìm thấy %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "@%s: could not open %s: %s"
+msgid "@include: could not open %s:"
+msgstr "@%s: không thể mở %s: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+#, fuzzy
+#| msgid "@%s after the first element"
+msgid "@setfilename after the first element"
+msgstr "@%s sau phần tử thứ nhất"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s only meaningful on a @multitable line"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "@%s chỉ có nghĩa khi ở dòng @multitable"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+#, fuzzy
+#| msgid "@node precedes @%s, but parts may not be associated with nodes"
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+"@node đứng trước @%s, nhưng bộ phận của nó không được tổ hợp cùng với các nút"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s không có nghÄ©a bên trong khối “@%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not allowed inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s không được phép nằm bên trong khối “@%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@subentry should only occur in an index entry"
+msgstr "@%s chỉ được phép xuất hiện trong ngữ cảnh toán há»c"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s không có nghÄ©a bên ngoài môi trÆ°á»ng “@titlepage†và “@quotationâ€"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s cần đến tên"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, fuzzy, c-format
+#| msgid "bad or empty @%s formal argument: %s"
+msgid "bad or empty @%s formal argument: "
+msgstr "đối số có dạng thức sai hoặc trống rỗng @%s: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s cần “i†hay “j†làm đối số, không phải “%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "chÆ°a định nghÄ©a cá»: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete."
+msgid "@%s is obsolete."
+msgstr "%c%s quá cũ."
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete; %s"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s quá cũ; %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "@%s should only appear in math context"
+msgid "@\\ should only appear in math context"
+msgstr "@%s chỉ được phép xuất hiện trong ngữ cảnh toán há»c"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+#, fuzzy
+#| msgid "@%s without associated character"
+msgid "@verb without associated character"
+msgstr "@%s mà không tổ hợp cùng ký tự"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%s'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s cần “i†hay “j†làm đối số, không phải “%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "misplaced %c"
+msgid "misplaced }"
+msgstr "%c không đúng chỗ"
+
+#, c-format
#~ msgid "can't open %s: %s"
#~ msgstr "không thể mở %s: %s"
+#, c-format
#~ msgid "debugging output diverted to \"%s\""
#~ msgstr "kết xuất gỡ lỗi đã trệch hướng thành \"%s\""
@@ -3672,15 +3918,40 @@ msgstr "%s: không thể mở “%s†để ghi: %s\n"
#~ msgid "arguments are quoted by default"
#~ msgstr "các đối số được trích dẫn theo mặc định"
+#~ msgid "no node to be renamed"
+#~ msgstr "không có nút nào được đổi tên"
+
+#~ msgid "nodes without a new name at the end of file"
+#~ msgstr "các nút không có tên mới tại cuối tập tin"
+
+#, perl-format
#~ msgid "Obsolete variable %s\n"
#~ msgstr "Biến %s đã lạc hậu\n"
-#~ msgid "@%s should not be associated with @top"
-#~ msgstr "@%s không được tổ hợp cùng với @top"
+#, perl-format
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "tên cũ dành cho “%s†là một nút tài liệu"
+#, perl-format
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "tập tin trống rá»—ng cho nút được đổi tên “%sâ€"
+
+#, perl-format
+#~ msgid "target node (new name for `%s') not in document: %s"
+#~ msgstr "nút đích (tên má»›i cho “%sâ€) không ở trong tài liệu: %s"
+
+#, perl-format
+#~ msgid "error on closing renamed node redirection file %s: %s"
+#~ msgstr "gặp lỗi khi đóng tập tin nút chuyển hướng được đổi tên %s: %s"
+
+#~ msgid "empty node name"
+#~ msgstr "tên nút rỗng"
+
+#, perl-format
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "%s: biến %s đã lạc hậu\n"
+#, perl-format
#~ msgid "obsolete variable %s\n"
#~ msgstr "biến %s đã lạc hậu\n"
@@ -4108,6 +4379,9 @@ msgstr "%s: không thể mở “%s†để ghi: %s\n"
#~ msgid "chdir to %s failed"
#~ msgstr "lỗi chdir (chuyển đổi thư mục) sang %s"
+#~ msgid "Error on closing renamed nodes file %s: %s"
+#~ msgstr "Gặp lỗi khi đóng tập tin nút được đổi tên %s: %s"
+
#~ msgid "Node `%s' that is to be renamed exists"
#~ msgstr "Nút “%s†cái mà được đổi tên đã sẵn có"
diff --git a/macros/texinfo/texinfo/po/zh_CN.gmo b/macros/texinfo/texinfo/po/zh_CN.gmo
index 28263a2f79..266aa0e0b8 100644
--- a/macros/texinfo/texinfo/po/zh_CN.gmo
+++ b/macros/texinfo/texinfo/po/zh_CN.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/zh_CN.po b/macros/texinfo/texinfo/po/zh_CN.po
index 60e0fe46bf..09075ef55e 100644
--- a/macros/texinfo/texinfo/po/zh_CN.po
+++ b/macros/texinfo/texinfo/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 6.3.92\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2018-01-23 10:13+0800\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -26,36 +26,43 @@ msgstr "未知的系统错误"
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s:选项“%sâ€å«ä¹‰ä¸æ˜Žç¡®\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s:选项“%sâ€å«ä¹‰ä¸æ˜Žç¡®\n"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s:ä¸èƒ½è¯†åˆ«çš„选项“%c%sâ€\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s:选项“%c%sâ€ä¸æŽ¥å—å‚æ•°\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s:选项“%sâ€éœ€è¦ä¸€ä¸ªå‚æ•°\n"
#: gnulib/lib/getopt.c:621
#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
msgid "%s: invalid option -- '%c'\n"
msgstr "%s:无效选项 -- %c\n"
#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:682
#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s:选项需è¦ä¸€ä¸ªå‚æ•° -- %c\n"
@@ -69,16 +76,19 @@ msgstr ""
#: gnulib/lib/regcomp.c:141
#, fuzzy
+#| msgid "Error in regular expression `%s': %s"
msgid "Invalid regular expression"
msgstr "正则表达å¼â€œ%sâ€ä¸­å­˜åœ¨é”™è¯¯: %s"
#: gnulib/lib/regcomp.c:144
#, fuzzy
+#| msgid "invalid encoded character `%s'"
msgid "Invalid collation character"
msgstr "无效的编ç å­—符“%sâ€"
#: gnulib/lib/regcomp.c:147
#, fuzzy
+#| msgid "unlikely character %c in @var"
msgid "Invalid character class name"
msgstr "@var 中ä¸å¯é çš„字符 %c"
@@ -96,11 +106,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:159
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ( or \\("
msgstr "ä¸åŒ¹é…çš„ }"
#: gnulib/lib/regcomp.c:162
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched \\{"
msgstr "ä¸åŒ¹é…çš„ }"
@@ -114,31 +126,37 @@ msgstr ""
#: gnulib/lib/regcomp.c:171
#, fuzzy
+#| msgid "memory exhausted"
msgid "Memory exhausted"
msgstr "虚拟内存耗尽"
#: gnulib/lib/regcomp.c:174
#, fuzzy
+#| msgid "Error in regular expression `%s': %s"
msgid "Invalid preceding regular expression"
msgstr "正则表达å¼â€œ%sâ€ä¸­å­˜åœ¨é”™è¯¯: %s"
#: gnulib/lib/regcomp.c:177
#, fuzzy
+#| msgid "Error in regular expression `%s': %s"
msgid "Premature end of regular expression"
msgstr "正则表达å¼â€œ%sâ€ä¸­å­˜åœ¨é”™è¯¯: %s"
#: gnulib/lib/regcomp.c:180
#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Regular expression too big"
msgstr "使用正则表达å¼æ¥æŸ¥å¯»"
#: gnulib/lib/regcomp.c:183
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ) or \\)"
msgstr "ä¸åŒ¹é…çš„ }"
#: gnulib/lib/regcomp.c:676
#, fuzzy
+#| msgid "No previous search string"
msgid "No previous regular expression"
msgstr "没有上次æœç´¢å­—符串"
@@ -244,6 +262,7 @@ msgstr "唯一的补é½"
#: info/echo-area.c:1049
#, fuzzy, c-format
+#| msgid "%d completions:\n"
msgid "%d completion:\n"
msgid_plural "%d completions:\n"
msgstr[0] "%d 个补é½ï¼š\n"
@@ -253,7 +272,6 @@ msgid "Insert completion"
msgstr "æ’入补é½"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "正在创建补é½..."
@@ -263,21 +281,23 @@ msgstr "滚动补é½çª—å£"
#: info/filesys.c:88
#, fuzzy, c-format
+#| msgid "%s; for file `%s'.\n"
msgid "looking for file \"%s\""
msgstr "%s;文件“%sâ€ã€‚\n"
#: info/filesys.c:150
#, fuzzy, c-format
+#| msgid "Making %s file `%s' from `%s'.\n"
msgid "looking for file %s in %s"
msgstr "从“%3$sâ€åˆ›å»º %1$s 文件“%2$sâ€ã€‚\n"
#: info/filesys.c:236 info/filesys.c:250 info/filesys.c:271
#, fuzzy, c-format
+#| msgid "Find file: "
msgid "found file %s"
msgstr "寻找文件:"
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "无法显示脚注"
@@ -290,7 +310,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------- 脚注 ----------"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "正在æœç´¢ç´¢å¼•æ¡ç›®..."
@@ -299,7 +318,8 @@ msgid "Look up a string in the index for this file"
msgstr "在本文件的索引中æœç´¢å­—符串"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "未找到索引。"
@@ -308,38 +328,45 @@ msgid "Index entry: "
msgstr "索引æ¡ç›®ï¼š"
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "未找到索引。"
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr "在 %2$s 中找到“%1$sâ€ã€‚(“\\[next-index-match]â€å°†è¯•å›¾å¯»æ‰¾ä¸‹ä¸€ä¸ªåŒ¹é…。)"
#: info/indices.c:446
#, fuzzy
+#| msgid ""
+#| "Go to the next matching index item from the last `\\[index-search]' "
+#| "command"
msgid ""
"Go to the next matching index item from the last '\\[index-search]' command"
msgstr "从最åŽä¸€ä¸ªâ€œ\\[index-search]â€å‘½ä»¤è½¬ç§»åˆ°ä¸‹ä¸€ä¸ªåŒ¹é…的索引项目"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "没有上一个索引æœç´¢å­—符串。"
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No more index entries containing '%s'"
msgstr "没有 %s索引æ¡ç›®å«æœ‰â€œ%sâ€ã€‚"
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No index entries containing '%s'"
msgstr "没有 %s索引æ¡ç›®å«æœ‰â€œ%sâ€ã€‚"
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of `%s'..."
msgid "Scanning indices of '%s'..."
msgstr "正在æœç´¢â€œ%sâ€çš„索引..."
@@ -349,11 +376,13 @@ msgstr "æ•´ç†æ‰€æœ‰å·²çŸ¥ info 文件å«æœ‰è¢«æŸ¥è¯¢å­—符串的索引并建立
#: info/indices.c:654 info/indices.c:656
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index apropos"
msgstr "索引å«æœ‰ï¼š"
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "Index entries containing '%s':\n"
msgstr "没有 %s索引æ¡ç›®å«æœ‰â€œ%sâ€ã€‚"
@@ -372,36 +401,39 @@ msgstr ""
#: info/indices.c:889 info/indices.c:891
#, fuzzy
+#| msgid "Index apropos: "
msgid "Index topic"
msgstr "索引å«æœ‰ï¼š"
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No %sindex entries containing `%s'."
msgid "No index entries containing '%s'."
msgstr "没有 %s索引æ¡ç›®å«æœ‰â€œ%sâ€ã€‚"
#: info/indices.h:40
#, fuzzy, c-format
+#| msgid "No available info files have `%s' in their indices."
msgid "No available info files have '%s' in their indices"
msgstr "在å¯ç”¨çš„ info 文件的索引中å‡ä¸å«æœ‰â€œ%sâ€ã€‚"
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "节点“%2$sâ€ä¸­æ²¡æœ‰èœå•é¡¹â€œ%1$sâ€ã€‚"
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr "无法找到节点“%sâ€ã€‚"
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -422,6 +454,7 @@ msgstr ""
#: info/info.c:828 info/infokey.c:560
#, fuzzy, c-format
+#| msgid "Set the value of an Info variable"
msgid "value %s is not valid for variable %s"
msgstr "设定 Info å˜é‡çš„值"
@@ -430,7 +463,7 @@ msgstr "设定 Info å˜é‡çš„值"
msgid "Try --help for more information.\n"
msgstr "å°è¯• --更多的求助信æ¯ã€‚\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -447,6 +480,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "找ä¸åˆ°å«æœ‰â€œ%sâ€çš„索引\n"
@@ -463,6 +497,13 @@ msgstr ""
#: info/info.c:1095
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " -k, --apropos=STRING look up STRING in all indices of all "
+#| "manuals.\n"
+#| " -d, --directory=DIR add DIR to INFOPATH.\n"
+#| " --dribble=FILENAME remember user keystrokes in FILENAME.\n"
+#| " -f, --file=FILENAME specify Info file to visit."
msgid ""
"Frequently-used options:\n"
" -a, --all use all matching manuals\n"
@@ -478,6 +519,11 @@ msgstr ""
#: info/info.c:1102
#, fuzzy
+#| msgid ""
+#| " -h, --help display this help and exit.\n"
+#| " --index-search=STRING go to node pointed by index entry STRING.\n"
+#| " -n, --node=NODENAME specify nodes in first visited Info file.\n"
+#| " -o, --output=FILENAME output selected nodes to FILENAME."
msgid ""
" -h, --help display this help and exit\n"
" --index-search=STRING go to node pointed by index entry STRING\n"
@@ -500,6 +546,11 @@ msgstr " -b, --speech-friendly 对å‘音器兼容。"
#: info/info.c:1116
#, fuzzy
+#| msgid ""
+#| " --subnodes recursively output menu items.\n"
+#| " --vi-keys use vi-like and less-like key bindings.\n"
+#| " --version display version information and exit.\n"
+#| " -w, --where, --location print physical location of Info file."
msgid ""
" --subnodes recursively output menu items\n"
" -v, --variable VAR=VALUE assign VALUE to Info variable VAR\n"
@@ -513,6 +564,14 @@ msgstr ""
#: info/info.c:1122
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The first non-option argument, if present, is the menu entry to start "
+#| "from;\n"
+#| "it is searched for in all `dir' files along INFOPATH.\n"
+#| "If it is not present, info merges all `dir' files and shows the result.\n"
+#| "Any remaining arguments are treated as the names of menu\n"
+#| "items relative to the initial node visited."
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -530,6 +589,9 @@ msgstr ""
#: info/info.c:1129
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "For a summary of key bindings, type h within Info."
msgid ""
"\n"
"For a summary of key bindings, type H within Info."
@@ -539,6 +601,19 @@ msgstr ""
#: info/info.c:1132
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Examples:\n"
+#| " info show top-level dir menu\n"
+#| " info info show the general manual for Info readers\n"
+#| " info info-stnd show the manual specific to this Info "
+#| "program\n"
+#| " info emacs start at emacs node from top-level dir\n"
+#| " info emacs buffers start at buffers node within emacs manual\n"
+#| " info --show-options emacs start at node with emacs' command line "
+#| "options\n"
+#| " info --subnodes -o out.txt emacs dump entire manual to out.txt\n"
+#| " info -f ./foo.info show file ./foo.info, not searching dir"
msgid ""
"\n"
"Examples:\n"
@@ -565,7 +640,7 @@ msgstr ""
" info --subnodes -o out.txt emacs 将整个手册页输出至 out.txt\n"
" info -f ./foo.info 显示文件 ./foo.info,而ä¸æ˜¯æŸ¥æ‰¾ç›®å½•"
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -577,6 +652,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "无法找到节点“(%s)%sâ€ã€‚"
@@ -590,61 +666,73 @@ msgstr "光标没有出现在该窗å£çš„节点之中ï¼"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "无法删除最åŽçš„窗å£ã€‚"
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "该节点中没有èœå•ã€‚"
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "该节点中没有脚注。"
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "该节点中没有交å‰å¼•ç”¨ã€‚"
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "该节点中没有“%sâ€æŒ‡é’ˆ"
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "未知的 Info 命令“%câ€ï¼›è¯·ä»¥â€œ?â€èŽ·å¾—帮助。"
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "终端类型“%sâ€çš„能力ä¸è¶³ä»¥æ”¯æŒ Info çš„è¿è¡Œã€‚"
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "您已ç»åœ¨è¯¥èŠ‚点的最åŽä¸€ä¸ªé¡µé¢ä¸­äº†ã€‚"
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "您已ç»åœ¨è¯¥èŠ‚点的第一页中了。"
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "åªæœ‰ä¸€ä¸ªçª—å£ã€‚"
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "结果窗å£å°†ä¼šå¤ªå°ã€‚"
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr "没有足够的空间用于求助窗å£ï¼Œè¯·åˆ é™¤ä¸€ä¸ªçª—å£ã€‚"
@@ -728,6 +816,7 @@ msgstr "\\%-10[top-node] 移到此文档的顶层节点。\n"
#: info/infodoc.c:61
#, fuzzy
+#| msgid "\\%-10[dir-node] Go to the main `directory' node.\n"
msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
msgstr "\\%-10[dir-node] 移动到主“目录â€èŠ‚点。\n"
@@ -782,6 +871,7 @@ msgstr "\\%-10[abort-key] å–消当å‰æ“作。\n"
#: info/infodoc.c:195
#, fuzzy, c-format
+#| msgid "This is %s, produced by makeinfo version %s from %s.\n"
msgid "This is GNU Info version %s. "
msgstr "这是 %s,由 makeinfo 版本 %s 从 %s 生æˆã€‚\n"
@@ -828,6 +918,7 @@ msgstr "显示求助消æ¯"
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "访问 Info 节点“(info)Helpâ€"
@@ -842,6 +933,7 @@ msgstr "说明按键:%s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s 未定义。"
@@ -855,41 +947,43 @@ msgstr "命令为:"
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "“%sâ€æœªç»‘定到任何按键"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s ä¸èƒ½é€šè¿‡ %s 调用。"
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s å¯ä»¥é€šè¿‡ %s 调用。"
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr "没有å为“%sâ€çš„函数"
#: info/infomap.c:585
#, fuzzy, c-format
+#| msgid "cannot open input file `%s'"
msgid "could not open init file %s"
msgstr "无法打开输入文件“%sâ€"
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr "按键åºåˆ—过长"
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr "é—æ¼æŒ‰é”®åºåˆ—"
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "ä¸å…许的空字符 (\\\\000)"
@@ -899,12 +993,12 @@ msgid "NUL character (^%c) not permitted"
msgstr "ä¸å…许的空字符 (^%c)"
#: info/infokey.c:436
-#, c-format
msgid "missing action name"
msgstr "é—æ¼åŠ¨ä½œå称"
#: info/infokey.c:454
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "key sequence too long"
msgid "cannot bind key sequence to menu-digit"
msgstr "按键åºåˆ—过长"
@@ -914,7 +1008,6 @@ msgid "unknown action `%s'"
msgstr "未知的动作“%sâ€"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr "动作å过长"
@@ -924,22 +1017,18 @@ msgid "extra characters following action `%s'"
msgstr "动作“%sâ€ä¹‹åŽå‡ºçŽ°é¢å¤–的字符"
#: info/infokey.c:527
-#, c-format
msgid "missing variable name"
msgstr "é—æ¼å˜é‡å"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr "å˜é‡å之åŽé—æ¼äº†â€œ=â€"
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr "å˜é‡å过长"
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr "值过长"
@@ -961,7 +1050,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "在回显区读入命令å并执行它"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an `echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "无法在这里è¿è¡Œâ€œå›žæ˜¾åŒºâ€å‘½ä»¤ã€‚"
@@ -992,6 +1082,11 @@ msgstr "无法æ“作文件 %s。\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -1006,6 +1101,9 @@ msgstr ""
#: info/nodemenu.c:185
#, fuzzy
+#| msgid ""
+#| "Here is the menu of nodes you have recently visited.\n"
+#| "Select one from this menu, or use `\\[history-node]' in another window.\n"
msgid ""
"Here is the menu of nodes you have recently visited.\n"
"Select one from this menu, or use '\\[history-node]' in another window.\n"
@@ -1045,7 +1143,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr "无文件索引"
@@ -1054,6 +1151,9 @@ msgstr "无文件索引"
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1190,6 +1290,7 @@ msgstr "选择本èœå•é¡¹ç›®"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "本èœå•ä¸­æ²¡æœ‰ç¬¬ %d 个项目。"
@@ -1218,6 +1319,7 @@ msgstr "è·Ÿéšäº¤å‰å¼•ç”¨ï¼š"
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "引用消失了ï¼(%s)。"
@@ -1251,11 +1353,13 @@ msgstr "选择出现在本行中的引用或èœå•é¡¹"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr "节点“%sâ€ä¸­æ²¡æœ‰èœå•ã€‚"
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "无法在“%2$sâ€ä¸­æ‰¾åˆ°ç”±â€œ%1$sâ€å¼•ç”¨çš„节点。"
@@ -1293,11 +1397,13 @@ msgstr "选择本文件的第一个节点"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "本文档中没有更多的节点。"
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "在本文档中没有本节点的“上一个â€æˆ–“上层â€èŠ‚点。"
@@ -1336,11 +1442,13 @@ msgstr "èŽ·å– man 手册:"
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "选择本文件中的“顶â€èŠ‚点"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "选择节点“(dir)â€"
@@ -1353,7 +1461,6 @@ msgid "Select the most recently selected node"
msgstr "选择最近选择的节点"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1367,26 +1474,31 @@ msgstr "寻找文件:"
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr "无法寻找“%sâ€ã€‚"
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr "无法创建输出文件“%sâ€ã€‚"
#: info/session.c:3727
#, fuzzy, c-format
+#| msgid "error writing to `%s'"
msgid "error writing to %s: %s"
msgstr "写入“%sâ€æ—¶å‡ºé”™"
#: info/session.c:3736
#, fuzzy, c-format
+#| msgid "Removing %s\n"
msgid "closing %s"
msgstr "删除 %s\n"
#: info/session.c:3785
#, fuzzy, c-format
+#| msgid "Writing node %s..."
msgid "writing node %s..."
msgstr "正在写入节点 %s..."
@@ -1396,16 +1508,19 @@ msgstr "通过管é“将本节点的内容输出到 INFO_PRINT_COMMAND"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr "无法打开到“%sâ€çš„管é“。"
#: info/session.c:3864
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "printing node %s..."
msgstr "正在打å°èŠ‚点 %s..."
#: info/session.c:3872
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "finished printing node %s"
msgstr "正在打å°èŠ‚点 %s..."
@@ -1414,22 +1529,26 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr "切æ¢æŸ¥å¯»æ—¶æ­£åˆ™è¡¨è¾¾å¼çš„用法"
#: info/session.c:3908
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using regular expressions for searches."
msgid "Using regular expressions for searches"
msgstr "使用正则表达å¼æ¥æŸ¥å¯»"
#: info/session.c:3909
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Using literal strings for searches."
msgid "Using literal strings for searches"
msgstr "使用普通字符串æ¥æŸ¥å¯»"
#: info/session.c:4112
#, fuzzy
+#| msgid "Search continued from the end of the document."
msgid "Search continued from the end of the document"
msgstr "从文档底部继续查寻。"
#: info/session.c:4117
#, fuzzy
+#| msgid "Search continued from the beginning of the document."
msgid "Search continued from the beginning of the document"
msgstr "从此文档的开头继续查找。"
@@ -1438,8 +1557,9 @@ msgstr "从此文档的开头继续查找。"
msgid "Searching subfile %s ..."
msgstr "正在æœç´¢å­æ–‡ä»¶ %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "æœç´¢å¤±è´¥ã€‚"
@@ -1466,6 +1586,7 @@ msgstr "å‘åŽæœç´¢"
#: info/session.c:4198
#, fuzzy, c-format
+#| msgid "%s%s%s [%s]: "
msgid "%s%s%s: "
msgstr "%s%s%s [%s]: "
@@ -1473,141 +1594,143 @@ msgstr "%s%s%s [%s]: "
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr ""
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "正在æœç´¢å­æ–‡ä»¶ %s ..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "读å–一个字符串并以大å°å†™æ•æ„Ÿçš„æ–¹å¼æœç´¢å®ƒ"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "读å–一个字符串并æœç´¢å®ƒ"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "读å–一个字符串并å‘åŽæœç´¢å®ƒ"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "以相åŒçš„æ–¹å‘é‡å¤æœ€åŽçš„æœç´¢"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "没有上次æœç´¢å­—符串"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "以相åçš„æ–¹å‘é‡å¤æœ€åŽçš„æœç´¢"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "在你输入的åŒæ—¶äº¤äº’å¼åœ°æœç´¢å­—符串"
-#: info/session.c:4878
+#: info/session.c:4893
msgid "Regexp I-search backward: "
msgstr "å‘åŽå¢žé‡æœç´¢æ­£åˆ™è¡¨è¾¾å¼: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "å‘åŽå¢žé‡æœç´¢ï¼š"
-#: info/session.c:4881
+#: info/session.c:4896
msgid "Regexp I-search: "
msgstr "增é‡æœç´¢æ­£åˆ™è¡¨è¾¾å¼: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "增é‡æœç´¢ï¼š"
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "失败 "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "å–消当å‰æ“作"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "退出"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "显示版本信æ¯å¹¶é€€å‡º"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr "GNU Info 版本 %s"
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "é‡ç”»æ˜¾ç¤º"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "退出 Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr "è¿è¡Œåˆ°ç»‘定到本按键的å°å†™ç‰ˆæœ¬çš„命令"
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "未知的命令 (%s)。"
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "“%sâ€ä¸ºéžæ³•"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "`%s' is invalid"
msgid "'%s' is invalid"
msgstr "“%sâ€æ˜¯æ— æ•ˆçš„"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "将本数字添加到当å‰æ•°å€¼å‚数中"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "å¼€å¯(或乘以 4)当å‰æ•°å€¼å‚æ•°"
@@ -1688,6 +1811,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "移动到下一个交å‰å¼•ç”¨"
@@ -1748,6 +1872,7 @@ msgstr "%s:空文件"
#: install-info/install-info.c:291
#, fuzzy, c-format
+#| msgid " for %s"
msgid "%s for %s"
msgstr " %s"
@@ -1782,6 +1907,18 @@ msgstr ""
#: install-info/install-info.c:552
#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| " --debug report what is being done.\n"
+#| " --delete delete existing entries for INFO-FILE from DIR-"
+#| "FILE;\n"
+#| " don't insert any new entries.\n"
+#| " --description=TEXT the description of the entry is TEXT; used with\n"
+#| " the --name option to become synonymous with the\n"
+#| " --entry option.\n"
+#| " --dir-file=NAME specify file name of Info directory file;\n"
+#| " equivalent to using the DIR-FILE argument.\n"
+#| " --dry-run same as --test."
msgid ""
" --debug report what is being done.\n"
" --delete delete existing entries for INFO-FILE from DIR-FILE;\n"
@@ -1809,6 +1946,21 @@ msgstr ""
#: install-info/install-info.c:565
#, fuzzy
+#| msgid ""
+#| " --entry=TEXT insert TEXT as an Info directory entry.\n"
+#| " TEXT is written as an Info menu item line followed\n"
+#| " by zero or more extra lines starting with "
+#| "whitespace.\n"
+#| " If you specify more than one entry, all are added.\n"
+#| " If you don't specify any entries, they are "
+#| "determined\n"
+#| " from information in the Info file itself.\n"
+#| " When removing, TEXT specifies the entry to remove.\n"
+#| " TEXT is only removed as a last resort, if the\n"
+#| " entry as determined from the Info file is not "
+#| "present,\n"
+#| " and the basename of the Info file isn't found "
+#| "either."
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry,\n"
" overriding any corresponding entry from DIR-FILE.\n"
@@ -1832,6 +1984,19 @@ msgstr ""
#: install-info/install-info.c:574
#, fuzzy
+#| msgid ""
+#| " --help display this help and exit.\n"
+#| " --info-dir=DIR same as --dir-file=DIR/dir.\n"
+#| " --info-file=FILE specify Info file to install in the directory;\n"
+#| " equivalent to using the INFO-FILE argument.\n"
+#| " --item=TEXT same as --entry=TEXT.\n"
+#| " --keep-old do not replace entries, or remove empty sections.\n"
+#| " --menuentry=TEXT same as --name=TEXT.\n"
+#| " --name=TEXT the name of the entry is TEXT; used with --"
+#| "description\n"
+#| " to become synonymous with the --entry option.\n"
+#| " --no-indent do not format new entries in the DIR file.\n"
+#| " --quiet suppress warnings."
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1854,6 +2019,19 @@ msgstr ""
#: install-info/install-info.c:582
#, fuzzy
+#| msgid ""
+#| " --help display this help and exit.\n"
+#| " --info-dir=DIR same as --dir-file=DIR/dir.\n"
+#| " --info-file=FILE specify Info file to install in the directory;\n"
+#| " equivalent to using the INFO-FILE argument.\n"
+#| " --item=TEXT same as --entry=TEXT.\n"
+#| " --keep-old do not replace entries, or remove empty sections.\n"
+#| " --menuentry=TEXT same as --name=TEXT.\n"
+#| " --name=TEXT the name of the entry is TEXT; used with --"
+#| "description\n"
+#| " to become synonymous with the --entry option.\n"
+#| " --no-indent do not format new entries in the DIR file.\n"
+#| " --quiet suppress warnings."
msgid ""
" --maxwidth, --max-width=COL wrap description at column COL.\n"
" --menuentry=TEXT same as --name=TEXT.\n"
@@ -1876,6 +2054,21 @@ msgstr ""
#: install-info/install-info.c:590
#, fuzzy
+#| msgid ""
+#| " --regex=R put this file's entries in all sections that match "
+#| "the\n"
+#| " regular expression R (ignoring case).\n"
+#| " --remove same as --delete.\n"
+#| " --remove-exactly only remove if the info file name matches exactly;\n"
+#| " suffixes such as .info and .gz are not ignored.\n"
+#| " --section=SEC put entries in section SEC of the directory.\n"
+#| " If you specify more than one section, all the "
+#| "entries\n"
+#| " are added in each of the sections.\n"
+#| " If you don't specify any sections, they are "
+#| "determined\n"
+#| " from information in the Info file itself.\n"
+#| " --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1917,6 +2110,23 @@ msgstr ""
#: install-info/install-info.c:639
#, fuzzy, c-format
+#| msgid ""
+#| "This is the file .../info/dir, which contains the\n"
+#| "topmost node of the Info hierarchy, called (dir)Top.\n"
+#| "The first time you invoke Info you start off looking at this node.\n"
+#| "\n"
+#| "%s\tThis is the top of the INFO tree\n"
+#| "\n"
+#| " This (the Directory node) gives a menu of major topics.\n"
+#| " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+#| " \"h\" gives a primer for first-timers,\n"
+#| " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+#| "\n"
+#| " In Emacs, you can click mouse button 2 on a menu item or cross "
+#| "reference\n"
+#| " to select it.\n"
+#| "\n"
+#| "%s\n"
msgid ""
"This is the file .../info/dir, which contains the\n"
"topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -1952,16 +2162,15 @@ msgstr ""
#: install-info/install-info.c:663
#, fuzzy, c-format
+#| msgid "%s: could not read (%s) and could not create (%s)\n"
msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s:å³æ— æ³•è¯»å…¥ (%s) 也无法创建 (%s)\n"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY 没有匹é…çš„ END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY 没有匹é…çš„ START-INFO-DIR-ENTRY"
@@ -1991,12 +2200,10 @@ msgid "excess command line argument `%s'"
msgstr "多余的命令行å‚数“%sâ€"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "没有指定输出文件;试用 --help 以获得更多信æ¯ã€‚"
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "没有指定目录文件;试用 --help 以获得更多信æ¯ã€‚"
@@ -2015,946 +2222,1034 @@ msgstr "“%sâ€ä¸­æ²¡æœ‰ info 目录æ¡ç›®"
msgid "no entries found for `%s'; nothing deleted"
msgstr "找ä¸åˆ°å…³äºŽâ€œ%sâ€çš„æ¡ç›®ï¼›æœªåˆ é™¤"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open %s for writing: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid language code"
msgstr "%s 在 ISO 639 语言编ç ä¸­æ˜¯æ— æ•ˆçš„"
-#: tp/Texinfo/Common.pm:1157
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid region code"
msgstr "%s 在 ISO 639 语言编ç ä¸­æ˜¯æ— æ•ˆçš„"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not read %s: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s: could not find %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, fuzzy, perl-format
-msgid "could not open %s: %s"
-msgstr "%s: 无法打开 --css-file: %s"
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, fuzzy, perl-format
+#| msgid "macro `%s' previously defined"
msgid "@%s `%s' previously defined"
msgstr "å®â€œ%sâ€å·²åœ¨å‰é¢å®šä¹‰"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, fuzzy, perl-format
+#| msgid "here is the previous definition of `%s'"
msgid "here is the previous definition as @%s"
msgstr "这里是“%sâ€å‰é¢çš„定义"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "empty argument in @%s"
msgstr "@%s çš„å‚数错误"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing %s: %s"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directories `%s' or `%s': %s"
msgstr "无法创建目录“%sâ€ï¼š%s"
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, fuzzy, perl-format
+#| msgid "Can't create directory `%s': %s"
msgid "could not create directory `%s': %s"
msgstr "无法创建目录“%sâ€ï¼š%s"
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, fuzzy, perl-format
+#| msgid "@image file `%s' unreadable: %s"
msgid "@image file `%s' not found, using `%s'"
msgstr "@image 文件“%sâ€ä¸å¯è¯»ï¼š%s"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
+#| msgid "No node name specified for `%c%s' command"
msgid "no argument specified for @U"
msgstr "没有为“%c%sâ€å‘½ä»¤æŒ‡å®šèŠ‚å称"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, fuzzy, perl-format
+#| msgid "@image file `%s' (for HTML) not readable: %s"
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image 文件“%sâ€(对 HTML)ä¸å¯è¯»ï¼š%s"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open html refs config file %s: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
#, fuzzy
+#| msgid "missing action name"
msgid "missing type"
msgstr "é—æ¼åŠ¨ä½œå称"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, fuzzy, perl-format
+#| msgid "%s: unrecognized option `--%s'\n"
msgid "unrecognized type: %s"
msgstr "%s:ä¸èƒ½è¯†åˆ«çš„选项“--%sâ€\n"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing html refs config file %s: %s"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
#, fuzzy
+#| msgid "%s:%d: --css-file ended in comment"
msgid "--css-include ended in comment"
msgstr "%s:%d: --css-file 以注释结尾"
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open --include-file %s: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing CSS file %s: %s"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, fuzzy, perl-format
+#| msgid "no index entries found for `%s'\n"
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "找ä¸åˆ°å«æœ‰â€œ%sâ€çš„索引\n"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing frame file %s: %s"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing TOC frame file %s: %s"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing redirection node file %s: %s"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, fuzzy, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "在本文档中没有本节点的“上一个â€æˆ–“上层â€èŠ‚点。"
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, fuzzy, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "未引用的节点“%sâ€"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
#, fuzzy
+#| msgid "No menu in this node."
msgid "document without nodes"
msgstr "该节点中没有èœå•ã€‚"
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, fuzzy, perl-format
+#| msgid "(outside of any node)"
msgid "@%s outside of any node"
msgstr "(超出任何节点)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, fuzzy, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, fuzzy, c-format, perl-format
+#| msgid "Entry for index `%s' outside of any node"
msgid "entry for index `%s' outside of any node"
msgstr "关于索引“%sâ€çš„æ¡ç›®è¶…出了所有节点"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing image text file %s: %s"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image 文件“%sâ€ä¸å¯è¯»ï¼š%s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr "@strong{Note...} 在 Info 中形æˆäº†ä¸€ä¸ªå‡çš„交å‰å¼•ç”¨ï¼›å¯é€šè¿‡é‡å†™é¿å…此事"
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, fuzzy, perl-format
+#| msgid "No %sindex entries containing `%s'."
msgid "@%s node name should not contain `%s'"
msgstr "没有 %s索引æ¡ç›®å«æœ‰â€œ%sâ€ã€‚"
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, fuzzy, perl-format
+#| msgid "`.' or `,' must follow @%s, not `%c'"
msgid "`.' or `,' must follow @xref, not %s"
msgstr "“.â€æˆ–“,â€ä¹‹åŽå¿…须为 @%s,而ä¸æ˜¯â€œ%câ€"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
#, fuzzy
+#| msgid "`.' or `,' must follow @%s, not `%c'"
msgid "`.' or `,' must follow @xref"
msgstr "“.â€æˆ–“,â€ä¹‹åŽå¿…须为 @%s,而ä¸æ˜¯â€œ%câ€"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:762
+#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "could not open %s: %s"
+msgstr "%s: 无法打开 --css-file: %s"
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr "多个 @%s"
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s 需è¦ä¸€ä¸ªåå­—"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad name for @%s"
msgstr "@%s çš„å‚数错误"
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s é—æ¼é—­åˆèŠ±æ‹¬å·"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr "“@endâ€éœ€è¦â€œ%sâ€ï¼Œä½†çœ‹åˆ°â€œ%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, fuzzy, perl-format
+#| msgid "No matching `%cend %s'"
msgid "no matching `%cend %s'"
msgstr "没有匹é…的“%cend %sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, fuzzy, perl-format
+#| msgid "Misplaced %c"
msgid "misplaced %c"
msgstr "错误放置的 %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, fuzzy, perl-format
+#| msgid "Unmatched `%c%s'"
msgid "unmatched `%c%s'"
msgstr "未匹é…的“%c%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' called with too many args"
msgstr "在第 %2$d 行中以过多的å‚数调用å®â€œ%1$sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, c-format, perl-format
msgid "@%s missing closing brace"
msgstr "@%s é—æ¼é—­åˆèŠ±æ‹¬å·"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' declared without argument called with an argument"
msgstr "在第 %2$d 行中以过多的å‚数调用å®â€œ%1$sâ€"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, fuzzy, c-format, perl-format
+#| msgid "\\ in macro expansion followed by `%s' instead of parameter name"
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr "\\ 以带有“%sâ€çš„å®å±•å¼€å¼ä»£æ›¿å‚æ•°å称"
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, fuzzy, c-format, perl-format
+#| msgid "missing action name"
msgid "missing name for @%s"
msgstr "é—æ¼åŠ¨ä½œå称"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "unexpected argument on @%s line: %s"
msgstr "@%s 的错误å‚æ•°: %s"
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
#, fuzzy
+#| msgid "%s: empty file"
msgid "empty multitable"
msgstr "%s:空文件"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "superfluous argument to @%s"
msgstr "@%s çš„å‚数错误"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s"
msgid "bad argument to @%s"
msgstr "@%s çš„å‚数错误"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr "%s 需è¦ä¸€ä¸ªå‚æ•°: %citem çš„æ ¼å¼åŒ–å‚æ•°"
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, fuzzy, c-format, perl-format
+#| msgid "%s: option `--%s' doesn't allow an argument\n"
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "%s:选项“--%sâ€ä¸æŽ¥å—å‚æ•°\n"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing argument"
msgstr "%s:é—æ¼æ–‡ä»¶å‚数。\n"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown @end %s"
msgstr "未知的索引“%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, fuzzy, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "superfluous argument to @%s %s: %s"
msgstr "@%s 的错误å‚æ•°: %s"
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "bad argument to @%s: %s"
msgstr "@%s 的错误å‚æ•°: %s"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s: could not open %s: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "ä¸èƒ½è¯†åˆ«çš„ç¼–ç å称“%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, fuzzy, perl-format
+#| msgid "@%s not meaningful outside `@titlepage' environment"
msgid "@%s only meaningful on a @multitable line"
msgstr "“@titlepageâ€çŽ¯å¢ƒå˜é‡å¤–çš„ @%s 是没有æ„义的"
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, fuzzy, c-format, perl-format
+#| msgid "No menu in node `%s'."
msgid "empty menu entry name in `%s'"
msgstr "节点“%sâ€ä¸­æ²¡æœ‰èœå•ã€‚"
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, fuzzy, c-format, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "@%s should not appear in @%s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@end %s should only appear at the beginning of a line"
msgstr "剪切至本行开头"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "å®â€œ%sâ€å·²åœ¨å‰é¢å®šä¹‰"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "这里是“%sâ€å‰é¢çš„定义"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, fuzzy, c-format, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "use braces to give a command as an argument to @%s"
msgstr "使用花括å·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å‚æ•°"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, fuzzy, perl-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s çš„å‚数应为“iâ€æˆ–“jâ€ï¼Œè€Œä¸æ˜¯â€œ%câ€"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s expected braces"
msgid "@%s expected braces"
msgstr "%c%s 需è¦èŠ±æ‹¬å·"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown command `%s'"
msgid "unknown command `%s'"
msgstr "未知的命令“%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr "未定义的标识: %s"
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete."
msgstr "%c%s 已过时"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete; %s"
msgstr "%c%s 已过时"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@%s should only appear at the beginning of a line"
msgstr "剪切至本行开头"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "在“@%2$sâ€å—中“@%1$sâ€æ˜¯æ²¡æœ‰æ„义的"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, fuzzy, c-format, perl-format
+#| msgid "%s: empty file"
msgid "@%s in empty multitable"
msgstr "%s:空文件"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, fuzzy, c-format, perl-format
+#| msgid "Too many columns in multitable item (max %d)"
msgid "too many columns in multitable item (max %d)"
msgstr "在多列表格项目中å«æœ‰å¤ªå¤šçš„列 (最大为 %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "忽略多列表格外的 @tab"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, fuzzy, perl-format
+#| msgid "@%s not meaningful inside `@%s' block"
msgid "@%s not allowed inside `@%s' block"
msgstr "在“@%2$sâ€å—中“@%1$sâ€æ˜¯æ²¡æœ‰æ„义的"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
+msgid "@%s should only appear in an index entry"
+msgstr "剪切至本行开头"
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, fuzzy, c-format, perl-format
+#| msgid "Must be in `@%s' environment to use `@%s'"
msgid "must be after `@%s' to use `@%s'"
msgstr "必须在“@%sâ€çŽ¯å¢ƒå˜é‡ä¸­ä½¿ç”¨â€œ@%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr "在“@titlepageâ€å’Œâ€œ@quotationâ€çŽ¯å¢ƒå˜é‡å¤– @%s æ— æ„义"
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, fuzzy, c-format, perl-format
+#| msgid "Footnotes inside footnotes are not allowed"
msgid "region %s inside region %s is not allowed"
msgstr "脚注内的脚注是ä¸å…许的"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, fuzzy, c-format, perl-format
+#| msgid "@menu seen before first @node, creating `Top' node"
msgid "@%s seen before first @node"
msgstr "在第一个节点之å‰é‡åˆ° @menu,正在创建“顶â€èŠ‚点"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "您的 @top 节点å¯èƒ½åº”该包å«åœ¨ @ifnottex 而ä¸æ˜¯ @ifinfo 中?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, fuzzy, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr "剪切至本行开头"
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
#, fuzzy
+#| msgid "Expected `%s'"
msgid "unexpected @"
msgstr "应为“%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, fuzzy, c-format, perl-format
+#| msgid "@%s not meaningful outside `@float' environment"
msgid "@%s is not meaningful outside `@float' environment"
msgstr "“@floatâ€çŽ¯å¢ƒå˜é‡å¤–çš„ @%s 是没有æ„义的"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image é—æ¼æ–‡ä»¶åå‚æ•°"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing first argument"
msgstr "%s:é—æ¼æ–‡ä»¶å‚数。\n"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "non-hex digits in argument for @U: %s"
msgstr "@%s 的错误å‚æ•°: %s"
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, fuzzy, c-format, perl-format
+#| msgid "Expected `%s'"
msgid "expected @end %s"
msgstr "应为“%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "使用花括å·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å‚æ•°"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to @%s: %s"
msgid "remaining argument on @%s line: %s"
msgstr "@%s 的错误å‚æ•°: %s"
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "environment command %s as argument to @%s"
msgstr "使用花括å·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å‚æ•°"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s:%s å‚数必须为数值,而ä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown source index in @%s: %s"
msgstr "未知的索引“%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s' in @printindex"
msgid "unknown index `%s' in @printindex"
msgstr "@printindex 中的未知索引“%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s:%s å‚数必须为数值,而ä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "ä»…æ”¯æŒ @%s 10 或 11,而ä¸æ˜¯â€œ%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, fuzzy, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "%s:--footnote-style çš„å‚数必须为“separateâ€æˆ–“endâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, fuzzy, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s:%s å‚数必须为数值,而ä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "%s:--paragraph-indent çš„å‚数必须为数值/“noneâ€/“asisâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, fuzzy, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "%s:--paragraph-indent çš„å‚数必须为数值/“noneâ€/“asisâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "%s:--paragraph-indent çš„å‚数必须为数值/“noneâ€/“asisâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, fuzzy, c-format, perl-format
+#| msgid "Expected @%s on or off, not `%s'"
msgid "expected @%s on or off, not `%s'"
msgstr "应当 @%s å¼€å¯æˆ–关闭,而ä¸æ˜¯â€œ%sâ€"
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "%s:--footnote-style çš„å‚数必须为“separateâ€æˆ–“endâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "%s:--footnote-style çš„å‚数必须为“separateâ€æˆ–“endâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
@@ -2983,8 +3278,10 @@ msgstr ""
msgid "@%s not empty"
msgstr ""
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, fuzzy, perl-format
+#| msgid ""
+#| "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s 引用到ä¸å­˜åœ¨çš„节点“%sâ€(也许字段ä¸æ­£ç¡®ï¼Ÿ)"
@@ -2993,214 +3290,232 @@ msgstr "%s 引用到ä¸å­˜åœ¨çš„节点“%sâ€(也许字段ä¸æ­£ç¡®ï¼Ÿ)"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "未引用的节点“%sâ€"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, fuzzy, perl-format
+#| msgid "unreferenced node `%s'"
msgid "%s reference to nonexistent `%s'"
msgstr "未引用的节点“%sâ€"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, fuzzy, perl-format
+#| msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "尽管节点“%sâ€æ˜¯â€œ%sâ€çš„上层节点,但缺少相关的èœå•é¡¹"
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open latex file %s for writing: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open %s: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not load %s: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "l2h: could not open %s for writing: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "tex4ht.pm: could not open %s: %s"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, fuzzy, perl-format
+#| msgid "error writing to `%s'"
msgid "error loading %s: %s\n"
msgstr "写入“%sâ€æ—¶å‡ºé”™"
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s"
msgstr "未知的动作“%sâ€"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "%s: unknown variable %s\n"
msgstr "未知的动作“%sâ€"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
msgid "could not read init file %s"
msgstr "无法创建输出文件“%sâ€ã€‚"
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, fuzzy, perl-format
+#| msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr "%s: 忽略ä¸å¯è¾¨è®¤çš„ TEXINFO_OUTPUT_FORMAT 值“%sâ€ã€‚\n"
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "用法:%s [选项]... TEXINFO-文件...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
#, fuzzy
+#| msgid ""
+#| "Translate Texinfo source documentation to various other formats, by "
+#| "default\n"
+#| "Info files suitable for reading online with Emacs or standalone GNU "
+#| "Info.\n"
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3211,8 +3526,20 @@ msgstr ""
"å°† Texinfo æºæ–‡ä»¶è½¬æ¢ä¸ºå…¶å®ƒå„ç§æ ¼å¼ï¼Œé»˜è®¤è½¬æ¢ä¸ºé€‚于\n"
"ç”± Emacs 或独立 GNU Info 在线æµè§ˆçš„ Info 文件。\n"
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, fuzzy, perl-format
+#| msgid ""
+#| "General options:\n"
+#| " --error-limit=NUM quit after NUM errors (default %d).\n"
+#| " --document-language=STR locale to use in translating Texinfo "
+#| "keywords\n"
+#| " for the output document (default C).\n"
+#| " --force preserve output even if errors.\n"
+#| " --help display this help and exit.\n"
+#| " --no-validate suppress node cross-reference validation.\n"
+#| " --no-warn suppress warnings (but not errors).\n"
+#| " -v, --verbose explain what is being done.\n"
+#| " --version display version information and exit.\n"
msgid ""
"General options:\n"
" --document-language=STR locale to use in translating Texinfo keywords\n"
@@ -3240,8 +3567,14 @@ msgstr ""
" -v, --verbose 解释都åšäº†äº›ä»€ä¹ˆã€‚\n"
" --version 显示版本信æ¯å¹¶é€€å‡ºã€‚\n"
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
#, fuzzy
+#| msgid ""
+#| "Output format selection (default is to produce Info):\n"
+#| " --docbook output Docbook XML rather than Info.\n"
+#| " --html output HTML rather than Info.\n"
+#| " --xml output Texinfo XML rather than Info.\n"
+#| " --plaintext output plain text rather than Info.\n"
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3257,8 +3590,26 @@ msgstr ""
" --xml 输出 XML (TexinfoML) 而ä¸æ˜¯ Info。\n"
" --plaintext 输出普通文本而ä¸æ˜¯ Info。\n"
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
#, fuzzy
+#| msgid ""
+#| "General output options:\n"
+#| " -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
+#| " ignoring any @setfilename.\n"
+#| " --no-headers suppress node separators, Node: lines, and "
+#| "menus\n"
+#| " from Info output (thus producing plain "
+#| "text)\n"
+#| " or from HTML (thus producing shorter "
+#| "output);\n"
+#| " also, write to standard output by "
+#| "default.\n"
+#| " --no-split suppress the splitting of Info or HTML "
+#| "output,\n"
+#| " generate only one output file.\n"
+#| " --number-sections output chapter and sectioning numbers.\n"
+#| " -o, --output=FILE output to FILE (or directory if split "
+#| "HTML).\n"
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3296,7 +3647,7 @@ msgstr ""
" --number-sections 输出章节编å·ã€‚\n"
" -o, --output=FILE 输出到文件 FILE (如果是分割的 HTML 则为目录)。\n"
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3330,8 +3681,17 @@ msgstr ""
" “asisâ€ï¼Œä¿ç•™çŽ°æœ‰çš„对é½ã€‚\n"
" --split-size=NUM åœ¨å¤§å° NUM 的时候拆分 Info 文件 (默认为 %d)。\n"
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
#, fuzzy
+#| msgid ""
+#| "Options for HTML:\n"
+#| " --css-include=FILE include FILE in HTML <style> output;\n"
+#| " read stdin if FILE is -.\n"
+#| " --css-ref=URL generate reference to a CSS file.\n"
+#| " --internal-links=FILE produce list of internal links in FILE.\n"
+#| " --transliterate-file-names\n"
+#| " produce file names in ASCII "
+#| "transliteration.\n"
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3352,20 +3712,28 @@ msgstr ""
" --transliterate-file-names\n"
" 以 ASCII 字义生æˆæ–‡ä»¶å。\n"
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
#, fuzzy
+#| msgid ""
+#| "Input file options:\n"
+#| " --commands-in-node-names allow @ commands in node names.\n"
+#| " -D VAR define the variable VAR, as with @set.\n"
+#| " -I DIR append DIR to the @include search path.\n"
+#| " -P DIR prepend DIR to the @include search path.\n"
+#| " -U VAR undefine the variable VAR, as with "
+#| "@clear.\n"
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3382,8 +3750,27 @@ msgstr ""
" -P DIR å°† DIR 追加到 @include æœç´¢è·¯å¾„之å‰ã€‚\n"
" -U VAR å–消å˜é‡ VAR 的定义,就象 @clear。\n"
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
#, fuzzy
+#| msgid ""
+#| "Conditional processing in input:\n"
+#| " --ifdocbook process @ifdocbook and @docbook even if\n"
+#| " not generating Docbook.\n"
+#| " --ifhtml process @ifhtml and @html even if not generating "
+#| "HTML.\n"
+#| " --ifinfo process @ifinfo even if not generating Info.\n"
+#| " --ifplaintext process @ifplaintext even if not generating plain "
+#| "text.\n"
+#| " --iftex process @iftex and @tex; implies --no-split.\n"
+#| " --ifxml process @ifxml and @xml.\n"
+#| " --no-ifdocbook do not process @ifdocbook and @docbook text.\n"
+#| " --no-ifhtml do not process @ifhtml and @html text.\n"
+#| " --no-ifinfo do not process @ifinfo text.\n"
+#| " --no-ifplaintext do not process @ifplaintext text.\n"
+#| " --no-iftex do not process @iftex and @tex text.\n"
+#| " --no-ifxml do not process @ifxml and @xml text.\n"
+#| "\n"
+#| " Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3414,8 +3801,14 @@ msgstr ""
" --no-ifplaintext ä¸è¦å¤„ç† @ifplaintext 文本。\n"
" --no-iftex ä¸è¦å¤„ç† @iftex å’Œ @tex 文本。\n"
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
#, fuzzy
+#| msgid ""
+#| " The defaults for the @if... conditionals depend on the output format:\n"
+#| " if generating HTML, --ifhtml is on and the others are off;\n"
+#| " if generating Info, --ifinfo is on and the others are off;\n"
+#| " if generating plain text, --ifplaintext is on and the others are off;\n"
+#| " if generating XML, --ifxml is on and the others are off.\n"
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3430,8 +3823,25 @@ msgstr ""
" 如果生æˆæ™®é€šæ–‡æœ¬ï¼Œåˆ™ --ifplaintext 默认开å¯è€Œå…¶å®ƒé»˜è®¤å…³é—­ï¼›\n"
" å¦‚æžœç”Ÿæˆ XML,则 --ifxml 默认开å¯è€Œå…¶å®ƒé»˜è®¤å…³é—­ã€‚\n"
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
#, fuzzy
+#| msgid ""
+#| "Examples:\n"
+#| " makeinfo foo.texi write Info to foo's "
+#| "@setfilename\n"
+#| " makeinfo --html foo.texi write HTML to @setfilename\n"
+#| " makeinfo --xml foo.texi write Texinfo XML to "
+#| "@setfilename\n"
+#| " makeinfo --docbook foo.texi write DocBook XML to "
+#| "@setfilename\n"
+#| " makeinfo --no-headers foo.texi write plain text to standard "
+#| "output\n"
+#| "\n"
+#| " makeinfo --html --no-headers foo.texi write html without node lines, "
+#| "menus\n"
+#| " makeinfo --number-sections foo.texi write Info with numbered "
+#| "sections\n"
+#| " makeinfo --no-split foo.texi write one Info file however big\n"
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -3458,81 +3868,346 @@ msgstr ""
" makeinfo --number-sections foo.texi 输出带有编å·çš„节的 Info\n"
" makeinfo --no-split foo.texi 输出å•ä¸ª Info 文件而ä¸è®ºå¤§å°\n"
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s:--footnote-style çš„å‚数必须为“separateâ€æˆ–“endâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr "%s:--paragraph-indent çš„å‚数必须为数值/“noneâ€/“asisâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, fuzzy, perl-format
+#| msgid "unknown action `%s'"
msgid "unknown tree transformation %s"
msgstr "未知的动作“%sâ€"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s:é—æ¼æ–‡ä»¶å‚数。\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "试用“%s --helpâ€ä»¥èŽ·å–更多信æ¯ã€‚\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, fuzzy, perl-format
+#| msgid "error closing output file `%s'"
msgid "error on closing macro expand file %s: %s\n"
msgstr "关闭输出文件“%sâ€æ—¶å‡ºé”™"
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "could not open %s for writing: %s\n"
msgstr "%s: 无法打开 --css-file: %s"
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, fuzzy, perl-format
+#| msgid "%s: ignoring second internal links output `%s'.\n"
msgid "%s: error on closing internal links file %s: %s\n"
msgstr "%s: 忽略二次内部连接输出“%sâ€ã€‚\n"
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, fuzzy, perl-format
+#| msgid "%s: could not open --css-file: %s"
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: 无法打开 --css-file: %s"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "No matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "没有匹é…的“%cend %sâ€"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced {"
+msgstr "错误放置的 %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "未匹é…的“%c%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s 需è¦ä¸€ä¸ªåå­—"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad name for @set"
+msgstr "@%s çš„å‚数错误"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s 需è¦ä¸€ä¸ªåå­—"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad name for @clear"
+msgstr "@%s çš„å‚数错误"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s 需è¦ä¸€ä¸ªåå­—"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad name for @unmacro"
+msgstr "@%s çš„å‚数错误"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "使用花括å·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å‚æ•°"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "使用花括å·å°†ä¸€ä¸ªå‘½ä»¤ç”¨ä½œ @%s çš„å‚æ•°"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @alias"
+msgstr "@%s çš„å‚数错误"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "bad argument to @definfoenclose"
+msgstr "@%s çš„å‚数错误"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+#, fuzzy
+#| msgid "Bad argument to @%s"
+msgid "empty @columnfractions"
+msgstr "@%s çš„å‚数错误"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @printindex: %s"
+msgstr "@%s 的错误å‚æ•°: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, fuzzy, c-format
+#| msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr "ä»…æ”¯æŒ @%s 10 或 11,而ä¸æ˜¯â€œ%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "%s:--footnote-style çš„å‚数必须为“separateâ€æˆ–“endâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, fuzzy, c-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr "%s:%s å‚数必须为数值,而ä¸æ˜¯â€œ%sâ€ã€‚\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @need: %s"
+msgstr "@%s 的错误å‚æ•°: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "%s:--paragraph-indent çš„å‚数必须为数值/“noneâ€/“asisâ€ï¼Œè€Œä¸æ˜¯â€œ%sâ€ã€‚\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @headings: %s"
+msgstr "@%s 的错误å‚æ•°: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires an argument: the formatter for %citem"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s 需è¦ä¸€ä¸ªå‚æ•°: %citem çš„æ ¼å¼åŒ–å‚æ•°"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "未匹é…的“%c%sâ€"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "superfluous argument to @end %s: %s"
+msgstr "@%s 的错误å‚æ•°: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "Bad argument to @%s: %s"
+msgid "bad argument to @end: %s"
+msgstr "@%s 的错误å‚æ•°: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, fuzzy, c-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "@include: could not find %s"
+msgstr "%s: 无法打开 --css-file: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, fuzzy, c-format
+#| msgid "%s: could not open --css-file: %s"
+msgid "@include: could not open %s:"
+msgstr "%s: 无法打开 --css-file: %s"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+#, fuzzy
+#| msgid "@%s not meaningful outside `@titlepage' environment"
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr "“@titlepageâ€çŽ¯å¢ƒå˜é‡å¤–çš„ @%s 是没有æ„义的"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "在“@%2$sâ€å—中“@%1$sâ€æ˜¯æ²¡æœ‰æ„义的"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "在“@%2$sâ€å—中“@%1$sâ€æ˜¯æ²¡æœ‰æ„义的"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+#, fuzzy
+#| msgid ""
+#| "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "在“@titlepageâ€å’Œâ€œ@quotationâ€çŽ¯å¢ƒå˜é‡å¤– @%s æ— æ„义"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s 需è¦ä¸€ä¸ªåå­—"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s çš„å‚数应为“iâ€æˆ–“jâ€ï¼Œè€Œä¸æ˜¯â€œ%câ€"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, fuzzy, c-format
+#| msgid "undefined flag: %s"
+msgid "undefined flag: %.*s"
+msgstr "未定义的标识: %s"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete."
+msgstr "%c%s 已过时"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s 已过时"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+#, fuzzy
+#| msgid "Kill to the beginning of the line"
+msgid "@\\ should only appear in math context"
+msgstr "剪切至本行开头"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s çš„å‚数应为“iâ€æˆ–“jâ€ï¼Œè€Œä¸æ˜¯â€œ%câ€"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced }"
+msgstr "错误放置的 %c"
+
+#, fuzzy, c-format
#~| msgid "Can't remove file `%s': %s"
#~ msgid "can't open %s: %s"
#~ msgstr "无法删除文件“%sâ€ï¼š%s"
@@ -3542,17 +4217,27 @@ msgstr "%s: 无法打开 --css-file: %s"
#~ msgid "arguments are quoted by default"
#~ msgstr "ä¸èµžæˆä½¿ç”¨ @quote-argï¼›å‚数是默认引用的"
-#, fuzzy
+#, fuzzy, perl-format
#~| msgid "Set variable: "
#~ msgid "Obsolete variable %s\n"
#~ msgstr "设定å˜é‡ï¼š"
-#, fuzzy
+#, fuzzy, perl-format
+#~| msgid "No `Prev' or `Up' for this node within this document."
+#~ msgid "old name for `%s' is a node of the document"
+#~ msgstr "在本文档中没有本节点的“上一个â€æˆ–“上层â€èŠ‚点。"
+
+#, fuzzy, perl-format
+#~| msgid "unreferenced node `%s'"
+#~ msgid "file empty for renamed node `%s'"
+#~ msgstr "未引用的节点“%sâ€"
+
+#, fuzzy, perl-format
#~| msgid "Set variable: "
#~ msgid "%s: obsolete variable %s\n"
#~ msgstr "设定å˜é‡ï¼š"
-#, fuzzy
+#, fuzzy, perl-format
#~| msgid "Set variable: "
#~ msgid "obsolete variable %s\n"
#~ msgstr "设定å˜é‡ï¼š"
diff --git a/macros/texinfo/texinfo/po/zh_TW.gmo b/macros/texinfo/texinfo/po/zh_TW.gmo
index 84794b48e7..0d7938d204 100644
--- a/macros/texinfo/texinfo/po/zh_TW.gmo
+++ b/macros/texinfo/texinfo/po/zh_TW.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po/zh_TW.po b/macros/texinfo/texinfo/po/zh_TW.po
index 2fc7ab2f5a..317088d230 100644
--- a/macros/texinfo/texinfo/po/zh_TW.po
+++ b/macros/texinfo/texinfo/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 4.1\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2002-03-08 04:56+0800\n"
"Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -22,36 +22,43 @@ msgstr ""
#: gnulib/lib/getopt.c:278
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous\n"
msgstr "%s: ¿ï¶µ `%s' ¤£©ú\n"
#: gnulib/lib/getopt.c:284
#, fuzzy, c-format
+#| msgid "%s: option `%s' is ambiguous\n"
msgid "%s: option '%s%s' is ambiguous; possibilities:"
msgstr "%s: ¿ï¶µ `%s' ¤£©ú\n"
#: gnulib/lib/getopt.c:319
#, fuzzy, c-format
+#| msgid "%s: unrecognized option `%c%s'\n"
msgid "%s: unrecognized option '%s%s'\n"
msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
#: gnulib/lib/getopt.c:345
#, fuzzy, c-format
+#| msgid "%s: option `%c%s' doesn't allow an argument\n"
msgid "%s: option '%s%s' doesn't allow an argument\n"
msgstr "%s: ¿ï¶µ `%c%s' ¤£¥i§t¦³¤Þ¼Æ\n"
#: gnulib/lib/getopt.c:360
#, fuzzy, c-format
+#| msgid "%s: option `%s' requires an argument\n"
msgid "%s: option '%s%s' requires an argument\n"
msgstr "%s: ¿ï¶µ `%s' ¥²¶·§t¦³¤Þ¼Æ\n"
#: gnulib/lib/getopt.c:621
#, fuzzy, c-format
+#| msgid "%s: invalid option -- %c\n"
msgid "%s: invalid option -- '%c'\n"
msgstr "%s: µL®Äªº¿ï¶µ -- %c\n"
#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:682
#, fuzzy, c-format
+#| msgid "%s: option requires an argument -- %c\n"
msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: ¿ï¶µ¥²¶·§t¦³¤Þ¼Æ -- %c\n"
@@ -69,6 +76,7 @@ msgstr ""
#: gnulib/lib/regcomp.c:144
#, fuzzy
+#| msgid "Insert this character"
msgid "Invalid collation character"
msgstr "´¡¤J¥»¦r¤¸"
@@ -90,11 +98,13 @@ msgstr ""
#: gnulib/lib/regcomp.c:159
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ( or \\("
msgstr "¥¼°t¹ïªº }"
#: gnulib/lib/regcomp.c:162
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched \\{"
msgstr "¥¼°t¹ïªº }"
@@ -108,6 +118,7 @@ msgstr ""
#: gnulib/lib/regcomp.c:171
#, fuzzy
+#| msgid "virtual memory exhausted"
msgid "Memory exhausted"
msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
@@ -125,16 +136,19 @@ msgstr ""
#: gnulib/lib/regcomp.c:183
#, fuzzy
+#| msgid "Unmatched }"
msgid "Unmatched ) or \\)"
msgstr "¥¼°t¹ïªº }"
#: gnulib/lib/regcomp.c:676
#, fuzzy
+#| msgid "No previous search string"
msgid "No previous regular expression"
msgstr "¨S¦³«e¤@¦¸ªº·j´M¦r¦ê"
#: gnulib/lib/xalloc-die.c:34
#, fuzzy
+#| msgid "virtual memory exhausted"
msgid "memory exhausted"
msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
@@ -236,6 +250,7 @@ msgstr "³æ¤@ªº§¹¦¨¥y"
#: info/echo-area.c:1049
#, fuzzy, c-format
+#| msgid "%d completions:\n"
msgid "%d completion:\n"
msgid_plural "%d completions:\n"
msgstr[0] "%d ­Ó§¹¦¨¥y:\n"
@@ -246,7 +261,6 @@ msgid "Insert completion"
msgstr "´¡¤J§¹¦¨¥y"
#: info/echo-area.c:1268
-#, c-format
msgid "Building completions..."
msgstr "«Ø¥ß§¹¦¨¥y¤¤..."
@@ -266,11 +280,11 @@ msgstr ""
#: info/filesys.c:236 info/filesys.c:250 info/filesys.c:271
#, fuzzy, c-format
+#| msgid "Find file: "
msgid "found file %s"
msgstr "§ä´MÀÉ®×: "
#: info/footnotes.c:229
-#, c-format
msgid "Footnotes could not be displayed"
msgstr "µLªkÅã¥Üµù¸}"
@@ -284,7 +298,6 @@ msgid "---------- Footnotes ----------"
msgstr "---------------------\n"
#: info/indices.c:121 info/indices.c:877
-#, c-format
msgid "Finding index entries..."
msgstr "§ä´M¯Á¤Þ¶µ¥Ø..."
@@ -293,7 +306,8 @@ msgid "Look up a string in the index for this file"
msgstr "¦b¥»Àɮתº¯Á¤Þ¤º¬d¸ß¦r¦ê"
#: info/indices.c:213
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No indices found."
msgid "No indices found"
msgstr "§ä¤£¨ì¯Á¤Þ"
@@ -302,38 +316,45 @@ msgid "Index entry: "
msgstr "¯Á¤Þ¶µ¥Ø: "
#: info/indices.c:320 info/indices.c:883
-#, c-format
msgid "No indices found."
msgstr "§ä¤£¨ì¯Á¤Þ"
#: info/indices.c:436
#, fuzzy, c-format
+#| msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
msgstr "§ä¨ì \"%s\" ¦b %s ¤§¤¤. (`\\[next-index-match]' ¹Á¸Õ­n§ä¨ì¤U¤@­Ó¦r¦ê.)"
#: info/indices.c:446
#, fuzzy
+#| msgid ""
+#| "Go to the next matching index item from the last `\\[index-search]' "
+#| "command"
msgid ""
"Go to the next matching index item from the last '\\[index-search]' command"
msgstr "²¾°Ê¦Ü¤U¤@­Ó²Å¦X¤W¤@¦¸ªº `\\[index-search] ©R¥Oªº·j´M¶µ¥Ø"
#: info/indices.c:457
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "No previous index search string."
msgid "No previous index search string"
msgstr "¨S¦³«e¤@­Ó¯Á¤Þ·j´M¦r¦ê"
#: info/indices.c:475
#, fuzzy, c-format
+#| msgid "No %sindex entries containing \"%s\"."
msgid "No more index entries containing '%s'"
msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
#: info/indices.c:476
#, fuzzy, c-format
+#| msgid "No %sindex entries containing \"%s\"."
msgid "No index entries containing '%s'"
msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
#: info/indices.c:586
#, fuzzy, c-format
+#| msgid "Scanning indices of \"%s\"..."
msgid "Scanning indices of '%s'..."
msgstr "±½ºË \"%s\" ªº¯Á¤Þ¤¤..."
@@ -347,6 +368,7 @@ msgstr ""
#: info/indices.c:698
#, fuzzy, c-format
+#| msgid "No %sindex entries containing \"%s\"."
msgid "Index entries containing '%s':\n"
msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
@@ -369,6 +391,7 @@ msgstr ""
#: info/indices.c:916
#, fuzzy, c-format
+#| msgid "No %sindex entries containing \"%s\"."
msgid "No index entries containing '%s'."
msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
@@ -378,22 +401,22 @@ msgid "No available info files have '%s' in their indices"
msgstr ""
#: info/info-utils.c:878
-#, c-format
msgid "Error converting file character encoding"
msgstr ""
#: info/info.c:277 info/session.c:2786
#, fuzzy, c-format
+#| msgid "No menu item `%s' in node `%s'."
msgid "No menu item '%s' in node '%s'"
msgstr "¿ï³æ¶µ¥Ø `%s' ¤£¦b¸`ÂI `%s' ¤¤."
#: info/info.c:415 info/info.c:1181
#, fuzzy, c-format
+#| msgid "Cannot find node `%s'."
msgid "Cannot find node '%s'"
msgstr "§ä¤£¨ì `%s' ¸`ÂI."
#: info/info.c:437
-#, c-format
msgid "No program name given"
msgstr ""
@@ -414,6 +437,7 @@ msgstr ""
#: info/info.c:828 info/infokey.c:560
#, fuzzy, c-format
+#| msgid "Set the value of an Info variable"
msgid "value %s is not valid for variable %s"
msgstr "³]©w Info Åܼƪº¼Æ­È"
@@ -422,7 +446,7 @@ msgstr "³]©w Info Åܼƪº¼Æ­È"
msgid "Try --help for more information.\n"
msgstr "¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T.\n"
-#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:819
+#: info/info.c:859 install-info/install-info.c:2236 tp/texi2any.pl:795
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -434,6 +458,7 @@ msgstr ""
#: info/info.c:1035
#, fuzzy, c-format
+#| msgid "no index entries found for `%s'\n"
msgid "no index entries found for '%s'\n"
msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
@@ -511,8 +536,12 @@ msgid ""
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:807
+#: info/info.c:1147 install-info/install-info.c:613 tp/texi2any.pl:783
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Email bug reports to bug-texinfo@gnu.org,\n"
+#| "general questions and discussion to help-texinfo@gnu.org.\n"
msgid ""
"Email bug reports to bug-texinfo@gnu.org,\n"
"general questions and discussion to help-texinfo@gnu.org.\n"
@@ -524,6 +553,7 @@ msgstr ""
#: info/info.c:1182
#, fuzzy, c-format
+#| msgid "Cannot find node `(%s)%s'."
msgid "Cannot find node '(%s)%s'"
msgstr "§ä¤£¨ì `(%s)%s' ¸`ÂI."
@@ -537,61 +567,73 @@ msgstr "´å¼Ð¦ì¸m¤£¦b¥»¤À¹jµøµ¡ªº¸`ÂI¤º!"
#: info/info.c:1185
#, fuzzy
+#| msgid "Cannot delete the last window."
msgid "Cannot delete the last window"
msgstr "µLªk§R°£¤W¤@­Ó¤À¹jµøµ¡."
#: info/info.c:1186
#, fuzzy
+#| msgid "No menu in this node."
msgid "No menu in this node"
msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
#: info/info.c:1187
#, fuzzy
+#| msgid "No footnotes in this node."
msgid "No footnotes in this node"
msgstr "¥»¸`ÂI¨S¦³µù¸}."
#: info/info.c:1188
#, fuzzy
+#| msgid "No cross references in this node."
msgid "No cross references in this node"
msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
#: info/info.c:1189
#, fuzzy, c-format
+#| msgid "No `%s' pointer for this node."
msgid "No '%s' pointer for this node"
msgstr "¥»¸`ÂI¨S¦³ `%s' pointer."
#: info/info.c:1190
#, fuzzy, c-format
+#| msgid "Unknown Info command `%c'; try `?' for help."
msgid "Unknown Info command '%c'; try '?' for help"
msgstr "¥¼ª¾ªº Info ©R¥O `%c'; ¸Õ¸Õ `?' ¥H¨ú±o¨D§U¸ê°T."
#: info/info.c:1191
#, fuzzy, c-format
+#| msgid "Terminal type `%s' is not smart enough to run Info."
msgid "Terminal type '%s' is not smart enough to run Info"
msgstr "²×ºÝ¾÷Ãþ«¬ `%s' µLªk¤ä´©°õ¦æ Info ©Ò»Ýªº»Ý¨D."
#: info/info.c:1192
#, fuzzy
+#| msgid "You are already at the last page of this node."
msgid "You are already at the last page of this node"
msgstr "±z¤w¦b¥»¸`ÂIªº³Ì«á¤@­¶."
#: info/info.c:1193
#, fuzzy
+#| msgid "You are already at the first page of this node."
msgid "You are already at the first page of this node"
msgstr "±z¤w¦b¥»¸`ÂIªº²Ä¤@­¶."
#: info/info.c:1194
#, fuzzy
+#| msgid "Only one window."
msgid "Only one window"
msgstr "¥u¦³¤@­Ó¤À¹jµøµ¡."
#: info/info.c:1195
#, fuzzy
+#| msgid "Resulting window would be too small."
msgid "Resulting window would be too small"
msgstr "²£¥Íªº¤À¹jµøµ¡·|¤Ó¤p."
#: info/info.c:1196
#, fuzzy
+#| msgid "Not enough room for a help window, please delete a window."
msgid "Not enough room for a help window, please delete a window"
msgstr "³Ñ¤UªºªÅ¶¡¤Ó¤p, µLªk®e¯Ç¨D§U¤À¹jµøµ¡, ½Ð§R°£¤@­Ó¤À¹jµøµ¡."
@@ -698,6 +740,7 @@ msgstr " %-10s ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
#: info/infodoc.c:63
#, fuzzy
+#| msgid " %-10s Pick first ... ninth item in node's menu.\n"
msgid "1...9 Pick the first...ninth item in this node's menu.\n"
msgstr " %-10s ¬D¿ï¸`ÂI¥Ø¿ý¤¤ªº²Ä¤@­Ó...²Ä¤E­Ó¶µ¥Ø.\n"
@@ -708,6 +751,7 @@ msgstr " %-10s ¬D¿ï¸`ÂI¥Ø¿ýªº³Ì«á¤@­Ó¶µ¥Ø.\n"
#: info/infodoc.c:65
#, fuzzy
+#| msgid " %-10s Pick menu item specified by name.\n"
msgid "\\%-10[menu-item] Pick a menu item specified by name.\n"
msgstr " %-10s ¥H¦WºÙ¿ï¨ú¿ï³æ¶µ¥Ø.\n"
@@ -718,6 +762,7 @@ msgstr " %-10s ¸òÀH¥æ¤¬°Ñ·Ó. Ū¨ú°Ñ·Óªº¦WºÙ.\n"
#: info/infodoc.c:67
#, fuzzy
+#| msgid " %-10s Move to node specified by name.\n"
msgid "\\%-10[goto-node] Go to a node specified by name.\n"
msgstr " %-10s ²¾°Ê¨ì«ü©w¦WºÙªº¸`ÂI.\n"
@@ -747,11 +792,13 @@ msgstr ""
#: info/infodoc.c:76
#, fuzzy
+#| msgid "Cancel current operation"
msgid "\\%-10[abort-key] Cancel the current operation.\n"
msgstr "¨ú®ø¥Ø«eªº§@·~"
#: info/infodoc.c:195
#, fuzzy, c-format
+#| msgid "This is %s, produced by makeinfo version %s from %s.\n"
msgid "This is GNU Info version %s. "
msgstr "³o¬O %s, ¥Ñ makeinfo ª©¥» %s ¦Û %s ²£¥Íªº.\n"
@@ -799,6 +846,7 @@ msgstr "Åã¥Ü¨D§U°T®§"
#: info/infodoc.c:346
#, fuzzy
+#| msgid "Visit Info node `(info)Help'"
msgid "Visit Info node '(info)Help'"
msgstr "«ô³X Info ¸`ÂI `(info)Help'"
@@ -813,6 +861,7 @@ msgstr "´y­z«öÁä«ü¥O: %s"
#: info/infodoc.c:471 info/infodoc.c:507
#, fuzzy, c-format
+#| msgid "%s is undefined."
msgid "%s is undefined"
msgstr "%s ¥¼©w¸q."
@@ -826,21 +875,25 @@ msgstr ""
#: info/infodoc.c:821
#, fuzzy, c-format
+#| msgid "`%s' is not on any keys"
msgid "'%s' is not on any keys"
msgstr "`%s' ¥¼Ãìµ²¨ì¥ô¦ó«öÁä"
#: info/infodoc.c:827
#, fuzzy, c-format
+#| msgid "%s can only be invoked via %s."
msgid "%s can only be invoked via %s"
msgstr "%s ¥u¯à¸g¥Ñ %s °õ¦æ."
#: info/infodoc.c:831
#, fuzzy, c-format
+#| msgid "%s can be invoked via %s."
msgid "%s can be invoked via %s"
msgstr "%s ¥i¸g¥Ñ %s °õ¦æ."
#: info/infodoc.c:836
#, fuzzy, c-format
+#| msgid "There is no function named `%s'"
msgid "There is no function named '%s'"
msgstr "¨S¦³¦W¬° `%s' ªº¨ç¦¡"
@@ -850,17 +903,14 @@ msgid "could not open init file %s"
msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
#: info/infokey.c:227
-#, c-format
msgid "key sequence too long"
msgstr ""
#: info/infokey.c:304
-#, c-format
msgid "missing key sequence"
msgstr ""
#: info/infokey.c:384
-#, c-format
msgid "NUL character (\\000) not permitted"
msgstr ""
@@ -870,12 +920,11 @@ msgid "NUL character (^%c) not permitted"
msgstr ""
#: info/infokey.c:436
-#, fuzzy, c-format
+#, fuzzy
msgid "missing action name"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
#: info/infokey.c:454
-#, c-format
msgid "cannot bind key sequence to menu-digit"
msgstr ""
@@ -885,7 +934,6 @@ msgid "unknown action `%s'"
msgstr "¥¼ª¾ªº©R¥O `%s'"
#: info/infokey.c:503
-#, c-format
msgid "action name too long"
msgstr ""
@@ -895,22 +943,19 @@ msgid "extra characters following action `%s'"
msgstr ""
#: info/infokey.c:527
-#, fuzzy, c-format
+#, fuzzy
msgid "missing variable name"
msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
#: info/infokey.c:536
-#, c-format
msgid "missing `=' immediately after variable name"
msgstr ""
#: info/infokey.c:543
-#, c-format
msgid "variable name too long"
msgstr ""
#: info/infokey.c:567
-#, c-format
msgid "value too long"
msgstr ""
@@ -932,7 +977,8 @@ msgid "Read a command name in the echo area and execute it"
msgstr "¦b¦^À³°Ï¤¤Åª¨ú©R¥O¦WºÙ, ¨Ã¥B°õ¦æ¥¦"
#: info/m-x.c:134
-#, fuzzy, c-format
+#, fuzzy
+#| msgid "Cannot execute an `echo-area' command here."
msgid "Cannot execute an 'echo-area' command here"
msgstr "µLªk¦b³o¸Ì°õ¦æ `echo-area' ©R¥O."
@@ -961,6 +1007,11 @@ msgstr "µLªk³B²zÀÉ®× %s.\n"
#. it is part of the Info syntax.
#: info/nodemenu.c:33
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "* Menu:\n"
+#| " (File)Node Lines Size Containing File\n"
+#| " ---------- ----- ---- ---------------"
msgid ""
"\n"
"* Menu:\n"
@@ -975,6 +1026,9 @@ msgstr ""
#: info/nodemenu.c:185
#, fuzzy
+#| msgid ""
+#| "Here is the menu of nodes you have recently visited.\n"
+#| "Select one from this menu, or use `\\[history-node]' in another window.\n"
msgid ""
"Here is the menu of nodes you have recently visited.\n"
"Select one from this menu, or use '\\[history-node]' in another window.\n"
@@ -1014,7 +1068,6 @@ msgid "Show all matching files"
msgstr ""
#: info/session.c:63
-#, c-format
msgid "No file index"
msgstr ""
@@ -1023,6 +1076,9 @@ msgstr ""
#. displayed on an 80-column terminal.
#: info/session.c:189
#, fuzzy, c-format
+#| msgid ""
+#| "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-"
+#| "item] for menu item."
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-info-"
"help-node] for tutorial."
@@ -1163,6 +1219,7 @@ msgstr "¿ï¾Ü³o¤@­Ó¿ï³æ¶µ¥Ø"
#: info/session.c:2217
#, fuzzy, c-format
+#| msgid "There aren't %d items in this menu."
msgid "There isn't %d item in this menu"
msgid_plural "There aren't %d items in this menu"
msgstr[0] "¥»¿ï³æ¤¤¨S¦³ %d ­Ó¶µ¥Ø"
@@ -1192,6 +1249,7 @@ msgstr "¸òÀH¥æ¤¬°Ñ·Ó: "
#: info/session.c:2424
#, fuzzy, c-format
+#| msgid "The reference disappeared! (%s)."
msgid "The reference disappeared! (%s)"
msgstr "¥æ¤¬°Ñ·Ó¤£¨£¤F! (%s)."
@@ -1225,11 +1283,13 @@ msgstr "¿ï¾Ü¥X²{¦b¥»¦æªº°Ñ·Ó©Î¿ï³æ¶µ¥Ø"
#: info/session.c:2764
#, fuzzy, c-format
+#| msgid "No menu in node `%s'."
msgid "No menu in node '%s'"
msgstr "¸`ÂI `%s' ¤¤¨S¦³¿ï³æ."
#: info/session.c:2811
#, fuzzy, c-format
+#| msgid "Unable to find node referenced by `%s' in `%s'."
msgid "Unable to find node referenced by '%s' in '%s'"
msgstr "³Q°Ñ·Óªº¸`ÂI `%s' ¦b `%s' ¤¤§ä¤£¨ì."
@@ -1267,11 +1327,13 @@ msgstr "¿ï¨ú¥»Àɮתº²Ä¤@­Ó¸`ÂI"
#: info/session.c:3161
#, fuzzy
+#| msgid "No more nodes within this document."
msgid "No more nodes within this document"
msgstr "¥»¤å¥ó¤¤¨S¦³§ó¦hªº¸`ÂI¤F."
#: info/session.c:3205 info/session.c:3244
#, fuzzy
+#| msgid "No `Prev' or `Up' for this node within this document."
msgid "No 'Prev' or 'Up' for this node within this document"
msgstr "¦b¥»¤å¥ó¤¤, ¥»¸`ÂI¨S¦³ `¤W¤@­Ó (Prev)' ¸`ÂI©Î `¤W¤@¼h (Up)' ¸`ÂI."
@@ -1310,11 +1372,13 @@ msgstr "¨ú±o½u¤W¤â¥U (Manpage): "
#: info/session.c:3606
#, fuzzy
+#| msgid "Select the node `Top' in this file"
msgid "Select the node 'Top' in this file"
msgstr "¿ï¨ú¥»Àɮפ¤ªº `Top' ¸`ÂI"
#: info/session.c:3612
#, fuzzy
+#| msgid "Select the node `(dir)'"
msgid "Select the node '(dir)'"
msgstr "¿ï¨ú¸`ÂI `(dir)'"
@@ -1327,7 +1391,6 @@ msgid "Select the most recently selected node"
msgstr "¿ï¾Ü³Ìªñ¤@¦¸³Q¿ï¾Üªº¸`ÂI"
#: info/session.c:3640
-#, c-format
msgid "No earlier node in history"
msgstr ""
@@ -1341,11 +1404,13 @@ msgstr "§ä´MÀÉ®×: "
#: info/session.c:3665
#, fuzzy, c-format
+#| msgid "Cannot find `%s'."
msgid "Cannot find '%s'"
msgstr "µLªk§ä¨ì `%s'."
#: info/session.c:3713
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not create output file '%s'"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
@@ -1361,6 +1426,7 @@ msgstr ""
#: info/session.c:3785
#, fuzzy, c-format
+#| msgid "Writing node %s..."
msgid "writing node %s..."
msgstr "¼g¤J¸`ÂI %s ¤¤..."
@@ -1370,16 +1436,19 @@ msgstr "±N¥»¸`ÂIªº¤º®e, ¸g¥ÑºÞ¹D (pipe) °e¦Ü INFO_PRINT_COMMAND"
#: info/session.c:3859
#, fuzzy, c-format
+#| msgid "Cannot open pipe to `%s'."
msgid "Cannot open pipe to '%s'"
msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
#: info/session.c:3864
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "printing node %s..."
msgstr "¦C¦L¸`ÂI %s ¤¤..."
#: info/session.c:3872
#, fuzzy, c-format
+#| msgid "Printing node %s..."
msgid "finished printing node %s"
msgstr "¦C¦L¸`ÂI %s ¤¤..."
@@ -1388,12 +1457,10 @@ msgid "Toggle the usage of regular expressions in searches"
msgstr ""
#: info/session.c:3908
-#, c-format
msgid "Using regular expressions for searches"
msgstr ""
#: info/session.c:3909
-#, c-format
msgid "Using literal strings for searches"
msgstr ""
@@ -1403,6 +1470,7 @@ msgstr ""
#: info/session.c:4117
#, fuzzy
+#| msgid "Kill to the beginning of the line"
msgid "Search continued from the beginning of the document"
msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶Kï"
@@ -1411,13 +1479,15 @@ msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶Kï"
msgid "Searching subfile %s ..."
msgstr "·j´M¤lÀÉ®× %s ..."
-#: info/session.c:4175 info/session.c:4438 info/session.c:4551
-#, fuzzy, c-format
+#: info/session.c:4175 info/session.c:4441 info/session.c:4554
+#, fuzzy
+#| msgid "Search failed."
msgid "Search failed"
msgstr "·j´M¥¢±Ñ."
#: info/session.c:4192
#, fuzzy, c-format
+#| msgid "%s%sfor string [%s]: "
msgid "%s%s%s [%s]: "
msgstr "%s%s [%s]: "
@@ -1431,11 +1501,13 @@ msgstr "·j´M¦r¦ê"
#: info/session.c:4194 info/session.c:4200
#, fuzzy
+#| msgid " case-sensitively "
msgid " case-sensitively"
msgstr ", ¥H°Ï¤À¤j¤p¼gªº¤è¦¡"
#: info/session.c:4195 info/session.c:4201
#, fuzzy
+#| msgid "Search backward"
msgid " backward"
msgstr "¦V«á·j´M¦r¦ê"
@@ -1448,143 +1520,147 @@ msgstr ""
msgid "Search string too short"
msgstr ""
-#: info/session.c:4409
+#: info/session.c:4412
#, c-format
msgid "Going back to last match from %s"
msgstr ""
-#: info/session.c:4438 info/session.c:4551
-#, c-format
+#: info/session.c:4441 info/session.c:4554
msgid "No more matches"
msgstr ""
-#: info/session.c:4578
+#: info/session.c:4581
msgid "Search this node and subnodes for a string"
msgstr ""
#. TRANSLATORS: %s is the title of a node.
-#: info/session.c:4585
+#: info/session.c:4588
#, fuzzy, c-format
+#| msgid "Searching subfile %s ..."
msgid "Search under %s: "
msgstr "·j´M¤lÀÉ®× %s ..."
-#: info/session.c:4600
+#: info/session.c:4603
msgid "Go to next match in Info sub-tree"
msgstr ""
-#: info/session.c:4604 info/session.c:4616
-#, c-format
+#: info/session.c:4607 info/session.c:4619
msgid "No active search"
msgstr ""
-#: info/session.c:4612
+#: info/session.c:4615
msgid "Go to previous match in Info sub-tree"
msgstr ""
-#: info/session.c:4625
+#: info/session.c:4628
msgid "Read a string and search for it case-sensitively"
msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á¥H°Ï¤À¤j¤p¼g¤è¦¡·j´M"
-#: info/session.c:4630
+#: info/session.c:4633
msgid "Read a string and search for it"
msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á·j´M"
-#: info/session.c:4636
+#: info/session.c:4639
msgid "Read a string and search backward for it"
msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á¦V«á·j´M"
-#: info/session.c:4644
+#: info/session.c:4647
msgid "Repeat last search in the same direction"
msgstr "¥H¦P¼Ëªº·j´M¤è¦V­«ÂФW¦¸ªº·j´M"
-#: info/session.c:4652 info/session.c:4697
+#: info/session.c:4661 info/session.c:4712
msgid "No previous search string"
msgstr "¨S¦³«e¤@¦¸ªº·j´M¦r¦ê"
-#: info/session.c:4689
+#: info/session.c:4698
msgid "Repeat last search in the reverse direction"
msgstr "¥H¬Û¤Ïªº·j´M¤è¦V­«ÂФW¦¸ªº·j´M"
-#: info/session.c:4736
+#: info/session.c:4751
msgid "Clear displayed search matches"
msgstr ""
-#: info/session.c:4752 info/session.c:4758
+#: info/session.c:4767 info/session.c:4773
msgid "Search interactively for a string as you type it"
msgstr "¥H¤¬°Ê¤è¦¡, Ãä¿é¤J¦r¦êÃä·j´M"
-#: info/session.c:4878
+#: info/session.c:4893
#, fuzzy
+#| msgid "I-search backward: "
msgid "Regexp I-search backward: "
msgstr "¤Ï¦V¤¬°Ê·j´M: "
-#: info/session.c:4879
+#: info/session.c:4894
msgid "I-search backward: "
msgstr "¤Ï¦V¤¬°Ê·j´M: "
-#: info/session.c:4881
+#: info/session.c:4896
#, fuzzy
+#| msgid "I-search: "
msgid "Regexp I-search: "
msgstr "¤¬°Ê·j´M: "
-#: info/session.c:4882
+#: info/session.c:4897
msgid "I-search: "
msgstr "¤¬°Ê·j´M: "
-#: info/session.c:4907 info/session.c:4910
+#: info/session.c:4922 info/session.c:4925
msgid "Failing "
msgstr "¥¢±Ñ "
-#: info/session.c:5275
+#: info/session.c:5290
msgid "Cancel current operation"
msgstr "¨ú®ø¥Ø«eªº§@·~"
-#: info/session.c:5282
+#: info/session.c:5297
msgid "Quit"
msgstr "µ²§ô"
-#: info/session.c:5287
+#: info/session.c:5302
#, fuzzy
+#| msgid "display version information and exit"
msgid "Display version of Info being run"
msgstr "Åã¥Üª©¥»¸ê°T, µM«áÂ÷¶}"
-#: info/session.c:5289
+#: info/session.c:5304
#, c-format
msgid "GNU Info version %s"
msgstr ""
-#: info/session.c:5294
+#: info/session.c:5309
msgid "Redraw the display"
msgstr "­«Ã¸µe­±"
-#: info/session.c:5331
+#: info/session.c:5346
msgid "Quit using Info"
msgstr "µ²§ô¨Ï¥Î Info"
-#: info/session.c:5347
+#: info/session.c:5362
msgid "Run command bound to this key's lowercase variant"
msgstr ""
-#: info/session.c:5358
+#: info/session.c:5373
#, fuzzy, c-format
+#| msgid "Unknown command (%s)."
msgid "Unknown command (%s)"
msgstr "¥¼ª¾ªº©R¥O (%s)."
-#: info/session.c:5361
+#: info/session.c:5376
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" ¤£¦Xªk"
-#: info/session.c:5362
+#: info/session.c:5377
#, fuzzy, c-format
+#| msgid "\"%s\" is invalid"
msgid "'%s' is invalid"
msgstr "\"%s\" ¤£¦Xªk"
-#: info/session.c:5680
+#: info/session.c:5695
msgid "Add this digit to the current numeric argument"
msgstr "±N¥»¼Æ¦r¥[¦Ü¥Ø«eªº¼Æ­È¤Þ¼Æ"
-#: info/session.c:5687
+#: info/session.c:5702
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "¶}©l¥Ø«eªº¼Æ­È¤Þ¼Æ (©Î¬O­¼¥H 4)"
@@ -1634,6 +1710,8 @@ msgstr "·í³]©w¦b \"On\" ®É, Info ¥i±µ¨ü¨ÃÅã¥Ü ISO Latin ¦r¤¸"
#: info/variables.c:111
#, fuzzy
+#| msgid ""
+#| "Controls what happens when scrolling is requested at the end of a node"
msgid ""
"What to do when a scrolling command is issued at the end of the last node"
msgstr "±±¨î¦b¸`ÂIªºµ²§À®É, ±²°Ê·|¦³¤°»ò¤ÏÀ³"
@@ -1666,6 +1744,7 @@ msgstr ""
#: info/variables.c:140
#, fuzzy
+#| msgid "Move to the next cross reference"
msgid "How to follow a cross-reference"
msgstr "²¾°Ê¦Ü¤U¤@­Ó¥æ¤¬°Ñ·Ó"
@@ -1834,6 +1913,23 @@ msgstr ""
#: install-info/install-info.c:639
#, fuzzy, c-format
+#| msgid ""
+#| "This is the file .../info/dir, which contains the\n"
+#| "topmost node of the Info hierarchy, called (dir)Top.\n"
+#| "The first time you invoke Info you start off looking at this node.\n"
+#| "\n"
+#| "%s\tThis is the top of the INFO tree\n"
+#| "\n"
+#| " This (the Directory node) gives a menu of major topics.\n"
+#| " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+#| " \"h\" gives a primer for first-timers,\n"
+#| " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+#| "\n"
+#| " In Emacs, you can click mouse button 2 on a menu item or cross "
+#| "reference\n"
+#| " to select it.\n"
+#| "\n"
+#| "* Menu:\n"
msgid ""
"This is the file .../info/dir, which contains the\n"
"topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -1869,16 +1965,15 @@ msgstr ""
#: install-info/install-info.c:663
#, fuzzy, c-format
+#| msgid "%s: could not read (%s) and could not create (%s)\n"
msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#: install-info/install-info.c:1151 install-info/install-info.c:1191
-#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "¦³ START-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº END-INFO-DIR-ENTRY"
#: install-info/install-info.c:1186
-#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "¦³ END-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº START-INFO-DIR-ENTRY"
@@ -1908,17 +2003,16 @@ msgid "excess command line argument `%s'"
msgstr "¦h¾lªº©R¥O¦C¤Þ¼Æ `%s'"
#: install-info/install-info.c:2278
-#, c-format
msgid "No input file specified; try --help for more information."
msgstr "¥¼«ü©w¿é¤JÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T."
#: install-info/install-info.c:2280
-#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "¥¼«ü©w dir ÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o¨ú¦hªº¸ê°T."
#: install-info/install-info.c:2301
#, fuzzy, c-format
+#| msgid "Could not create output file `%s'."
msgid "Could not read %s."
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
@@ -1932,945 +2026,1002 @@ msgstr "`%s' ¤º¨S¦³ info dir ¶µ¥Ø"
msgid "no entries found for `%s'; nothing deleted"
msgstr "§ä¤£¨ì `%s' ªº¶µ¥Ø; ¥¼§R°£¥ô¦ó¶µ¥Ø"
-#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:833
-#: tp/Texinfo/Convert/Converter.pm:871 tp/Texinfo/Convert/Converter.pm:1159
-#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6596
-#: tp/Texinfo/Convert/HTML.pm:6620 tp/Texinfo/Convert/HTML.pm:7001
-#: tp/Texinfo/Convert/HTML.pm:7060 tp/Texinfo/Convert/HTML.pm:7139
-#: tp/Texinfo/Convert/HTML.pm:7217 tp/Texinfo/Convert/IXIN.pm:286
-#: tp/Texinfo/Convert/Info.pm:296 tp/Texinfo/Convert/TexinfoXML.pm:451
+#: tp/DebugTexinfo/DebugTree.pm:63 tp/Texinfo/Convert/Converter.pm:796
+#: tp/Texinfo/Convert/Converter.pm:834 tp/Texinfo/Convert/Converter.pm:1109
+#: tp/Texinfo/Convert/DocBook.pm:318 tp/Texinfo/Convert/HTML.pm:6607
+#: tp/Texinfo/Convert/HTML.pm:6631 tp/Texinfo/Convert/HTML.pm:7009
+#: tp/Texinfo/Convert/HTML.pm:7068 tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/IXIN.pm:286 tp/Texinfo/Convert/Info.pm:297
+#: tp/Texinfo/Convert/TexinfoXML.pm:451
#, perl-format
msgid "could not open %s for writing: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:892
+#: tp/Texinfo/Common.pm:887
msgid ""
"move your @contents command if you want the contents after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:895
+#: tp/Texinfo/Common.pm:890
msgid ""
"move your @shortcontents and @contents commands if you want the contents "
"after the title page"
msgstr ""
-#: tp/Texinfo/Common.pm:1152
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1149 tp/Texinfo/XS/parsetexi/end_line.c:1607
+#: tp/Texinfo/XS/parsetexi/end_line.c:1617
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid language code"
msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
-#: tp/Texinfo/Common.pm:1157
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:1154 tp/Texinfo/XS/parsetexi/end_line.c:1634
+#, fuzzy, c-format, perl-format
+#| msgid "%s is not a valid ISO 639 language code"
msgid "%s is not a valid region code"
msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
-#: tp/Texinfo/Common.pm:1174
+#: tp/Texinfo/Common.pm:1171
#, perl-format
msgid "%s is not a valid split possibility"
msgstr ""
-#: tp/Texinfo/Common.pm:1196
+#: tp/Texinfo/Common.pm:1193
#, perl-format
msgid "could not read %s: %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1216
+#: tp/Texinfo/Common.pm:1213
#, fuzzy, perl-format
msgid "error on closing @verbatiminclude file %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Common.pm:1222 tp/Texinfo/ParserNonXS.pm:2980
+#: tp/Texinfo/Common.pm:1219 tp/Texinfo/ParserNonXS.pm:2971
#, perl-format
msgid "@%s: could not find %s"
msgstr ""
-#: tp/Texinfo/Common.pm:1714
-msgid "no node to be renamed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1725
-msgid "nodes without a new name at the end of file"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1735 tp/Texinfo/ParserNonXS.pm:777
-#, perl-format
-msgid "could not open %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1755
-#, perl-format
-msgid "using a renamed nodes file (`%s') is deprecated"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2254
+#: tp/Texinfo/Common.pm:2198
#, perl-format
msgid "could not protect hash character in @%s"
msgstr ""
-#: tp/Texinfo/Common.pm:2636
+#: tp/Texinfo/Common.pm:2580
#, perl-format
msgid "empty node name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/Common.pm:2644
+#: tp/Texinfo/Common.pm:2588
#, fuzzy, perl-format
+#| msgid "macro `%s' previously defined"
msgid "@%s `%s' previously defined"
msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
-#: tp/Texinfo/Common.pm:2650
+#: tp/Texinfo/Common.pm:2594
#, fuzzy, perl-format
+#| msgid "here is the previous definition of `%s'"
msgid "here is the previous definition as @%s"
msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
-#: tp/Texinfo/Common.pm:2669 tp/Texinfo/ParserNonXS.pm:3273
-#, fuzzy, perl-format
+#: tp/Texinfo/Common.pm:2613 tp/Texinfo/ParserNonXS.pm:3258
+#: tp/Texinfo/XS/parsetexi/end_line.c:47
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to %c%s"
msgid "empty argument in @%s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: tp/Texinfo/Convert/Converter.pm:772
+#: tp/Texinfo/Convert/Converter.pm:742
#, perl-format
msgid "%s: output incompatible with split"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:854 tp/Texinfo/Convert/Converter.pm:887
-#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7027
-#: tp/Texinfo/Convert/HTML.pm:7086 tp/Texinfo/Convert/IXIN.pm:909
-#: tp/Texinfo/Convert/Info.pm:159 tp/Texinfo/Convert/Info.pm:185
-#: tp/Texinfo/Convert/Info.pm:213 tp/Texinfo/Convert/Info.pm:276
-#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1827
+#: tp/Texinfo/Convert/Converter.pm:817 tp/Texinfo/Convert/Converter.pm:850
+#: tp/Texinfo/Convert/DocBook.pm:354 tp/Texinfo/Convert/HTML.pm:7035
+#: tp/Texinfo/Convert/HTML.pm:7094 tp/Texinfo/Convert/IXIN.pm:909
+#: tp/Texinfo/Convert/Info.pm:160 tp/Texinfo/Convert/Info.pm:186
+#: tp/Texinfo/Convert/Info.pm:214 tp/Texinfo/Convert/Info.pm:277
+#: tp/Texinfo/Convert/TexinfoXML.pm:470 tp/Texinfo/ParserNonXS.pm:1813
#, fuzzy, perl-format
msgid "error on closing %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/Converter.pm:965
+#: tp/Texinfo/Convert/Converter.pm:928
#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
msgid "could not create directories `%s' or `%s': %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/Converter.pm:973
+#: tp/Texinfo/Convert/Converter.pm:936
#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
msgid "could not create directory `%s': %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/DocBook.pm:993
+#: tp/Texinfo/Convert/DocBook.pm:1022
#, fuzzy, perl-format
+#| msgid "@image file `%s' unreadable: %s"
msgid "@image file `%s' not found, using `%s'"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: tp/Texinfo/Convert/DocBook.pm:1113 tp/Texinfo/ParserNonXS.pm:4982
+#: tp/Texinfo/Convert/DocBook.pm:1142 tp/Texinfo/ParserNonXS.pm:5016
+#: tp/Texinfo/XS/parsetexi/separator.c:427
#, fuzzy
+#| msgid "No node name specified for `%c%s' command"
msgid "no argument specified for @U"
msgstr "`%c%s' ©R¥O¤¤¥¼«ü©w¸`ÂI¦WºÙ"
-#: tp/Texinfo/Convert/HTML.pm:1719
+#: tp/Texinfo/Convert/HTML.pm:1752
#, fuzzy, perl-format
msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: tp/Texinfo/Convert/HTML.pm:2404
+#: tp/Texinfo/Convert/HTML.pm:2421
#, perl-format
msgid "raw format %s is not converted"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4647
+#: tp/Texinfo/Convert/HTML.pm:4665
#, perl-format
msgid "could not open html refs config file %s: %s"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4675
+#: tp/Texinfo/Convert/HTML.pm:4693
#, fuzzy
msgid "missing type"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
-#: tp/Texinfo/Convert/HTML.pm:4678
+#: tp/Texinfo/Convert/HTML.pm:4696
#, fuzzy, perl-format
+#| msgid "%s: unrecognized option `--%s'\n"
msgid "unrecognized type: %s"
msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
-#: tp/Texinfo/Convert/HTML.pm:4695
+#: tp/Texinfo/Convert/HTML.pm:4713
#, fuzzy, perl-format
msgid "error on closing html refs config file %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/HTML.pm:5022
+#: tp/Texinfo/Convert/HTML.pm:5034
msgid "string not closed in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5024
+#: tp/Texinfo/Convert/HTML.pm:5036
msgid "--css-include ended in comment"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5026
+#: tp/Texinfo/Convert/HTML.pm:5038
msgid "@import not finished in css file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5052
+#: tp/Texinfo/Convert/HTML.pm:5064
#, perl-format
msgid "CSS file %s not found"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:5058
+#: tp/Texinfo/Convert/HTML.pm:5070
#, fuzzy, perl-format
msgid "could not open --include-file %s: %s"
msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
-#: tp/Texinfo/Convert/HTML.pm:5068
+#: tp/Texinfo/Convert/HTML.pm:5080
#, fuzzy, perl-format
msgid "error on closing CSS file %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/HTML.pm:5882 tp/Texinfo/Convert/HTML.pm:5886
+#: tp/Texinfo/Convert/HTML.pm:5867 tp/Texinfo/Convert/HTML.pm:5871
#, fuzzy, perl-format
+#| msgid "no index entries found for `%s'\n"
msgid "no htmlxref.cnf entry found for `%s'"
msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
-#: tp/Texinfo/Convert/HTML.pm:6591
+#: tp/Texinfo/Convert/HTML.pm:6602
#, fuzzy, perl-format
msgid "error on closing frame file %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/HTML.pm:6615
+#: tp/Texinfo/Convert/HTML.pm:6626
#, fuzzy, perl-format
msgid "error on closing TOC frame file %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/HTML.pm:6730
+#: tp/Texinfo/Convert/HTML.pm:6742
#, perl-format
msgid "handler %s of stage %s priority %s failed"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6935
+#: tp/Texinfo/Convert/HTML.pm:6943
msgid "must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:7146
+#: tp/Texinfo/Convert/HTML.pm:7153
#, fuzzy, perl-format
msgid "error on closing redirection node file %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/HTML.pm:7172
-#, fuzzy, perl-format
-msgid "old name for `%s' is a node of the document"
-msgstr "¦b¥»¤å¥ó¤¤, ¥»¸`ÂI¨S¦³ `¤W¤@­Ó (Prev)' ¸`ÂI©Î `¤W¤@¼h (Up)' ¸`ÂI."
-
-#: tp/Texinfo/Convert/HTML.pm:7178
-#, fuzzy, perl-format
-msgid "file empty for renamed node `%s'"
-msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
-
-#: tp/Texinfo/Convert/HTML.pm:7192
-#, perl-format
-msgid "target node (new name for `%s') not in document: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7224
-#, perl-format
-msgid "error on closing renamed node redirection file %s: %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7262
-msgid "empty node name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:7264 tp/Texinfo/ParserNonXS.pm:3286
-#, perl-format
-msgid "syntax for an external node used for `%s'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Info.pm:104
+#: tp/Texinfo/Convert/Info.pm:105
#, fuzzy
+#| msgid "No menu in this node."
msgid "document without nodes"
msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
-#: tp/Texinfo/Convert/Info.pm:121
+#: tp/Texinfo/Convert/Info.pm:122
msgid "document without Top node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:169
+#: tp/Texinfo/Convert/Info.pm:170
#, perl-format
msgid "rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:250
+#: tp/Texinfo/Convert/Info.pm:251
#, perl-format
msgid "@%s output more than once: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:380
+#: tp/Texinfo/Convert/Info.pm:381
#, fuzzy, perl-format
+#| msgid "(outside of any node)"
msgid "@%s outside of any node"
msgstr "(¤£¦b¥ô¦óªº¸`ÂI¤º)"
-#: tp/Texinfo/Convert/Info.pm:423
+#: tp/Texinfo/Convert/Info.pm:424
#, perl-format
msgid "@node name should not contain `,': %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1243
+#: tp/Texinfo/Convert/Plaintext.pm:1259
#, perl-format
msgid "Index entry in @%s with : produces invalid Info: %s"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1290 tp/Texinfo/ParserNonXS.pm:2412
-#, fuzzy, perl-format
+#: tp/Texinfo/Convert/Plaintext.pm:1306 tp/Texinfo/ParserNonXS.pm:2398
+#: tp/Texinfo/XS/parsetexi/indices.c:324
+#, fuzzy, c-format, perl-format
+#| msgid "Entry for index `%s' outside of any node"
msgid "entry for index `%s' outside of any node"
msgstr "¯Á¤Þ `%s' ªº¶µ¥Ø¤£¦b¥ô¦óªº¸`ÂI¤º"
-#: tp/Texinfo/Convert/Plaintext.pm:1402
+#: tp/Texinfo/Convert/Plaintext.pm:1419
#, fuzzy, perl-format
msgid "error on closing image text file %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/Plaintext.pm:1407
+#: tp/Texinfo/Convert/Plaintext.pm:1424
#, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: tp/Texinfo/Convert/Plaintext.pm:1428
+#: tp/Texinfo/Convert/Plaintext.pm:1445
#, perl-format
msgid "could not find @image file `%s.txt' nor alternate text"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1788
+#: tp/Texinfo/Convert/Plaintext.pm:1805
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2036
+#: tp/Texinfo/Convert/Plaintext.pm:2053
#, perl-format
msgid "@%s cross-reference name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2074
+#: tp/Texinfo/Convert/Plaintext.pm:2091
#, perl-format
msgid "@%s node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2107
+#: tp/Texinfo/Convert/Plaintext.pm:2124
#, perl-format
msgid "@%s node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2154
+#: tp/Texinfo/Convert/Plaintext.pm:2171
#, fuzzy, perl-format
+#| msgid "`.' or `,' must follow cross reference, not %c"
msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
-#: tp/Texinfo/Convert/Plaintext.pm:2157
+#: tp/Texinfo/Convert/Plaintext.pm:2174
#, fuzzy
+#| msgid "`.' or `,' must follow cross reference, not %c"
msgid "`.' or `,' must follow @xref"
msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
-#: tp/Texinfo/Convert/Plaintext.pm:2952
+#: tp/Texinfo/Convert/Plaintext.pm:2978
#, perl-format
msgid "menu entry node name should not contain `%s'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2963
+#: tp/Texinfo/Convert/Plaintext.pm:2989
msgid "menu entry node name should not contain `:'"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2983
+#: tp/Texinfo/Convert/Plaintext.pm:3009
msgid "menu entry name should not contain `:'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:997 tp/Texinfo/Structuring.pm:436
+#: tp/Texinfo/ParserNonXS.pm:762
#, perl-format
+msgid "could not open %s: %s"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:983 tp/Texinfo/Structuring.pm:422
+#: tp/Texinfo/XS/parsetexi/parser.c:242
+#, c-format, perl-format
msgid "multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1035
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1021 tp/Texinfo/XS/parsetexi/macro.c:181
+#, c-format, perl-format
msgid "bad or empty @%s formal argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1045
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1031 tp/Texinfo/XS/parsetexi/macro.c:204
+#, c-format, perl-format
msgid "bad syntax for @%s argument: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1052 tp/Texinfo/ParserNonXS.pm:4456
-#: tp/Texinfo/ParserNonXS.pm:4482 tp/Texinfo/ParserNonXS.pm:5289
-#: tp/Texinfo/ParserNonXS.pm:5302 tp/Texinfo/ParserNonXS.pm:5316
+#: tp/Texinfo/ParserNonXS.pm:1038 tp/Texinfo/ParserNonXS.pm:4493
+#: tp/Texinfo/ParserNonXS.pm:4519 tp/Texinfo/ParserNonXS.pm:5325
+#: tp/Texinfo/ParserNonXS.pm:5338 tp/Texinfo/ParserNonXS.pm:5352
#, perl-format
msgid "%c%s requires a name"
msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
-#: tp/Texinfo/ParserNonXS.pm:1056 tp/Texinfo/ParserNonXS.pm:4459
-#: tp/Texinfo/ParserNonXS.pm:4485 tp/Texinfo/ParserNonXS.pm:5292
-#: tp/Texinfo/ParserNonXS.pm:5305 tp/Texinfo/ParserNonXS.pm:5319
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1042 tp/Texinfo/ParserNonXS.pm:4496
+#: tp/Texinfo/ParserNonXS.pm:4522 tp/Texinfo/ParserNonXS.pm:5328
+#: tp/Texinfo/ParserNonXS.pm:5341 tp/Texinfo/ParserNonXS.pm:5355
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:848
+#: tp/Texinfo/XS/parsetexi/macro.c:101
+#, c-format, perl-format
msgid "bad name for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1170
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1156 tp/Texinfo/XS/parsetexi/close.c:42
+#, c-format, perl-format
msgid "@end %s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1174
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1160 tp/Texinfo/XS/parsetexi/close.c:47
+#, c-format, perl-format
msgid "@%s seen before @%s closing brace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1179
+#: tp/Texinfo/ParserNonXS.pm:1165
#, fuzzy, perl-format
+#| msgid "%c%s missing close brace"
msgid "%c%s missing closing brace"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
-#: tp/Texinfo/ParserNonXS.pm:1183
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1169 tp/Texinfo/XS/parsetexi/close.c:58
+#, c-format, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1292
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1278 tp/Texinfo/XS/parsetexi/multitable.c:73
+#, c-format, perl-format
msgid "@itemx should not begin @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1358
+#: tp/Texinfo/ParserNonXS.pm:1344 tp/Texinfo/XS/parsetexi/multitable.c:129
msgid "@itemx must follow @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1523
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1509 tp/Texinfo/XS/parsetexi/close.c:232
+#, c-format, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1551
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1537 tp/Texinfo/XS/parsetexi/close.c:262
+#, c-format, perl-format
msgid "`@end' expected `%s', but saw `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1554
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1540 tp/Texinfo/XS/parsetexi/close.c:268
+#, c-format, perl-format
msgid "@%s seen before @end %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:1558
+#: tp/Texinfo/ParserNonXS.pm:1544
#, fuzzy, perl-format
+#| msgid "No matching `%cend %s'"
msgid "no matching `%cend %s'"
msgstr "No matching `%cend %s'"
-#: tp/Texinfo/ParserNonXS.pm:1582 tp/Texinfo/ParserNonXS.pm:4822
-#: tp/Texinfo/ParserNonXS.pm:5071
+#: tp/Texinfo/ParserNonXS.pm:1568 tp/Texinfo/ParserNonXS.pm:4856
+#: tp/Texinfo/ParserNonXS.pm:5107
#, fuzzy, perl-format
+#| msgid "Misplaced %c"
msgid "misplaced %c"
msgstr "»~¸mªº %c"
-#: tp/Texinfo/ParserNonXS.pm:1683 tp/Texinfo/ParserNonXS.pm:2932
+#: tp/Texinfo/ParserNonXS.pm:1669 tp/Texinfo/ParserNonXS.pm:2925
#, fuzzy, perl-format
+#| msgid "Unmatched `%c%s'"
msgid "unmatched `%c%s'"
msgstr "¥¼°t¹ïªº `%c%s'"
-#: tp/Texinfo/ParserNonXS.pm:1900
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1886 tp/Texinfo/XS/parsetexi/macro.c:351
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' called with too many args"
msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
-#: tp/Texinfo/ParserNonXS.pm:1922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1908 tp/Texinfo/XS/parsetexi/close.c:52
+#: tp/Texinfo/XS/parsetexi/macro.c:277
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s missing close brace"
msgid "@%s missing closing brace"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
-#: tp/Texinfo/ParserNonXS.pm:1930
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1916 tp/Texinfo/XS/parsetexi/macro.c:367
+#, fuzzy, c-format, perl-format
+#| msgid "Macro `%s' called on line %d with too many args"
msgid "macro `%s' declared without argument called with an argument"
msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
-#: tp/Texinfo/ParserNonXS.pm:1963
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:1949 tp/Texinfo/XS/parsetexi/macro.c:430
+#, c-format, perl-format
msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2650
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2643 tp/Texinfo/XS/parsetexi/end_line.c:2182
+#, fuzzy, c-format, perl-format
msgid "missing name for @%s"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
-#: tp/Texinfo/ParserNonXS.pm:2655
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2648 tp/Texinfo/XS/parsetexi/end_line.c:2128
+#, c-format, perl-format
msgid "missing category for @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2694
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2687 tp/Texinfo/XS/parsetexi/end_line.c:1054
+#, c-format, perl-format
msgid "unexpected argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2705
+#: tp/Texinfo/ParserNonXS.pm:2698 tp/Texinfo/XS/parsetexi/end_line.c:1066
#, fuzzy
+#| msgid "%s: empty file"
msgid "empty multitable"
msgstr "%s: ªÅÀÉ®×"
-#: tp/Texinfo/ParserNonXS.pm:2750 tp/Texinfo/ParserNonXS.pm:5386
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2743 tp/Texinfo/ParserNonXS.pm:5422
+#: tp/Texinfo/XS/parsetexi/end_line.c:311
+#: tp/Texinfo/XS/parsetexi/end_line.c:1134
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to %c%s"
msgid "superfluous argument to @%s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: tp/Texinfo/ParserNonXS.pm:2756 tp/Texinfo/ParserNonXS.pm:5407
-#: tp/Texinfo/ParserNonXS.pm:5424
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2749 tp/Texinfo/ParserNonXS.pm:5443
+#: tp/Texinfo/ParserNonXS.pm:5460 tp/Texinfo/XS/parsetexi/end_line.c:1147
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to %c%s"
msgid "bad argument to @%s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: tp/Texinfo/ParserNonXS.pm:2767
+#: tp/Texinfo/ParserNonXS.pm:2760
#, perl-format
msgid "%s requires an argument: the formatter for %citem"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2771
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2764 tp/Texinfo/XS/parsetexi/end_line.c:1167
+#, c-format, perl-format
msgid "command @%s not accepting argument in brace should not be on @%s line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2805
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2798 tp/Texinfo/XS/parsetexi/end_line.c:1225
+#, fuzzy, c-format, perl-format
+#| msgid "%s: option `--%s' doesn't allow an argument\n"
msgid "accent command `@%s' not allowed as @%s argument"
msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n"
-#: tp/Texinfo/ParserNonXS.pm:2908 tp/Texinfo/ParserNonXS.pm:3056
-#: tp/Texinfo/ParserNonXS.pm:5379
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2901 tp/Texinfo/ParserNonXS.pm:3041
+#: tp/Texinfo/ParserNonXS.pm:5415 tp/Texinfo/XS/parsetexi/end_line.c:304
+#: tp/Texinfo/XS/parsetexi/end_line.c:1333
+#: tp/Texinfo/XS/parsetexi/end_line.c:1724
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing argument"
msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
-#: tp/Texinfo/ParserNonXS.pm:2922
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2915 tp/Texinfo/XS/parsetexi/end_line.c:1352
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown @end %s"
msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
-#: tp/Texinfo/ParserNonXS.pm:2945 tp/Texinfo/ParserNonXS.pm:3559
+#: tp/Texinfo/ParserNonXS.pm:2938 tp/Texinfo/ParserNonXS.pm:3555
#, perl-format
msgid "superfluous argument to @%s %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2951 tp/Texinfo/ParserNonXS.pm:3035
-#: tp/Texinfo/ParserNonXS.pm:5474 tp/Texinfo/ParserNonXS.pm:5519
-#: tp/Texinfo/ParserNonXS.pm:5548 tp/Texinfo/ParserNonXS.pm:5589
-#: tp/Texinfo/ParserNonXS.pm:5667
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2944 tp/Texinfo/ParserNonXS.pm:3020
+#: tp/Texinfo/ParserNonXS.pm:5510 tp/Texinfo/ParserNonXS.pm:5555
+#: tp/Texinfo/ParserNonXS.pm:5584 tp/Texinfo/ParserNonXS.pm:5625
+#: tp/Texinfo/ParserNonXS.pm:5703 tp/Texinfo/XS/parsetexi/end_line.c:515
+#: tp/Texinfo/XS/parsetexi/end_line.c:583
+#: tp/Texinfo/XS/parsetexi/end_line.c:1662
+#, fuzzy, c-format, perl-format
+#| msgid "Bad argument to %c%s"
msgid "bad argument to @%s: %s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: tp/Texinfo/ParserNonXS.pm:2975
+#: tp/Texinfo/ParserNonXS.pm:2966
#, perl-format
msgid "@%s: could not open %s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2991
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2982 tp/Texinfo/XS/parsetexi/end_line.c:1485
+#, c-format, perl-format
msgid "encoding `%s' is not a canonical texinfo encoding"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:2999
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:2990 tp/Texinfo/XS/parsetexi/end_line.c:1539
+#, fuzzy, c-format, perl-format
msgid "unrecognized encoding name `%s'"
msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
-#: tp/Texinfo/ParserNonXS.pm:3121
+#: tp/Texinfo/ParserNonXS.pm:3106
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3128
+#: tp/Texinfo/ParserNonXS.pm:3113
#, perl-format
msgid "@%s only meaningful on a @multitable line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3175
+#: tp/Texinfo/ParserNonXS.pm:3149 tp/Texinfo/XS/parsetexi/end_line.c:1879
+msgid "@part should not be associated with @top"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3160
#, perl-format
msgid "@node precedes @%s, but parts may not be associated with nodes"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3309
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3271 tp/Texinfo/XS/parsetexi/end_line.c:36
+#, c-format, perl-format
+msgid "syntax for an external node used for `%s'"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:3294 tp/Texinfo/XS/parsetexi/menus.c:43
+#, fuzzy, c-format, perl-format
+#| msgid "No menu in node `%s'."
msgid "empty menu entry name in `%s'"
msgstr "¸`ÂI `%s' ¤¤¨S¦³¿ï³æ."
-#: tp/Texinfo/ParserNonXS.pm:3317
+#: tp/Texinfo/ParserNonXS.pm:3302 tp/Texinfo/XS/parsetexi/menus.c:57
msgid "empty node name in menu entry"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3446
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3442 tp/Texinfo/XS/parsetexi/parser.c:979
+#, c-format, perl-format
msgid "@%s should not appear in @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3553
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3549 tp/Texinfo/XS/parsetexi/parser.c:1076
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@end %s should only appear at the beginning of a line"
msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶Kï"
-#: tp/Texinfo/ParserNonXS.pm:3574
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3570 tp/Texinfo/XS/parsetexi/parser.c:1137
+#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
-#: tp/Texinfo/ParserNonXS.pm:3577
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3573 tp/Texinfo/XS/parsetexi/parser.c:1139
+#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
-#: tp/Texinfo/ParserNonXS.pm:3582
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3578 tp/Texinfo/XS/parsetexi/parser.c:1144
+#, c-format, perl-format
msgid "redefining Texinfo language command: @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3650
+#: tp/Texinfo/ParserNonXS.pm:3646
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3720
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3716 tp/Texinfo/XS/parsetexi/macro.c:529
+#, c-format, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3745
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3741 tp/Texinfo/XS/parsetexi/macro.c:568
+#, c-format, perl-format
msgid ""
"macro call nested too deeply (set MAX_NESTED_MACROS to override; current "
"value %d)"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3754
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3750 tp/Texinfo/XS/parsetexi/macro.c:578
+#, c-format, perl-format
msgid "recursive call of macro %s is not allowed; use @rmacro if needed"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3809
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3805 tp/Texinfo/XS/parsetexi/parser.c:1412
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by whitespace"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3815
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3811 tp/Texinfo/XS/parsetexi/parser.c:1419
+#, fuzzy, c-format, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "use braces to give a command as an argument to @%s"
msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
-#: tp/Texinfo/ParserNonXS.pm:3828 tp/Texinfo/ParserNonXS.pm:4947
+#: tp/Texinfo/ParserNonXS.pm:3824 tp/Texinfo/ParserNonXS.pm:4981
#, fuzzy, perl-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' §@¬°¤Þ¼Æ, ¦Ó¤£¬O `%c'"
-#: tp/Texinfo/ParserNonXS.pm:3839
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3835 tp/Texinfo/XS/parsetexi/parser.c:1449
+#, c-format, perl-format
msgid "accent command `@%s' must not be followed by new line"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:3850
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3846 tp/Texinfo/XS/parsetexi/parser.c:1467
+#, fuzzy, c-format, perl-format
+#| msgid "%c%s expected `{...}'"
msgid "@%s expected braces"
msgstr "%c%s ¹w­p­n¦³ `{...}'"
-#: tp/Texinfo/ParserNonXS.pm:3979
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:3975 tp/Texinfo/XS/parsetexi/parser.c:1328
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown command `%s'"
msgid "unknown command `%s'"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4021
+#: tp/Texinfo/ParserNonXS.pm:4017
#, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4025
+#: tp/Texinfo/ParserNonXS.pm:4021 tp/Texinfo/XS/parsetexi/parser.c:1554
msgid "bad syntax for @value"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4032
+#: tp/Texinfo/ParserNonXS.pm:4028
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete."
msgstr "%c%s ¤w¼o¤î¤£¥Î"
-#: tp/Texinfo/ParserNonXS.pm:4035
+#: tp/Texinfo/ParserNonXS.pm:4031
#, fuzzy, perl-format
+#| msgid "%c%s is obsolete"
msgid "%c%s is obsolete; %s"
msgstr "%c%s ¤w¼o¤î¤£¥Î"
-#: tp/Texinfo/ParserNonXS.pm:4050
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4046 tp/Texinfo/XS/parsetexi/parser.c:1605
+#, fuzzy, c-format, perl-format
+#| msgid "Kill to the beginning of the line"
msgid "@%s should only appear at the beginning of a line"
msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶Kï"
-#: tp/Texinfo/ParserNonXS.pm:4079
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4087 tp/Texinfo/XS/parsetexi/handle_commands.c:97
+#, c-format, perl-format
msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4104 tp/Texinfo/ParserNonXS.pm:4111
-#: tp/Texinfo/ParserNonXS.pm:4160
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4112 tp/Texinfo/ParserNonXS.pm:4119
+#: tp/Texinfo/ParserNonXS.pm:4168 tp/Texinfo/XS/parsetexi/handle_commands.c:134
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:143
+#, c-format, perl-format
msgid "@%s not meaningful inside `@%s' block"
msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
-#: tp/Texinfo/ParserNonXS.pm:4120
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4128 tp/Texinfo/XS/parsetexi/handle_commands.c:180
+#, fuzzy, c-format, perl-format
+#| msgid "%s: empty file"
msgid "@%s in empty multitable"
msgstr "%s: ªÅÀÉ®×"
-#: tp/Texinfo/ParserNonXS.pm:4126
+#: tp/Texinfo/ParserNonXS.pm:4134 tp/Texinfo/XS/parsetexi/handle_commands.c:188
msgid "@tab before @item"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4129
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4137 tp/Texinfo/XS/parsetexi/handle_commands.c:192
+#, fuzzy, c-format, perl-format
+#| msgid "Too many columns in multitable item (max %d)"
msgid "too many columns in multitable item (max %d)"
msgstr "multitable ¶µ¥Ø¤¤¦³¤Ó¦hªºÄæ¦ì (³Ì¤j­È¬° %d)"
-#: tp/Texinfo/ParserNonXS.pm:4166
+#: tp/Texinfo/ParserNonXS.pm:4174 tp/Texinfo/XS/parsetexi/handle_commands.c:237
msgid "ignoring @tab outside of multitable"
msgstr "©¿²¤ multitable ¥~ªº @tab"
-#: tp/Texinfo/ParserNonXS.pm:4170 tp/Texinfo/ParserNonXS.pm:4337
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4178 tp/Texinfo/ParserNonXS.pm:4345
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:242
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:541
+#, c-format, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4236
+#: tp/Texinfo/ParserNonXS.pm:4244
#, fuzzy, perl-format
+#| msgid "@%s not meaningful inside `@%s' block"
msgid "@%s not allowed inside `@%s' block"
msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
-#: tp/Texinfo/ParserNonXS.pm:4378
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4357 tp/Texinfo/ParserNonXS.pm:4699
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1085
+#, c-format, perl-format
+msgid "@%s should only appear in an index entry"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4368 tp/Texinfo/XS/parsetexi/handle_commands.c:580
+msgid "no more than two levels of index subentry are allowed"
+msgstr ""
+
+#: tp/Texinfo/ParserNonXS.pm:4409 tp/Texinfo/XS/parsetexi/handle_commands.c:637
+#, c-format, perl-format
msgid "must be after `@%s' to use `@%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4416
+#: tp/Texinfo/ParserNonXS.pm:4447
#, perl-format
msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4420
+#: tp/Texinfo/ParserNonXS.pm:4451 tp/Texinfo/XS/parsetexi/handle_commands.c:694
msgid "@dircategory after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4596
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4633 tp/Texinfo/XS/parsetexi/handle_commands.c:984
+#, fuzzy, c-format, perl-format
msgid "region %s inside region %s is not allowed"
msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
-#: tp/Texinfo/ParserNonXS.pm:4613
+#: tp/Texinfo/ParserNonXS.pm:4650
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1006
msgid "@direntry after first node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4621
+#: tp/Texinfo/ParserNonXS.pm:4658
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1011
msgid "@menu in invalid context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4627
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4664
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1020
+#, fuzzy, c-format, perl-format
+#| msgid "@menu seen before first @node, creating `Top' node"
msgid "@%s seen before first @node"
msgstr "@menu ¦b²Ä¤@­Ó @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
-#: tp/Texinfo/ParserNonXS.pm:4630
+#: tp/Texinfo/ParserNonXS.pm:4667
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:1022
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "¤]³\±zÀ³¸Ó§â @top ¸`ÂI¥]§t¦b @ifnottex, ¦Ó¤£¬O @ifinfo?"
-#: tp/Texinfo/ParserNonXS.pm:4665
-#, perl-format
-msgid "@%s should only appear in an index entry"
-msgstr ""
-
-#: tp/Texinfo/ParserNonXS.pm:4694
+#: tp/Texinfo/ParserNonXS.pm:4728
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4709
+#: tp/Texinfo/ParserNonXS.pm:4743 tp/Texinfo/XS/parsetexi/parser.c:1721
#, fuzzy
+#| msgid "Expected `%s'"
msgid "unexpected @"
msgstr "Expected `%s'"
-#: tp/Texinfo/ParserNonXS.pm:4738
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4772 tp/Texinfo/XS/parsetexi/separator.c:78
+#, fuzzy, c-format, perl-format
+#| msgid "@%s not meaningful inside `@%s' block"
msgid "@%s is not meaningful outside `@float' environment"
msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
-#: tp/Texinfo/ParserNonXS.pm:4743
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4777 tp/Texinfo/XS/parsetexi/separator.c:84
+#, c-format, perl-format
msgid "@%s should be right below `@float'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4751
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4785 tp/Texinfo/XS/parsetexi/separator.c:92
+#, c-format, perl-format
msgid "ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4862
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4896 tp/Texinfo/XS/parsetexi/separator.c:276
+#, c-format, perl-format
msgid "command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4892
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4926 tp/Texinfo/XS/parsetexi/separator.c:312
+#, c-format, perl-format
msgid "command @%s missing a node or external manual argument"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4911
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4945 tp/Texinfo/XS/parsetexi/separator.c:350
+#, c-format, perl-format
msgid "in @%s empty cross reference name after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4922
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:4956 tp/Texinfo/XS/parsetexi/separator.c:368
+#, c-format, perl-format
msgid "in @%s empty cross reference title after expansion `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4935
+#: tp/Texinfo/ParserNonXS.pm:4969 tp/Texinfo/XS/parsetexi/separator.c:383
msgid "@image missing filename argument"
msgstr "@image ¨S¦³ÀɦW¤Þ¼Æ"
-#: tp/Texinfo/ParserNonXS.pm:4969
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5003 tp/Texinfo/XS/parsetexi/separator.c:413
+#, fuzzy, c-format, perl-format
+#| msgid "%s: missing file argument.\n"
msgid "@%s missing first argument"
msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
-#: tp/Texinfo/ParserNonXS.pm:4987
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5021 tp/Texinfo/XS/parsetexi/separator.c:435
+#, c-format, perl-format
msgid "non-hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:4992
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5026 tp/Texinfo/XS/parsetexi/separator.c:440
+#, c-format, perl-format
msgid "fewer than four hex digits in argument for @U: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5009
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5043 tp/Texinfo/XS/parsetexi/separator.c:455
+#, c-format, perl-format
msgid "argument for @U exceeds Unicode maximum 0x10FFFF: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5195
+#: tp/Texinfo/ParserNonXS.pm:5231 tp/Texinfo/XS/parsetexi/separator.c:755
msgid "superfluous arguments for node"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5244
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5280 tp/Texinfo/XS/parsetexi/parser.c:1915
+#, fuzzy, c-format, perl-format
+#| msgid "Expected `%s'"
msgid "expected @end %s"
msgstr "Expected `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5331
+#: tp/Texinfo/ParserNonXS.pm:5367
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "@%s should only accept an @-command as argument, not `%s'"
msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
-#: tp/Texinfo/ParserNonXS.pm:5341
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5377 tp/Texinfo/XS/parsetexi/end_line.c:275
+#, c-format, perl-format
msgid "remaining argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5402
+#: tp/Texinfo/ParserNonXS.pm:5438
#, fuzzy, perl-format
+#| msgid "Use braces to give a command as an argument to @%s"
msgid "environment command %s as argument to @%s"
msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
-#: tp/Texinfo/ParserNonXS.pm:5429
+#: tp/Texinfo/ParserNonXS.pm:5465
#, perl-format
msgid "empty @%s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5437
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5473 tp/Texinfo/XS/parsetexi/end_line.c:456
+#, c-format, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5446
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5482 tp/Texinfo/XS/parsetexi/end_line.c:478
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5455
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5491 tp/Texinfo/XS/parsetexi/end_line.c:520
+#, c-format, perl-format
msgid "reserved index name %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5481
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5517 tp/Texinfo/XS/parsetexi/end_line.c:551
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s'"
msgid "unknown source index in @%s: %s"
msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5484
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5520 tp/Texinfo/XS/parsetexi/end_line.c:554
+#, c-format, perl-format
msgid "unknown destination index in @%s: %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5514
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5550 tp/Texinfo/XS/parsetexi/end_line.c:574
+#, c-format, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5527
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5563 tp/Texinfo/XS/parsetexi/end_line.c:599
+#, fuzzy, c-format, perl-format
+#| msgid "Unknown index `%s' in @printindex"
msgid "unknown index `%s' in @printindex"
msgstr "@printindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s'"
-#: tp/Texinfo/ParserNonXS.pm:5533
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5569 tp/Texinfo/XS/parsetexi/end_line.c:608
+#, c-format, perl-format
msgid "printing an index `%s' merged in another one, `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5541
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5577 tp/Texinfo/XS/parsetexi/end_line.c:613
+#, c-format, perl-format
msgid "printindex before document beginning: @printindex %s"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5557
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5593 tp/Texinfo/XS/parsetexi/end_line.c:634
+#, fuzzy, c-format, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5565
+#: tp/Texinfo/ParserNonXS.pm:5601
#, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5573
+#: tp/Texinfo/ParserNonXS.pm:5609
#, fuzzy, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5581
+#: tp/Texinfo/ParserNonXS.pm:5617
#, fuzzy, perl-format
+#| msgid "%s: %s arg must be numeric, not `%s'.\n"
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5599 tp/Texinfo/ParserNonXS.pm:5604
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5635 tp/Texinfo/ParserNonXS.pm:5640
+#: tp/Texinfo/XS/parsetexi/end_line.c:690
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5612
+#: tp/Texinfo/ParserNonXS.pm:5648
#, fuzzy, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5622
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5658 tp/Texinfo/XS/parsetexi/end_line.c:711
+#, fuzzy, c-format, perl-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5634
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5670 tp/Texinfo/XS/parsetexi/end_line.c:726
+#, c-format, perl-format
msgid "expected @%s on or off, not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5643
-#, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5679 tp/Texinfo/XS/parsetexi/end_line.c:746
+#, c-format, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: tp/Texinfo/ParserNonXS.pm:5651
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5687 tp/Texinfo/XS/parsetexi/end_line.c:758
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/ParserNonXS.pm:5659
-#, fuzzy, perl-format
+#: tp/Texinfo/ParserNonXS.pm:5695 tp/Texinfo/XS/parsetexi/end_line.c:770
+#, fuzzy, c-format, perl-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
@@ -2899,8 +3050,9 @@ msgstr ""
msgid "@%s not empty"
msgstr ""
-#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1207
+#: tp/Texinfo/Structuring.pm:386 tp/Texinfo/Structuring.pm:1160
#, fuzzy, perl-format
+#| msgid "%s reference to nonexistent node `%s'"
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
@@ -2909,213 +3061,215 @@ msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
msgid "@%s entry node name `%s' different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:512
+#: tp/Texinfo/Structuring.pm:498
#, perl-format
msgid "unreferenced node `%s'"
msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
-#: tp/Texinfo/Structuring.pm:563
+#: tp/Texinfo/Structuring.pm:549
#, perl-format
msgid "node `%s' is %s for `%s' in sectioning but not in menu"
msgstr ""
-#: tp/Texinfo/Structuring.pm:572
+#: tp/Texinfo/Structuring.pm:558
#, perl-format
msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: tp/Texinfo/Structuring.pm:590
+#: tp/Texinfo/Structuring.pm:576
#, perl-format
msgid "node `%s' is %s for `%s' in menu but not in sectioning"
msgstr ""
-#: tp/Texinfo/Structuring.pm:645
+#: tp/Texinfo/Structuring.pm:614
#, perl-format
msgid "%s pointer `%s' (for node `%s') different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:669
+#: tp/Texinfo/Structuring.pm:627
#, fuzzy, perl-format
+#| msgid "%s reference to nonexistent node `%s'"
msgid "%s reference to nonexistent `%s'"
msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
-#: tp/Texinfo/Structuring.pm:690
+#: tp/Texinfo/Structuring.pm:648
#, perl-format
msgid "node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
-#: tp/Texinfo/Structuring.pm:698
+#: tp/Texinfo/Structuring.pm:656
#, perl-format
msgid "for `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1217
+#: tp/Texinfo/Structuring.pm:1170
#, perl-format
msgid "@%s to `%s', different from %s name `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:1503
+#: tp/Texinfo/Structuring.pm:1456
#, perl-format
msgid "empty index key in @%s"
msgstr ""
-#: tp/init/chm.pm:221 tp/init/chm.pm:277 tp/init/chm.pm:347
+#: tp/init/chm.pm:223 tp/init/chm.pm:279 tp/init/chm.pm:349
#, perl-format
msgid "chm.pm: could not open %s for writing: %s\n"
msgstr ""
-#: tp/init/chm.pm:267 tp/init/chm.pm:337 tp/init/chm.pm:398
+#: tp/init/chm.pm:269 tp/init/chm.pm:339 tp/init/chm.pm:400
#, perl-format
msgid "chm.pm: error on closing %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:200
+#: tp/init/latex2html.pm:197
#, perl-format
msgid "l2h: could not open latex file %s for writing: %s"
msgstr ""
-#: tp/init/latex2html.pm:341
+#: tp/init/latex2html.pm:343
msgid "l2h: L2H_TMP directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:346
+#: tp/init/latex2html.pm:348
msgid "l2h: current directory contains a dot"
msgstr ""
-#: tp/init/latex2html.pm:374
+#: tp/init/latex2html.pm:376
#, perl-format
msgid "l2h: command did not succeed: %s"
msgstr ""
-#: tp/init/latex2html.pm:422
+#: tp/init/latex2html.pm:424
#, perl-format
msgid "l2h: image has invalid extension: %s"
msgstr ""
-#: tp/init/latex2html.pm:438
+#: tp/init/latex2html.pm:440
#, perl-format
msgid "l2h: rename %s as %s failed: %s"
msgstr ""
-#: tp/init/latex2html.pm:460
+#: tp/init/latex2html.pm:462
#, perl-format
msgid "l2h: could not open %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:493
+#: tp/init/latex2html.pm:495
#, perl-format
msgid "latex2html.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/latex2html.pm:504
+#: tp/init/latex2html.pm:506
#, perl-format
msgid ""
"latex2html.pm: processing produced %d items in HTML; expected %d, the number "
"of items found in the document"
msgstr ""
-#: tp/init/latex2html.pm:534
+#: tp/init/latex2html.pm:536
#, perl-format
msgid "l2h: could not determine the fragment %d for @%s"
msgstr ""
-#: tp/init/latex2html.pm:560
+#: tp/init/latex2html.pm:562
#, perl-format
msgid ""
"l2h: could not extract the fragment %d for @%s with output counter %d from "
"HTML"
msgstr ""
-#: tp/init/latex2html.pm:621
+#: tp/init/latex2html.pm:623
#, perl-format
msgid "l2h: could not load %s: %s"
msgstr ""
-#: tp/init/latex2html.pm:634
+#: tp/init/latex2html.pm:636
#, perl-format
msgid "l2h: could not open %s for writing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:123 tp/init/tex4ht.pm:267
+#: tp/init/tex4ht.pm:125 tp/init/tex4ht.pm:270
#, perl-format
msgid "tex4ht.pm: could not open %s: %s"
msgstr ""
-#: tp/init/tex4ht.pm:219
+#: tp/init/tex4ht.pm:222
#, perl-format
msgid "tex4ht.pm: chdir %s failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:232
+#: tp/init/tex4ht.pm:235
#, perl-format
msgid "tex4ht.pm: unable to return to initial directory: %s"
msgstr ""
-#: tp/init/tex4ht.pm:244
+#: tp/init/tex4ht.pm:247
#, perl-format
msgid "tex4ht.pm: output file missing: %s"
msgstr ""
-#: tp/init/tex4ht.pm:260
+#: tp/init/tex4ht.pm:263
#, perl-format
msgid "tex4ht.pm: command failed: %s"
msgstr ""
-#: tp/init/tex4ht.pm:294
+#: tp/init/tex4ht.pm:297
#, perl-format
msgid "tex4ht.pm: end of @%s item %d not found"
msgstr ""
-#: tp/init/tex4ht.pm:301
+#: tp/init/tex4ht.pm:304
#, perl-format
msgid ""
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/init/tex4ht.pm:321
+#: tp/init/tex4ht.pm:324
#, perl-format
msgid "tex4ht.pm: output has no HTML item for @%s %s"
msgstr ""
-#: tp/init/tex4ht.pm:336
+#: tp/init/tex4ht.pm:339
#, perl-format
msgid ""
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
"items found in the document for @%s"
msgstr ""
-#: tp/texi2any.pl:372
+#: tp/texi2any.pl:348
#, perl-format
msgid "error loading %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:385
+#: tp/texi2any.pl:361
#, fuzzy, perl-format
msgid "%s: unknown variable %s"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: tp/texi2any.pl:401
+#: tp/texi2any.pl:377
#, fuzzy, perl-format
msgid "%s: unknown variable %s\n"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: tp/texi2any.pl:437
+#: tp/texi2any.pl:413
#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
msgid "could not read init file %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/texi2any.pl:593
+#: tp/texi2any.pl:569
#, perl-format
msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
msgstr ""
-#: tp/texi2any.pl:676
+#: tp/texi2any.pl:652
#, fuzzy, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "¥Îªk: %s [OPTION]... FILE...\n"
-#: tp/texi2any.pl:679
+#: tp/texi2any.pl:655
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -3124,7 +3278,7 @@ msgid ""
"the behavior is identical, and does not depend on the installed name.\n"
msgstr ""
-#: tp/texi2any.pl:685
+#: tp/texi2any.pl:661
#, perl-format
msgid ""
"General options:\n"
@@ -3143,7 +3297,7 @@ msgid ""
" --version display version information and exit.\n"
msgstr ""
-#: tp/texi2any.pl:701
+#: tp/texi2any.pl:677
msgid ""
"Output format selection (default is to produce Info):\n"
" --docbook output Docbook XML rather than Info.\n"
@@ -3154,7 +3308,7 @@ msgid ""
" after checking validity of TEXINFO-FILE.\n"
msgstr ""
-#: tp/texi2any.pl:709
+#: tp/texi2any.pl:685
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -3181,7 +3335,7 @@ msgid ""
" Otherwise, DEST names the output file.\n"
msgstr ""
-#: tp/texi2any.pl:729
+#: tp/texi2any.pl:705
#, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -3203,7 +3357,7 @@ msgid ""
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:722
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -3217,19 +3371,19 @@ msgid ""
" anchors; default is set only if split.\n"
msgstr ""
-#: tp/texi2any.pl:757
+#: tp/texi2any.pl:733
msgid ""
"Options for XML and Docbook:\n"
" --output-indent=VAL does nothing, retained for compatibility.\n"
msgstr ""
-#: tp/texi2any.pl:760
+#: tp/texi2any.pl:736
msgid ""
"Options for DVI/PS/PDF:\n"
" --Xopt=OPT pass OPT to texi2dvi; can be repeated.\n"
msgstr ""
-#: tp/texi2any.pl:763
+#: tp/texi2any.pl:739
msgid ""
"Input file options:\n"
" --commands-in-node-names does nothing, retained for compatibility.\n"
@@ -3240,7 +3394,7 @@ msgid ""
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:747
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -3260,7 +3414,7 @@ msgid ""
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: tp/texi2any.pl:788
+#: tp/texi2any.pl:764
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
" if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3270,7 +3424,7 @@ msgid ""
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: tp/texi2any.pl:795
+#: tp/texi2any.pl:771
#, fuzzy
msgid ""
"Examples:\n"
@@ -3302,80 +3456,320 @@ msgstr ""
"µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
"¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org."
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:818
#, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
-#: tp/texi2any.pl:938
+#: tp/texi2any.pl:913
#, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
-#: tp/texi2any.pl:1015
+#: tp/texi2any.pl:990
#, perl-format
msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
msgstr ""
-#: tp/texi2any.pl:1019
+#: tp/texi2any.pl:994
msgid "--Xopt option without printed output"
msgstr ""
-#: tp/texi2any.pl:1035
+#: tp/texi2any.pl:1010
#, fuzzy, perl-format
msgid "unknown tree transformation %s"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: tp/texi2any.pl:1042
+#: tp/texi2any.pl:1017
#, perl-format
msgid "ignoring splitting for format %s"
msgstr ""
-#: tp/texi2any.pl:1101
+#: tp/texi2any.pl:1076
#, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
-#: tp/texi2any.pl:1102
+#: tp/texi2any.pl:1077
#, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "¸Õ¸Õ `%s --help' ¥H¨ú±o§ó¦hªº¸ê°T.\n"
-#: tp/texi2any.pl:1169
+#: tp/texi2any.pl:1144
msgid "fill_gaps_in_sectioning transformation return no result. No section?"
msgstr ""
-#: tp/texi2any.pl:1192
+#: tp/texi2any.pl:1166
#, fuzzy, perl-format
msgid "error on closing macro expand file %s: %s\n"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/texi2any.pl:1198
+#: tp/texi2any.pl:1172
#, perl-format
msgid "could not open %s for writing: %s\n"
msgstr ""
-#: tp/texi2any.pl:1223
+#: tp/texi2any.pl:1197
msgid ""
"insert_nodes_for_sectioning_commands transformation return no result. No "
"section?"
msgstr ""
-#: tp/texi2any.pl:1292 tp/texi2any.pl:1368
+#: tp/texi2any.pl:1265 tp/texi2any.pl:1341
#, perl-format
msgid "%s: error on closing %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1315 tp/texi2any.pl:1349
+#: tp/texi2any.pl:1288 tp/texi2any.pl:1322
#, perl-format
msgid "%s: error on closing internal links file %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:1321 tp/texi2any.pl:1355
+#: tp/texi2any.pl:1294 tp/texi2any.pl:1328
#, fuzzy, perl-format
+#| msgid "%s: could not read (%s) and could not create (%s)\n"
msgid "%s: could not open %s for writing: %s\n"
msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
+#: tp/Texinfo/XS/parsetexi/close.c:274
+#, fuzzy, c-format
+#| msgid "No matching `%cend %s'"
+msgid "no matching `@end %s'"
+msgstr "No matching `%cend %s'"
+
+#: tp/Texinfo/XS/parsetexi/close.c:312 tp/Texinfo/XS/parsetexi/separator.c:193
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced {"
+msgstr "»~¸mªº %c"
+
+#: tp/Texinfo/XS/parsetexi/close.c:415
+#, fuzzy, c-format
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end %s'"
+msgstr "¥¼°t¹ïªº `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:191
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@set requires a name"
+msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:194
+msgid "bad name for @set"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:218
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@clear requires a name"
+msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:221
+msgid "bad name for @clear"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:240
+#, fuzzy
+#| msgid "%c%s requires a name"
+msgid "@unmacro requires a name"
+msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:243
+msgid "bad name for @unmacro"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:262
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "@clickstyle should only accept an @-command as argument, not `%s'"
+msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:355
+#, fuzzy, c-format
+#| msgid "Use braces to give a command as an argument to @%s"
+msgid "environment command %s as argument to @alias"
+msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:373
+#, fuzzy
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @alias"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:424
+#, fuzzy
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @definfoenclose"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:436
+msgid "empty @columnfractions"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:594
+#, fuzzy, c-format
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @printindex: %s"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:646
+#, c-format
+msgid "Only @fonttextsize 10 or 11 is supported, not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:657
+#, fuzzy, c-format
+#| msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgid "@footnotestyle arg must be `separate' or `end', not `%s'"
+msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:669
+#, c-format
+msgid "@setchapternewpage arg must be `on', `off' or `odd', not `%s'"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:680
+#, fuzzy, c-format
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @need: %s"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:701
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgid "@firstparagraph arg must be `none' or `insert', not `%s'"
+msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:783
+#, fuzzy, c-format
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @headings: %s"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1158
+#, fuzzy, c-format
+#| msgid "%s requires letter or digit"
+msgid "%s requires an argument: the formatter for @item"
+msgstr "%s ¥²¶·­n¦³¦r¤¸©Î¬O¼Æ¦r"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1379
+#, fuzzy
+#| msgid "Unmatched `%c%s'"
+msgid "unmatched `@end'"
+msgstr "¥¼°t¹ïªº `%c%s'"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1399
+#: tp/Texinfo/XS/parsetexi/parser.c:1109
+#, c-format
+msgid "superfluous argument to @end %s: %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1409
+#, fuzzy, c-format
+#| msgid "Bad argument to %c%s"
+msgid "bad argument to @end: %s"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1426
+#, c-format
+msgid "@include: could not find %s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1434
+#, c-format
+msgid "@include: could not open %s:"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1815
+msgid "@setfilename after the first element"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1825
+msgid "@columnfractions only meaningful on a @multitable line"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/end_line.c:1892
+msgid "@node precedes @part, but parts may not be associated with nodes"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:154
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not meaningful inside @%s block"
+msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:363
+#, fuzzy, c-format
+#| msgid "@%s not meaningful inside `@%s' block"
+msgid "@%s not allowed inside `@copying' block"
+msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:565
+msgid "@subentry should only occur in an index entry"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:690
+msgid ""
+"@author not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/handle_commands.c:804
+#: tp/Texinfo/XS/parsetexi/macro.c:107
+#, fuzzy, c-format
+#| msgid "%c%s requires a name"
+msgid "@%s requires a name"
+msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
+
+#: tp/Texinfo/XS/parsetexi/macro.c:159
+#, c-format
+msgid "bad or empty @%s formal argument: "
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1436
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' §@¬°¤Þ¼Æ, ¦Ó¤£¬O `%c'"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1523
+#, c-format
+msgid "undefined flag: %.*s"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1578
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete."
+msgstr "%c%s ¤w¼o¤î¤£¥Î"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1580
+#, fuzzy, c-format
+#| msgid "%c%s is obsolete"
+msgid "@%s is obsolete; %s"
+msgstr "%c%s ¤w¼o¤î¤£¥Î"
+
+#: tp/Texinfo/XS/parsetexi/parser.c:1705
+msgid "@\\ should only appear in math context"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:53
+msgid "@verb without associated character"
+msgstr ""
+
+#: tp/Texinfo/XS/parsetexi/separator.c:396
+#, fuzzy, c-format
+#| msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgid "@dotless expects `i' or `j' as argument, not `%s'"
+msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' §@¬°¤Þ¼Æ, ¦Ó¤£¬O `%c'"
+
+#: tp/Texinfo/XS/parsetexi/separator.c:545
+#, fuzzy
+#| msgid "Misplaced %c"
+msgid "misplaced }"
+msgstr "»~¸mªº %c"
+
#~ msgid "One completion:\n"
#~ msgstr "¤@­Ó§¹¦¨¥y:\n"
@@ -3385,6 +3779,7 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "more "
#~ msgstr "§ó¦hªº "
+#, c-format
#~ msgid ""
#~ "\n"
#~ "* Menu: Nodes whoses indices contain \"%s\":\n"
@@ -3392,6 +3787,7 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ "\n"
#~ "* Menu: ¨ä¯Á¤Þ¤¤¥]§t \"%s\" ªº¸`ÂI:\n"
+#, c-format
#~ msgid ""
#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
#~ "There is NO warranty. You may redistribute this software\n"
@@ -3403,7 +3799,7 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ "(GNU General Public License) ªº±ø´Ú¤U´²§G¥»³nÅé.\n"
#~ "±ýª¾§ó¦hªº¸Ô±¡, ½Ð¬ÝÀɦW¬° COPYING ªºÀÉ®×.\n"
-#, fuzzy
+#, fuzzy, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
#~ "\n"
@@ -3557,21 +3953,27 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ "found.\n"
#~ msgstr " ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
+#, c-format
#~ msgid " %-10s Quit this help.\n"
#~ msgstr " %-10s µ²§ô¥»¨D§U.\n"
+#, c-format
#~ msgid " %-10s Quit Info altogether.\n"
#~ msgstr " %-10s ¤@¨Öµ²§ô Info µ{¦¡.\n"
+#, c-format
#~ msgid " %-10s Invoke the Info tutorial.\n"
#~ msgstr " %-10s °õ¦æ Info «ü¾É½Òµ{.\n"
+#, c-format
#~ msgid " %-10s Move to the `next' node of this node.\n"
#~ msgstr " %-10s ²¾¦Ü¥»¸`ÂIªº '¤U¤@­Ó (next)' ¸`ÂI.\n"
+#, c-format
#~ msgid " %-10s Move to the `previous' node of this node.\n"
#~ msgstr " %-10s ²¾¦Ü¥»¸`ÂIªº '¤W¤@­Ó (previous)' ¸`ÂI.\n"
+#, c-format
#~ msgid " %-10s Move `up' from this node.\n"
#~ msgstr " %-10s ²¾¦Ü¥»¸`ÂIªº '¤W¤@¼h (up)' ¸`ÂI.\n"
@@ -3579,45 +3981,59 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ " Picking a menu item causes another node to be selected.\n"
#~ msgstr " ¿ï¨ú¿ï³æ¶µ¥Ø¥H¿ï¾Ü¥t¤@­Ó¸`ÂI.\n"
+#, c-format
#~ msgid " %-10s Follow a cross reference. Reads name of reference.\n"
#~ msgstr " %-10s ¸òÀH¥æ¤¬°Ñ·Ó. Ū¨ú°Ñ·Óªº¦WºÙ.\n"
+#, c-format
#~ msgid " %-10s Move to the last node seen in this window.\n"
#~ msgstr " %-10s ²¾°Ê¦Ü¥»¤À¹jµøµ¡¤¤, ¤W¤@­ÓÆ[¬Ýªº¸`ÂI.\n"
+#, c-format
#~ msgid " %-10s Skip to next hypertext link within this node.\n"
#~ msgstr " %-10s ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
+#, c-format
#~ msgid " %-10s Follow the hypertext link under cursor.\n"
#~ msgstr " %-10s ¸òÀH´å¼Ð¤Uªº¶W¥»¤å³sµ².\n"
+#, c-format
#~ msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"
#~ msgstr " %-10s ²¾¦Ü `directory' ¸`ÂI. ¦P `g (DIR)'.\n"
+#, c-format
#~ msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n"
#~ msgstr " %-10s ²¾¦Ü Top ¸`ÂI. ¦P `g TOP'.\n"
+#, c-format
#~ msgid " %-10s Scroll forward a page.\n"
#~ msgstr " %-10s ¦V«e±²°Ê¤@­¶.\n"
+#, c-format
#~ msgid " %-10s Scroll backward a page.\n"
#~ msgstr " %-10s ¦V«á±²°Ê¤@­¶.\n"
+#, c-format
#~ msgid " %-10s Go to the beginning of this node.\n"
#~ msgstr " %-10s ²¾¦Ü¥»¸`ÂIªº¶}ÀY.\n"
+#, c-format
#~ msgid " %-10s Go to the end of this node.\n"
#~ msgstr " %-10s ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
+#, c-format
#~ msgid " %-10s Scroll forward 1 line.\n"
#~ msgstr " %-10s ©¹«e±²°Ê¤@¦æ.\n"
+#, c-format
#~ msgid " %-10s Scroll backward 1 line.\n"
#~ msgstr " %-10s ©¹«á±²°Ê¤@¦æ.\n"
+#, c-format
#~ msgid " %-10s Pick last item in node's menu.\n"
#~ msgstr " %-10s ¬D¿ï¸`ÂI¥Ø¿ýªº³Ì«á¤@­Ó¶µ¥Ø.\n"
+#, c-format
#~ msgid ""
#~ " %-10s Search for a specified string in the index entries of this Info\n"
#~ msgstr " %-10s ¦b¥» Info Àɪº¯Á¤Þ¶µ¥Ø¤¤, ·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
@@ -3636,20 +4052,22 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ " and select the node in which the next occurrence is found.\n"
#~ msgstr " ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
-#, fuzzy
+#, fuzzy, c-format
#~ msgid " %-10s Search backward for a specified string\n"
#~ msgstr " %-10s ¦b¥» Info Àɤ¤, ¦V«á·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
#~ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
#~ msgstr "--- ¨Ï¥Î `\\[history-node]' ©Î `\\[kill-node]' Â÷¶}---\n"
+#, c-format
#~ msgid "ESC %s is undefined."
#~ msgstr "ESC %s ¥¼©w¸q."
+#, c-format
#~ msgid "%s is defined to %s."
#~ msgstr "%s ©w¸q¦¨ %s."
-#, fuzzy
+#, fuzzy, c-format
#~ msgid "cannot create output file `%s'"
#~ msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
@@ -3665,6 +4083,7 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "Selecting Next node..."
#~ msgstr "¿ï¨ú¤U¤@­Ó¸`ÂI..."
+#, c-format
#~ msgid "Moving Up %d time(s), then Next."
#~ msgstr "©¹¤W¤@¼h²¾°Ê %d ¦¸, µM«á©¹¤U¤@­Ó¤è¦V²¾°Ê."
@@ -3680,9 +4099,11 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "Moving to `Prev's last menu item."
#~ msgstr "²¾¦Ü«e¤@­Ó¸`ÂIªº³Ì«á¤@­Ó¥Ø¿ý¶µ¥Ø."
+#, c-format
#~ msgid "Kill node (%s): "
#~ msgstr "§R°£¸`ÂI (%s): "
+#, c-format
#~ msgid "Cannot kill node `%s'"
#~ msgstr "µLªk§R°£¸`ÂI `%s'"
@@ -3707,21 +4128,27 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "readline: Out of virtual memory!\n"
#~ msgstr "readline: ¯ÓºÉµêÀÀ°O¾ÐÅé!\n"
+#, c-format
#~ msgid "-%s---Info: %s, %d lines --%s--"
#~ msgstr "-%s---Info: %s, ¦@ %d ¦æ --%s--"
+#, c-format
#~ msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
#~ msgstr "-%s%s-Info: (%s)%s, ¦@ %d ¦æ --%s--"
+#, c-format
#~ msgid " Subfile: %s"
#~ msgstr " ¤lÀÉ®×: %s"
+#, c-format
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n"
+#, c-format
#~ msgid "%s: option `-W %s' is ambiguous\n"
#~ msgstr "%s: ¿ï¶µ `-W %s' ¤£©ú½T\n"
+#, c-format
#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
#~ msgstr "%s: ¿ï¶µ `-W %s' ¤£¥i§t¦³¤Þ¼Æ\n"
@@ -3764,18 +4191,22 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "@sc argument all uppercase, thus no effect"
#~ msgstr "@sc ªº¤Þ¼Æ¥þ¬O¤j¼g, ©Ò¥H¨S¦³§@¥Î"
+#, c-format
#~ msgid "@sp requires a positive numeric argument, not `%s'"
#~ msgstr "@sp ¥²¶·¦³¤@­Ó¥¿¾ã¼Æªº¤Þ¼Æ, ¦Ó¤£¬O `%s'"
#~ msgid "Missing `}' in @def arg"
#~ msgstr "@def °Ñ¼Æ¤¤¿òº| `}'"
+#, c-format
#~ msgid "%s: getwd: %s, %s\n"
#~ msgstr "%s: getwd: %s, %s\n"
+#, c-format
#~ msgid "`%c%s' needs an argument `{...}', not just `%s'"
#~ msgstr "`%c%s' ¥²¶·¥]§t¤Þ¼Æ `{...}', ¦Ó¤£¬O¥u¦³ `%s'"
+#, c-format
#~ msgid "No closing brace for footnote `%s'"
#~ msgstr "µù¸} `%s' ¨S¦³¥k¤j¬A¸¹"
@@ -3785,44 +4216,48 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "Footnotes"
#~ msgstr "µù¸}"
+#, c-format
#~ msgid "Index `%s' already exists"
#~ msgstr "¯Á¤Þ `%s' ¤w¦s¦b"
+#, c-format
#~ msgid "Unknown index `%s' and/or `%s' in @synindex"
#~ msgstr "@synindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s' »P/©Î `%s'"
-#~ msgid "%s requires letter or digit"
-#~ msgstr "%s ¥²¶·­n¦³¦r¤¸©Î¬O¼Æ¦r"
-
#~ msgid "@detailmenu seen before first node, creating `Top' node"
#~ msgstr "¦b²Ä¤@­Ó¸`ÂI¤§«e¥X²{ @detailmenu, ±N«Ø¥ß `Top' ¸`ÂI"
+#, c-format
#~ msgid "`%c%s' needs something after it"
#~ msgstr "¦b `%c%s' ¤§«á¥²¶·­n¦³ªF¦è"
+#, c-format
#~ msgid "@itemx not meaningful inside `%s' block"
#~ msgstr "`%s' °Ï¶ô¤§¤º, @itemx ¨ÃµL·N¸q"
-#, fuzzy
+#, fuzzy, c-format
#~ msgid "%s is an invalid ISO code, using %c"
#~ msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
+#, c-format
#~ msgid "%c%s expects a single character `i' or `j' as argument"
#~ msgstr "%c%s ´Á±æ¨Ï¥Î¤@­Ó¦r¥À `i' ©Î `j' §@¬°¤Þ¼Æ"
#~ msgid "@quote-arg only useful for single-argument macros"
#~ msgstr "@quote-arg ¥u¦b³æ¤@¤Þ¼Æªº¥¨¶°¦³¥Î"
+#, c-format
#~ msgid "mismatched @end %s with @%s"
#~ msgstr "@end %s »P @%s ¤£²Å¦X"
+#, c-format
#~ msgid "%s:%d: warning: "
#~ msgstr "%s:%d: ĵ§i: "
#~ msgid "Too many errors! Gave up.\n"
#~ msgstr "¿ù»~¹L¦h! ©ñ±ó.\n"
-#, fuzzy
+#, fuzzy, no-wrap
#~ msgid ""
#~ "Email bug reports to bug-texinfo@gnu.org,\n"
#~ "general questions and discussion to help-texinfo@gnu.org."
@@ -3831,15 +4266,18 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
#~ "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
+#, c-format
#~ msgid "No `%s' found in `%s'"
#~ msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
+#, c-format
#~ msgid ""
#~ "%s: Removing macro output file `%s' due to errors; use --force to "
#~ "preserve.\n"
#~ msgstr ""
#~ "%s: ¦]¬°¿ù»~, ²¾°£¥¨¶°¿é¥XÀÉ `%s'; ­Y­n«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
+#, c-format
#~ msgid ""
#~ "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
#~ msgstr "%s: ¦]¬°¿ù»~, ²¾°£¿é¥XÀÉ `%s'; ­Y­n«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
@@ -3847,28 +4285,34 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "NO_NAME!"
#~ msgstr "NO_NAME!"
-#, fuzzy
+#, fuzzy, c-format
#~ msgid "@image file `%s' (for text) unreadable: %s"
#~ msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
+#, c-format
#~ msgid "Reached eof before matching @end %s"
#~ msgstr "¦b°t¹ïªº @end %s ¤§«e, ¥ý¨ì¹FÀÉ®×µ²§À"
#~ msgid "Missing } in @multitable template"
#~ msgstr "¦b @multitable ¼Ëª©¤¤, ¨S¦³ }"
+#, c-format
#~ msgid "Cannot select column #%d in multitable"
#~ msgstr "µLªk¿ï¨ú multitable ¤¤ªºÄæ¦ì #%d"
+#, c-format
#~ msgid "* column #%d: output = %s\n"
#~ msgstr "* Äæ¦ì #%d: ¿é¥X = %s\n"
+#, c-format
#~ msgid "Node `%s' previously defined at line %d"
#~ msgstr "¸`ÂI `%s' ¤w¦b²Ä %d ¦æ©w¸q¹L¤F"
+#, c-format
#~ msgid "Formatting node %s...\n"
#~ msgstr "½s±Æ¸`ÂI %s ªº®æ¦¡¤¤...\n"
+#, c-format
#~ msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
#~ msgstr "¸`ÂI `%s' ¥²¶·¨Ï¥Î¤À¬q©R¥O (sectioning command) (¨Ò¦p: %c%s)"
@@ -3887,36 +4331,45 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "Menu"
#~ msgstr "¥Ø¿ý"
+#, c-format
#~ msgid "This node (%s) has the bad Prev"
#~ msgstr "¥»¸`ÂI (%s) ªº «e¤@­Ó (Prev) ¸`ÂI¦³°ÝÃD"
#~ msgid "Prev"
#~ msgstr "«e¤@­Ó"
+#, c-format
#~ msgid "This node (%s) has the bad Next"
#~ msgstr "¥»¸`ÂI (%s) ªº ¤U¤@­Ó (Next) ¸`ÂI¦³°ÝÃD"
+#, c-format
#~ msgid "`%s' has no Up field"
#~ msgstr "`%s' ¨S¦³ ¤W¤@¼h (Up) Äæ¦ì"
#~ msgid "Up"
#~ msgstr "¤W¤@¼h"
+#, c-format
#~ msgid "node `%s' has been referenced %d times"
#~ msgstr "¸`ÂI `%s' ¤w³Q°Ñ·Ó %d ¦¸"
+#, c-format
#~ msgid "Appendix %c "
#~ msgstr "ªþ¿ý %c"
+#, c-format
#~ msgid "Internal error (search_sectioning) \"%s\"!"
#~ msgstr "¤º³¡¿ù»~ (search_sectioning) \"%s\"!"
+#, c-format
#~ msgid "%c%s is obsolete; use %c%s instead"
#~ msgstr "%c%s ¤w¼o±ó¤£¥Î; ½Ð§ï¥Î %c%s"
+#, c-format
#~ msgid "%s: warning: "
#~ msgstr "%s: ĵ§i: "
+#, c-format
#~ msgid ""
#~ "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
#~ "\n"
@@ -3991,9 +4444,11 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
#~ "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
+#, c-format
#~ msgid "%s: Specify the Info directory only once.\n"
#~ msgstr "%s: ¥u¦³«ü©w Info ¥Ø¿ý¤@¦¸.\n"
+#, c-format
#~ msgid "menu item `%s' already exists, for file `%s'"
#~ msgstr "¥Ø¿ý¶µ¥Ø `%s' ¤w¦s¦b, ¬Oµ¹ÀÉ®× `%s' ªº"
@@ -4009,12 +4464,14 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ msgid "send output to FILE"
#~ msgstr "±N¿é¥X°e¦Ü FILE"
+#, c-format
#~ msgid "Usage: %s [OPTION]... FILE...\n"
#~ msgstr "¥Îªk: %s [OPTION]... FILE...\n"
#~ msgid "Generate a sorted index for each TeX output FILE.\n"
#~ msgstr "¬°¨C­Ó TeX ¿é¥X FILE ²£¥Í¤@­Ó±Æ§Çªº¯Á¤Þ.\n"
+#, c-format
#~ msgid ""
#~ "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
#~ msgstr "³q±`¤å¥ó `foo.texi' ªº FILE... ¤Þ¼Æ·|«ü©w¬° `foo.%c%c'.\n"
@@ -4026,12 +4483,15 @@ msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
#~ "\n"
#~ "¿ï¶µ:\n"
+#, c-format
#~ msgid "%s: not a texinfo index file"
#~ msgstr "%s: ¤£¬O¤@­Ó texinfo ¯Á¤ÞÀÉ"
+#, c-format
#~ msgid "failure reopening %s"
#~ msgstr "­«·s¶}±Ò %s ®Éµo¥Í¿ù»~"
+#, c-format
#~ msgid "No page number in %s"
#~ msgstr "¦b %s ¤¤¨S¦³­¶½X"
diff --git a/macros/texinfo/texinfo/po_document/ChangeLog b/macros/texinfo/texinfo/po_document/ChangeLog
index e5eb8f408a..61887a0ffd 100644
--- a/macros/texinfo/texinfo/po_document/ChangeLog
+++ b/macros/texinfo/texinfo/po_document/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-18 gettextize <bug-gnu-gettext@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.20.1.
+ * Rules-quot: Upgrade to gettext-0.20.1.
+ * en@boldquot.header: Upgrade to gettext-0.20.1.
+ * en@quot.header: Upgrade to gettext-0.20.1.
+ * insert-header.sin: Upgrade to gettext-0.20.1.
+ * remove-potcdate.sin: Upgrade to gettext-0.20.1.
+
2017-04-14 gettextize <bug-gnu-gettext@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.19.8.
diff --git a/macros/texinfo/texinfo/po_document/LINGUAS b/macros/texinfo/texinfo/po_document/LINGUAS
index 715afbcca7..f17f638d40 100644
--- a/macros/texinfo/texinfo/po_document/LINGUAS
+++ b/macros/texinfo/texinfo/po_document/LINGUAS
@@ -1,10 +1,8 @@
ca
ca.us-ascii
cs
-da
de
de.us-ascii
-el
eo
es
fr
@@ -18,4 +16,5 @@ pt
pt.us-ascii
pt_BR
pt_BR.us-ascii
+sv
uk
diff --git a/macros/texinfo/texinfo/po_document/Makefile.in.in b/macros/texinfo/texinfo/po_document/Makefile.in.in
index 38c293d2ed..fdb6ad3588 100644
--- a/macros/texinfo/texinfo/po_document/Makefile.in.in
+++ b/macros/texinfo/texinfo/po_document/Makefile.in.in
@@ -1,13 +1,14 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2000-2019 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved. This file is offered as-is,
# without any warranty.
#
-# Origin: gettext-0.19.8
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.20
+GETTEXT_MACRO_VERSION = 0.20
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -52,16 +53,13 @@ GMSGFMT_ = @GMSGFMT@
GMSGFMT_no = @GMSGFMT@
GMSGFMT_yes = @GMSGFMT_015@
GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
XGETTEXT_ = @XGETTEXT@
XGETTEXT_no = @XGETTEXT@
XGETTEXT_yes = @XGETTEXT_015@
XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
+MSGMERGE = @MSGMERGE@
MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
MSGINIT = msginit
MSGCONV = msgconv
MSGFILTER = msgfilter
@@ -93,17 +91,32 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
# Makevars gets inserted here. (Don't remove this line!)
.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
- @echo "$(MSGFMT) -c -o $@ $<"; \
- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
+.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
+
+# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs.
+# The GNU Coding Standards say in
+# <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>:
+# "GNU distributions usually contain some files which are not source files
+# ... . Since these files normally appear in the source directory, they
+# should always appear in the source directory, not in the build directory.
+# So Makefile rules to update them should put the updated files in the
+# source directory."
+# Therefore we put these files in the source directory, not the build directory.
+
+# During .po -> .gmo conversion, take into account the most recent changes to
+# the .pot file. This eliminates the need to update the .po files when the
+# .pot file has changed, which would be troublesome if the .po files are put
+# under version control.
+.po.gmo: $(srcdir)/$(DOMAIN).pot
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+ cd $(srcdir) && \
+ rm -f $${lang}.gmo && \
+ $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
+ $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+ mv t-$${lang}.gmo $${lang}.gmo && \
+ rm -f $${lang}.1po
.sin.sed:
sed -e '/^#/d' $< > t-$@
@@ -112,7 +125,7 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
all: all-@USE_NLS@
-all-yes: stamp-po
+all-yes: $(srcdir)/stamp-po
all-no:
# Ensure that the gettext macros and this Makefile.in.in are in sync.
@@ -126,24 +139,24 @@ CHECK_MACRO_VERSION = \
# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
# we don't want to bother translators with empty POT files). We assume that
# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
+# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target).
+
+# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS
+# have been loosely updated. Its purpose is that when a developer or translator
+# checks out the package from a version control system, and the $(DOMAIN).pot
+# file is not under version control, "make" will update the $(DOMAIN).pot and
+# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This
+# timestamp would not be necessary if updating the $(CATALOGS) would always
+# touch them; however, the rule for $(POFILES) has been designed to not touch
+# files that don't need to be changed.
+$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot
@$(CHECK_MACRO_VERSION)
test ! -f $(srcdir)/$(DOMAIN).pot || \
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
- echo "touch stamp-po" && \
- echo timestamp > stamp-poT && \
- mv stamp-poT stamp-po; \
+ echo "touch $(srcdir)/stamp-po" && \
+ echo timestamp > $(srcdir)/stamp-poT && \
+ mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \
}
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
@@ -159,11 +172,9 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
package_gnu="$(PACKAGE_GNU)"; \
test -n "$$package_gnu" || { \
if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
- LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
- -size -10000000c -exec grep 'GNU @PACKAGE@' \
- /dev/null '{}' ';' 2>/dev/null; \
+ LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
else \
- LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+ LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
fi; \
} | grep -v 'libtool:' >/dev/null; then \
package_gnu=yes; \
@@ -184,26 +195,29 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+ --add-comments=TRANSLATORS: \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
--msgid-bugs-address="$$msgid_bugs_address" \
+ $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
;; \
*) \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+ --add-comments=TRANSLATORS: \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
--package-name="$${package_prefix}@PACKAGE@" \
--package-version='@VERSION@' \
--msgid-bugs-address="$$msgid_bugs_address" \
+ $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
;; \
esac
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot-header; then \
sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
- cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
- rm -f $(DOMAIN).1po; \
+ cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \
+ rm -f $(DOMAIN).1po \
+ || exit 1; \
fi; \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -228,17 +242,19 @@ $(srcdir)/$(DOMAIN).pot:
# This target rebuilds a PO file if $(DOMAIN).pot has changed.
# Note that a PO file is not touched if it doesn't need to be changed.
$(POFILES): $(POFILESDEPS)
+ @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
if test -f "$(srcdir)/$${lang}.po"; then \
- test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
cd $(srcdir) \
- && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+ 0.1[6-7] | 0.1[6-7].*) \
+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
*) \
- $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
esac; \
}; \
else \
@@ -373,28 +389,30 @@ check: all
info dvi ps pdf html tags TAGS ctags CTAGS ID:
+install-dvi install-ps install-pdf install-html:
+
mostlyclean:
rm -f remove-potcdate.sed
- rm -f stamp-poT
+ rm -f $(srcdir)/stamp-poT
rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
rm -fr *.o
clean: mostlyclean
distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo
+ rm -f Makefile Makefile.in POTFILES
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
- rm -f stamp-po $(GMOFILES)
+ rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES)
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir:
test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
+dist2: $(srcdir)/stamp-po $(DISTFILES)
dists="$(DISTFILES)"; \
if test "$(PACKAGE)" = "gettext-tools"; then \
dists="$$dists Makevars.template"; \
@@ -439,13 +457,15 @@ update-po: Makefile
tmpdir=`pwd`; \
echo "$$lang:"; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
$(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+ 0.1[6-7] | 0.1[6-7].*) \
+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
*) \
- $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
esac; \
}; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
diff --git a/macros/texinfo/texinfo/po_document/Rules-quot b/macros/texinfo/texinfo/po_document/Rules-quot
index baf652858a..18c024bf45 100644
--- a/macros/texinfo/texinfo/po_document/Rules-quot
+++ b/macros/texinfo/texinfo/po_document/Rules-quot
@@ -1,5 +1,9 @@
-# This file, Rules-quot, can be copied and used freely without restrictions.
# Special Makefile rules for English message catalogs with quotation marks.
+#
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# This file, Rules-quot, and its auxiliary files (listed under
+# DISTFILES.common.extra1) are free software; the Free Software Foundation
+# gives unlimited permission to use, copy, distribute, and modify them.
DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
diff --git a/macros/texinfo/texinfo/po_document/ca.gmo b/macros/texinfo/texinfo/po_document/ca.gmo
index ae2b15eddc..fc463e468c 100644
--- a/macros/texinfo/texinfo/po_document/ca.gmo
+++ b/macros/texinfo/texinfo/po_document/ca.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/ca.po b/macros/texinfo/texinfo/po_document/ca.po
index f558f5da6f..2cb2122ab3 100644
--- a/macros/texinfo/texinfo/po_document/ca.po
+++ b/macros/texinfo/texinfo/po_document/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 5.9.93\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2015-06-08 17:08+0200\n"
"Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -18,794 +18,812 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funci@'o"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Forma especial"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variable"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Opci@'o d'usuari"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Variable d'inst@`ancia"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "M@'etode"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} sobre {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} de {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} {month}, {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Annex {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} a {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} de {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Gener"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Febrer"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "Mar@,{c}"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "Abril"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Maig"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Juny"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Juliol"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "Agost"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "Setembre"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Octubre"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "Novembre"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Desembre"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Vegreu fitxer Info @file{{myfile}}, node @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Vegeu node @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Vegeu fitxer Info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "secci@'o ``{section_name}'' a @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Vegeu secci@'o ``{section_name}'' a @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "vegeu secci@'o ``{section_name}'' a @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Vegeu @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "vegeu @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Vegeu {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "vegeu {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(fora de qualsevol node)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{No hi ha cap valor per a `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {name} {arguments}"
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{ }-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {name}"
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{ }-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {type} {name} {arguments}"
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}:@*{type}@*{name}"
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{ }-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {type} {name}"
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{ }-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {name}"
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{ }-- {category} de {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} a {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {name}"
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{ }-- {category} a {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} a {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {type} {name}"
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{ }-- {category} a {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {type} {name}"
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{ }-- {category} de {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Amunt"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Continguts"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Panor@`amica"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "@'Index"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "actual"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Prev"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Amunt"
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Amunt"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Previ"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Node cap endavant"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Node cap endarrere"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Fitxer seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Fitxer previ"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Portada (part superior) del document"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Taula de continguts"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Taula breu de continguts"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Secci@'o actual"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Secci@'o pr@`evia a l'ordre de lectura"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Inici del cap@'@dotless{i}tol actual o previ"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Secci@'o pr@`evia al mateix nivell"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Secci@'o amunt"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Secci@'o seg@\"uent al mateix nivell"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Node amunt"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Node seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Node previ"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Node seg@\"uent a l'ordre de lectura de nodes"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Node previ a l'ordre de lectura de nodes"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Secci@'o seg@\"uent a l'ordre de lectura"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Cap@'@dotless{i}tol seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Quant a (ajuda)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Primera secci@'o a l'ordre de lectura"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "@\"Ultima secci@'o a l'ordre de lectura"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Secci@'o cap endavant al fitxer seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Secci@'o cap endarrere al fitxer previ"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Aquest"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "En darrere"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "CapEnDarrereR@`apid"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "NodeAmunt"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "NodeSeg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "NodePrevi"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "NodeEnDavant"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "NodeEnDarrere"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Endavant"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "EndavantR@`apid"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Quant a"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Primer"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "@'Ultim"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "FitxerSeg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "FitxerPrevi"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Quan a aquest document"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Taula de continguts"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Taula breu de continguts"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Notes a peu de p@`agina"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "vegeu secci@'o {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "vegeu {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Vegeu secci@'o {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Vegeu {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "vegeu {reference} a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "vegeu @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "vegeu `{section}' a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "vegeu {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "vegeu `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Vegeu {reference} a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Vegeu @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Vegeu `{section}' a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Vegeu {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Vegeu `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "`{section}' a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "`{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Salta a"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Entrada d'@'@dotless{i}ndex"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Secci@'o"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} de {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} a {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} a {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category} a {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -814,41 +832,42 @@ msgstr ""
"Aquest document va ser generat el @emph{@today{}} usant "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Aquest document va ser generat el @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, fuzzy, perl-brace-format
+#| msgid "{text} ({url})"
msgid "{element_text} ({title})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "El node que esteu buscant @'es a {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " El botons als plafons de navegaci@'o tenen el seg@\"uent significat:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Bot@'o"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nom"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Ves a"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Des de 1.2.3 ves a"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -858,49 +877,50 @@ msgstr ""
"@strong{ Subsubsecci@'o U-Dos-Tres } d'un document de l'estructura seg@"
"\"uent:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Secci@'o U"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Subsecci@'o U-U"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Subsecci@'o U-Dos"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Subsubsecci@'o U-Dos_U"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Subsubsecci@'o U-Dos-Dos"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Subsubsecci@'o U-Dos-Tres"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Posici@'o actual"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Subsubsecci@'o U-Dos-Quatre"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Subsecci@'o U-Tres"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Subsecci@'o U-Quatre"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Document sense t@'@dotless{i}tol"
+#, perl-brace-format
#~ msgid "{title}: {element_text}"
#~ msgstr "{title}: {element_text}"
diff --git a/macros/texinfo/texinfo/po_document/ca.us-ascii.gmo b/macros/texinfo/texinfo/po_document/ca.us-ascii.gmo
index 437bad175a..d0c453b561 100644
--- a/macros/texinfo/texinfo/po_document/ca.us-ascii.gmo
+++ b/macros/texinfo/texinfo/po_document/ca.us-ascii.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/ca.us-ascii.po b/macros/texinfo/texinfo/po_document/ca.us-ascii.po
index 25ce77c323..747d50c84a 100644
--- a/macros/texinfo/texinfo/po_document/ca.us-ascii.po
+++ b/macros/texinfo/texinfo/po_document/ca.us-ascii.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 5.9.93\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2015-06-08 17:08+0200\n"
"Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -17,794 +17,794 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funci@'o"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Forma especial"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variable"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Opci@'o d'usuari"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Variable d'inst@`ancia"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "M@'etode"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} sobre {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} de {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} {month}, {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Annex {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} a {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} de {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Gener"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Febrer"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "Mar@,{c}"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "Abril"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Maig"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Juny"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Juliol"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "Agost"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "Setembre"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Octubre"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "Novembre"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Desembre"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Vegreu fitxer Info @file{{myfile}}, node @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Vegeu node @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Vegeu fitxer Info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "secci@'o ``{section_name}'' a @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Vegeu secci@'o ``{section_name}'' a @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "vegeu secci@'o ``{section_name}'' a @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Vegeu @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "vegeu @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Vegeu {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "vegeu {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(fora de qualsevol node)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{No hi ha cap valor per a `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{ }-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{ }-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{ }-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{ }-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{ }-- {category} de {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} a {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{ }-- {category} a {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} a {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{ }-- {category} a {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{ }-- {category} de {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Amunt"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Continguts"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Panor@`amica"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "@'Index"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "actual"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Prev"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Amunt"
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Amunt"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Previ"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Node cap endavant"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Node cap endarrere"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Fitxer seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Fitxer previ"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Portada (part superior) del document"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Taula de continguts"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Taula breu de continguts"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Secci@'o actual"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Secci@'o pr@`evia a l'ordre de lectura"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Inici del cap@'@dotless{i}tol actual o previ"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Secci@'o pr@`evia al mateix nivell"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Secci@'o amunt"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Secci@'o seg@\"uent al mateix nivell"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Node amunt"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Node seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Node previ"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Node seg@\"uent a l'ordre de lectura de nodes"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Node previ a l'ordre de lectura de nodes"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Secci@'o seg@\"uent a l'ordre de lectura"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Cap@'@dotless{i}tol seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Quant a (ajuda)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Primera secci@'o a l'ordre de lectura"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "@\"Ultima secci@'o a l'ordre de lectura"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Secci@'o cap endavant al fitxer seg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Secci@'o cap endarrere al fitxer previ"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Aquest"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "En darrere"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "CapEnDarrereR@`apid"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "NodeAmunt"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "NodeSeg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "NodePrevi"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "NodeEnDavant"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "NodeEnDarrere"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Endavant"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "EndavantR@`apid"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Quant a"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Primer"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "@'Ultim"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "FitxerSeg@\"uent"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "FitxerPrevi"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Quan a aquest document"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Taula de continguts"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Taula breu de continguts"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Notes a peu de p@`agina"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "vegeu secci@'o {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "vegeu {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Vegeu secci@'o {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Vegeu {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "vegeu {reference} a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "vegeu @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "vegeu `{section}' a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "vegeu {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "vegeu `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Vegeu {reference} a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Vegeu @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Vegeu `{section}' a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Vegeu {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Vegeu `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "`{section}' a @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "`{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Salta a"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Entrada d'@'@dotless{i}ndex"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Secci@'o"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} de {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} a {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} a {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category} a {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -813,41 +813,41 @@ msgstr ""
"Aquest document va ser generat el @emph{@today{}} usant "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Aquest document va ser generat el @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, fuzzy, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "El node que esteu buscant @'es a {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " El botons als plafons de navegaci@'o tenen el seg@\"uent significat:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Bot@'o"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nom"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Ves a"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Des de 1.2.3 ves a"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -857,47 +857,47 @@ msgstr ""
"@strong{ Subsubsecci@'o U-Dos-Tres } d'un document de l'estructura seg@"
"\"uent:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Secci@'o U"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Subsecci@'o U-U"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Subsecci@'o U-Dos"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Subsubsecci@'o U-Dos_U"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Subsubsecci@'o U-Dos-Dos"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Subsubsecci@'o U-Dos-Tres"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Posici@'o actual"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Subsubsecci@'o U-Dos-Quatre"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Subsecci@'o U-Tres"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Subsecci@'o U-Quatre"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Document sense t@'@dotless{i}tol"
diff --git a/macros/texinfo/texinfo/po_document/cs.gmo b/macros/texinfo/texinfo/po_document/cs.gmo
index 25fd99ab00..4afe1ad9f3 100644
--- a/macros/texinfo/texinfo/po_document/cs.gmo
+++ b/macros/texinfo/texinfo/po_document/cs.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/cs.po b/macros/texinfo/texinfo/po_document/cs.po
index 45bcdc8f42..3283daa44f 100644
--- a/macros/texinfo/texinfo/po_document/cs.po
+++ b/macros/texinfo/texinfo/po_document/cs.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.4.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-07-11 17:01+02:00\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -29,750 +29,750 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funkce"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Makro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Speciální forma"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Proměnná"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Uživatelská volba"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Proměnná instance"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Metoda"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} na třídě {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} třídy {class}"
# month is full month name
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day}. {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Příloha {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} na třídě {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} třídy {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "leden"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "únor"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "březen"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "duben"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "květen"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Äerven"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Äervenec"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "srpen"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "září"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "říjen"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "listopad"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "prosinec"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Vizte uzel @samp{{mynode}} v info souboru @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Vizte uzel @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Vizte info soubor @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "oddíl „{section_name}“ v @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Vizte oddíl „{section_name}“ v @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "vizte oddíl „{section_name}“ v @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Vizte @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "vizte @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Vizte {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "vizte {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(mimo jakýkoliv uzel)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Žádná hodnota pro „{value}“@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}-- {category} třídy {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}-- {category} třídy {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}-- {category} na třídě {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}-- {category} na třídě {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} na třídě {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} na třídě {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} na třídě {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}-- {category} na třídě {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} třídy {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} třídy {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} třídy {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}-- {category} třídy {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Vrchol"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Obsah"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Přehled"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Rejstřík"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "souÄasný"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Předchozí"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Nahoru "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Další"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Nahoru"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Předchozí"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Uzel vpřed"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Uzel zpět"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Další soubor"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Předchozí soubor"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Přebal (vrchol) dokumentu"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Obsah"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "StruÄný obsah"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "SouÄasný oddíl"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "PÅ™edchozí oddíl podle poÅ™adí Ätení"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "ZaÄátek této kapitoly nebo pÅ™edchozí kapitola"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Předchozí oddíl stejné úrovně"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Oddíl nahoru"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Další oddíl stejné úrovně"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Uzel nahoru"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Další uzel"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Předchozí uzel"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Další uzel podle poÅ™adí Ätení uzlů"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "PÅ™edchozí uzel podle poÅ™adí Ätení uzlů"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Další oddíl podle poÅ™adí Ätení"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Další kapitola"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Nápověda"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "První oddíl podle poÅ™adí Ätení"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Poslední oddíl podle poÅ™adí Ätení"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Oddíl vpřed v dalším souboru"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Oddíl zpět v předchozím souboru"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Tento"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Zpět"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Rychle zpět"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "Uzel nahoru"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "Další uzel"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "Předchozí uzel"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "Uzel vpřed"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "Uzel zpět"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Vpřed"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Rychle vpřed"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Nápověda"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "První"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Poslední"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "Další soubor"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "Předchozí soubor"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "O tomto dokumentu"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Obsah"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "StruÄný obsah"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Poznámky pod Äarou"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "vizte oddíl {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "vizte {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Vizte oddíl {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Vizte {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "vizte {reference} v @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "vizte @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "vizte „{section}“ v @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "vizte {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "vizte „{section}“"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Vizte {reference} v @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Vizte @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Vizte „{section}“ v @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Vizte {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Vizte „{section}“"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} v @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "„{section}“ v @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "„{section}“"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Přejít na"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Položka rejstříku"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Oddíl"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} třídy {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} třídy {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} na třídě {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} na třídě {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
@@ -780,23 +780,23 @@ msgstr ""
"{category} na třídě {class}:@* @emph{{type}}@* @strong{{name}} "
"@emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} na třídě {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} na třídě {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} na třídě {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
@@ -804,23 +804,23 @@ msgstr ""
"{category} třídy {class}:@* @emph{{type}}@* @strong{{name}} "
"@emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} třídy {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} třídy {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} třídy {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -829,41 +829,41 @@ msgstr ""
"Tento dokument byl vytvořen @emph{@today{}} pomocí @uref{{program_homepage}, "
"@emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Tento dokument byl vytvořen @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Uzel, který hledáte, se nachází na {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " TlaÄítka v navigaÄním panelu mají následující význam:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "TlaÄítko"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Název"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Přejít kam"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Z 1.2.3 přejít kam"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -872,47 +872,47 @@ msgstr ""
" kde @strong{ příklad } pÅ™edpokládá, že souÄasná poloha je "
"@strong{ Podpododdíl Jedna-dva-tři } dokumentu s následující strukturou:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Oddíl Jedna"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Pododdíl Jedna-jedna"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Pododdíl Jedna-dva"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Podpododdíl Jedna-dva-jedna"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Podpododdíl Jedna-dva-dva"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Podpododdíl Jedna-dva-tři"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "SouÄasná poloha"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Podpododdíl Jedna-dva-ÄtyÅ™i"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Pododdíl Jedna-tři"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Pododdíl Jedna-ÄtyÅ™i"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Nepojmenovaný dokument"
diff --git a/macros/texinfo/texinfo/po_document/da.gmo b/macros/texinfo/texinfo/po_document/da.gmo
deleted file mode 100644
index 9e3d117a60..0000000000
--- a/macros/texinfo/texinfo/po_document/da.gmo
+++ /dev/null
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/da.po b/macros/texinfo/texinfo/po_document/da.po
deleted file mode 100644
index 4e8fb07378..0000000000
--- a/macros/texinfo/texinfo/po_document/da.po
+++ /dev/null
@@ -1,3248 +0,0 @@
-# Danish texinfo translation po-file.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# This file is distributed under the same license as the texinfo package.
-# Claus Hindsgaul <claus_h@image.dk>, 2000-2001.
-# Joe Hansen <joedalton2@yahoo.dk>, 2015.
-#
-# argument -> parameter
-# brace -> [] firkantede parenteser
-# entry -> post
-# node -> emne
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: texinfo 6.0.90\n"
-"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2015-12-28 09:13GMT\n"
-"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
-msgid "Function"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:728
-msgid "Macro"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:729
-msgid "Special Form"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
-#, fuzzy
-msgid "Variable"
-msgstr "Angiv variabel: "
-
-#: tp/Texinfo/Common.pm:731
-#, fuzzy
-msgid "User Option"
-msgstr "Indsæt færdiggørelse"
-
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
-#, fuzzy
-msgid "Instance Variable"
-msgstr "Beskriv variabel: "
-
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
-msgid "Method"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1245
-#, perl-brace-format
-msgid "{category} on {class}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1252
-#, perl-brace-format
-msgid "{category} of {class}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1274
-#, perl-brace-format
-msgid "{month} {day}, {year}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
-#, perl-brace-format
-msgid "Appendix {number} {section_title}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
-#, perl-brace-format
-msgid "{number} {section_title}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1570
-#, perl-brace-format
-msgid "{float_type} {float_number}: "
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1574
-#, perl-brace-format
-msgid "{float_type}: "
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1579
-#, perl-brace-format
-msgid "{float_type} {float_number}\n"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1583
-#, perl-brace-format
-msgid "{float_type}\n"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1589
-#, perl-brace-format
-msgid "{float_number}: "
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1592
-#, perl-brace-format
-msgid "{float_number}\n"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2578
-#, perl-brace-format
-msgid "{name} on {class}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2588
-#, perl-brace-format
-msgid "{name} of {class}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:99
-msgid "error@arrow{}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:934
-msgid "January"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:935
-msgid "February"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:936
-#, fuzzy
-msgid "March"
-msgstr "Søg"
-
-#: tp/Texinfo/Convert/Converter.pm:937
-msgid "April"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:938
-msgid "May"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:939
-msgid "June"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:940
-msgid "July"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:941
-msgid "August"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:942
-msgid "September"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:943
-msgid "October"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:944
-msgid "November"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:945
-msgid "December"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:996
-#, perl-brace-format
-msgid "{float_type} {float_number}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:1000
-#, perl-brace-format
-msgid "{float_type}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:1004
-#, perl-brace-format
-msgid "{float_number}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:834
-#, perl-brace-format
-msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:839
-#, perl-brace-format
-msgid "See node @samp{{mynode}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:843
-#, perl-brace-format
-msgid "See Info file @file{{myfile}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:899
-#, perl-brace-format
-msgid "section ``{section_name}'' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:904
-#, perl-brace-format
-msgid "See section ``{section_name}'' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:909
-#, perl-brace-format
-msgid "see section ``{section_name}'' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
-#, perl-brace-format
-msgid "@cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
-#, perl-brace-format
-msgid "See @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
-#, perl-brace-format
-msgid "see @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:938
-#, perl-brace-format
-msgid "{title_ref}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:943
-#, perl-brace-format
-msgid "See {title_ref}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:948
-#, perl-brace-format
-msgid "see {title_ref}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
-#, perl-brace-format
-msgid "{abbr_or_acronym} ({explanation})"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
-#, perl-brace-format
-msgid "@b{{quotation_arg}:} "
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1275
-#, fuzzy
-msgid "(outside of any node)"
-msgstr "@%s udenfor et emne"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1863
-#, perl-brace-format
-msgid "{name} @url{{email}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1866
-#, perl-brace-format
-msgid "@url{{email}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1890
-#, perl-brace-format
-msgid "{text} ({url})"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1895
-#, perl-brace-format
-msgid "@t{<{url}>}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
-#, perl-brace-format
-msgid "@{No value for `{value}'@}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2787
-#, perl-brace-format
-msgid "@tie{}-- {category}: {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2792
-#, perl-brace-format
-msgid "@tie{}-- {category}: {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2805
-#, perl-brace-format
-msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2808
-#, perl-brace-format
-msgid "@tie{}-- {category}: {type} {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2817
-#, perl-brace-format
-msgid "@tie{}-- {category}:@*{type}@*{name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2820
-#, perl-brace-format
-msgid "@tie{}-- {category}: {type} {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2828
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}: {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2834
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}: {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2843
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}: {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2849
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}: {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2864
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2868
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2879
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2883
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}: {type} {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2897
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2901
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2912
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2916
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}: {type} {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
-#, perl-brace-format
-msgid "@center --- @emph{{author}}\n"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
-msgid "Top"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
-msgid "Contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
-msgid "Overview"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
-#, fuzzy
-msgid "Index"
-msgstr "Indeksemne"
-
-#: tp/Texinfo/Convert/HTML.pm:745
-msgid "current"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
-msgid "Prev"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:749
-msgid " Up "
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
-msgid "Next"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
-msgid "Up"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:756
-msgid "Previous"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:757
-msgid "Forward node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:758
-msgid "Back node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:764
-#, fuzzy
-msgid "Next file"
-msgstr "%s: tom fil"
-
-#: tp/Texinfo/Convert/HTML.pm:765
-msgid "Previous file"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:771
-msgid "Cover (top) of document"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:772
-msgid "Table of contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:773
-msgid "Short table of contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:775
-#, fuzzy
-msgid "Current section"
-msgstr "Afbryd nuværende handling"
-
-#: tp/Texinfo/Convert/HTML.pm:776
-msgid "Previous section in reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:777
-msgid "Beginning of this chapter or previous chapter"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:778
-msgid "Previous section on same level"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:779
-msgid "Up section"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:780
-msgid "Next section on same level"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:781
-msgid "Up node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:782
-#, fuzzy
-msgid "Next node"
-msgstr "Vælg det næste emne"
-
-#: tp/Texinfo/Convert/HTML.pm:783
-msgid "Previous node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:784
-msgid "Next node in node reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:785
-msgid "Previous node in node reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:786
-msgid "Next section in reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:787
-msgid "Next chapter"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:788
-msgid "About (help)"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:789
-msgid "First section in reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:790
-msgid "Last section in reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:791
-msgid "Forward section in next file"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:792
-#, fuzzy
-msgid "Back section in previous file"
-msgstr "Gendan en tidligere sletning"
-
-#: tp/Texinfo/Convert/HTML.pm:801
-msgid "This"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:802
-msgid "Back"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:803
-msgid "FastBack"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:807
-msgid "NodeUp"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:808
-msgid "NodeNext"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:809
-msgid "NodePrev"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:810
-msgid "NodeForward"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:811
-msgid "NodeBack"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:812
-msgid "Forward"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:813
-msgid "FastForward"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:814
-msgid "About"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:815
-msgid "First"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:816
-msgid "Last"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:817
-msgid "NextFile"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:818
-msgid "PrevFile"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:822
-msgid "About This Document"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:823
-msgid "Table of Contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:824
-msgid "Short Table of Contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:825
-msgid "Footnotes"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:1533
-#, perl-brace-format
-msgid "{explained_string} ({explanation})"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3196
-#, perl-brace-format
-msgid "see section {reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3199
-#, perl-brace-format
-msgid "see {reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3204
-#, perl-brace-format
-msgid "See section {reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3207
-#, perl-brace-format
-msgid "See {reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3211
-#, perl-brace-format
-msgid "{reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3273
-#, perl-brace-format
-msgid "see {reference} in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3277
-#, perl-brace-format
-msgid "see @cite{{book_reference}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3281
-#, perl-brace-format
-msgid "see `{section}' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3288
-#, perl-brace-format
-msgid "see {reference}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3291
-#, perl-brace-format
-msgid "see `{section}'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3296
-#, perl-brace-format
-msgid "See {reference} in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3300
-#, perl-brace-format
-msgid "See @cite{{book_reference}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3304
-#, perl-brace-format
-msgid "See `{section}' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3311
-#, perl-brace-format
-msgid "See {reference}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3314
-#, perl-brace-format
-msgid "See `{section}'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3319
-#, perl-brace-format
-msgid "{reference} in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3323
-#, perl-brace-format
-msgid "@cite{{book_reference}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3327
-#, perl-brace-format
-msgid "`{section}' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3334
-#, perl-brace-format
-msgid "{reference}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3337
-#, perl-brace-format
-msgid "`{section}'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3450
-msgid "Jump to"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3458
-#, fuzzy
-msgid "Index Entry"
-msgstr "Indekspost:"
-
-#: tp/Texinfo/Convert/HTML.pm:3460
-#, fuzzy
-msgid "Section"
-msgstr "Eneste færdiggørelse"
-
-#: tp/Texinfo/Convert/HTML.pm:4080
-#, perl-brace-format
-msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4085
-#, perl-brace-format
-msgid "{category}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4102
-#, perl-brace-format
-msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4106
-#, perl-brace-format
-msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4115
-#, perl-brace-format
-msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4118
-#, perl-brace-format
-msgid "{category}: @emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4126
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4132
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4141
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4147
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4162
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4166
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4177
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4181
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4195
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4199
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4210
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4214
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6181
-#, perl-brace-format
-msgid ""
-"This document was generated on @emph{@today{}} using "
-"@uref{{program_homepage}, @emph{{program}}}."
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6186
-msgid "This document was generated on @emph{@today{}}."
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6237
-#, perl-brace-format
-msgid "{element_text} ({title})"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6381
-#, perl-brace-format
-msgid "The node you are looking for is at {href}."
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6450
-msgid " The buttons in the navigation panels have the following meaning:"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6456
-msgid "Button"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6457
-msgid "Name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6458
-msgid "Go to"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6459
-msgid "From 1.2.3 go to"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6485
-msgid ""
-" where the @strong{ Example } assumes that the current position is at "
-"@strong{ Subsubsection One-Two-Three } of a document of the following "
-"structure:"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6495
-msgid "Section One"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6497
-msgid "Subsection One-One"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6504
-msgid "Subsection One-Two"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6506
-msgid "Subsubsection One-Two-One"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6507
-msgid "Subsubsection One-Two-Two"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6508
-msgid "Subsubsection One-Two-Three"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6510
-#, fuzzy
-msgid "Current Position"
-msgstr "Afbryd nuværende handling"
-
-#: tp/Texinfo/Convert/HTML.pm:6511
-msgid "Subsubsection One-Two-Four"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6514
-msgid "Subsection One-Three"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6521
-msgid "Subsection One-Four"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6929
-msgid "Untitled Document"
-msgstr ""
-
-#~ msgid "Unknown system error"
-#~ msgstr "Ukendt systemfejl"
-
-#~ msgid "%s: option '%s' is ambiguous; possibilities:"
-#~ msgstr "%s: tilvalget »%s« er tvetydigt: muligheder:"
-
-#~ msgid "%s: option '%s' is ambiguous\n"
-#~ msgstr "%s: tilvalget »%s« er tvetydigt\n"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: tilvalget »--%s« tillader ikke et argument\n"
-
-#~ msgid "%s: option '%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: tilvalget »%c%s« tillader ikke et argument\n"
-
-#~ msgid "%s: option '--%s' requires an argument\n"
-#~ msgstr "%s: tilvalget »--%s« kræver et argument\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: ikke genkendt tilvalg »--%s«\n"
-
-#~ msgid "%s: unrecognized option '%c%s'\n"
-#~ msgstr "%s: ikke genkendt tilvalg »%c%s«\n"
-
-#~ msgid "%s: invalid option -- '%c'\n"
-#~ msgstr "%s: ugyldigt tilvalg -- »%c«\n"
-
-#~ msgid "%s: option requires an argument -- '%c'\n"
-#~ msgstr "%s: tilvalget kræver et argument -- »%c«\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: tilvalget »-W %s« er tvetydigt\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: tilvalget »-W %s« tillader ikke et argument\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: tilvalget »-W %s« kræver et argument\n"
-
-#~ msgid "No match"
-#~ msgstr "Intet match"
-
-#~ msgid "Invalid regular expression"
-#~ msgstr "Ugyldigt regulært udtryk"
-
-# http://en.wikipedia.org/wiki/Collation sortering?
-#~ msgid "Invalid collation character"
-#~ msgstr "Ugyldigt sorteringstegn"
-
-#~ msgid "Invalid character class name"
-#~ msgstr "Ugyldigt tegnklassenavn"
-
-#~ msgid "Trailing backslash"
-#~ msgstr "Afsluttende omvendt skråstreg"
-
-#~ msgid "Invalid back reference"
-#~ msgstr "Ugyldig tilbagereference"
-
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Uparret [ eller [^"
-
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Uparret ( eller \\("
-
-#~ msgid "Unmatched \\{"
-#~ msgstr "Uparret \\{"
-
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Ugyldigt indhold for \\{\\}"
-
-#~ msgid "Invalid range end"
-#~ msgstr "Ugyldig intervalafslutning"
-
-#~ msgid "Memory exhausted"
-#~ msgstr "Hukommelsen er opbrugt"
-
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Ugyldigt foregående regulært udtryk"
-
-#~ msgid "Premature end of regular expression"
-#~ msgstr "For tidlig slut på regulært udtryk"
-
-#~ msgid "Regular expression too big"
-#~ msgstr "Regulært udtryk er for stort"
-
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Uparret ) eller \\)"
-
-#~ msgid "No previous regular expression"
-#~ msgstr "Intet tidligere regulært udtryk"
-
-#~ msgid "memory exhausted"
-#~ msgstr "hukommelsen er opbrugt"
-
-#~ msgid "Move forward a character"
-#~ msgstr "GÃ¥ et tegn frem"
-
-#~ msgid "Move backward a character"
-#~ msgstr "GÃ¥ et tegn tilbage"
-
-#~ msgid "Move to the start of this line"
-#~ msgstr "GÃ¥ til starten af linjen"
-
-#~ msgid "Move to the end of this line"
-#~ msgstr "GÃ¥ til slutning af linjen"
-
-#~ msgid "Move forward a word"
-#~ msgstr "Ryk et ord frem"
-
-#~ msgid "Move backward a word"
-#~ msgstr "Ryk et ord tilbage"
-
-#~ msgid "Delete the character under the cursor"
-#~ msgstr "Slet tegnet under markøren"
-
-#~ msgid "Delete the character behind the cursor"
-#~ msgstr "Slet tegnet efter markøren"
-
-#~ msgid "Cancel or quit operation"
-#~ msgstr "Afbryd eller afslut operation"
-
-#~ msgid "Accept (or force completion of) this line"
-#~ msgstr "Accepter (eller gennemtving afslutning af) linjen"
-
-#~ msgid "Insert next character verbatim"
-#~ msgstr "Indsæt næste tegn ordret"
-
-#~ msgid "Insert a TAB character"
-#~ msgstr "Indsæt et TABULATOR-tegn"
-
-#~ msgid "Transpose characters at point"
-#~ msgstr "Transponer tegn ved markør"
-
-#~ msgid "Yank back the contents of the last kill"
-#~ msgstr "Gendan indholdet fra sidste sletning"
-
-#~ msgid "Kill ring is empty"
-#~ msgstr "Sletningsring er tom"
-
-#~ msgid "Kill to the end of the line"
-#~ msgstr "Slet resten af linjen"
-
-#~ msgid "Kill to the beginning of the line"
-#~ msgstr "Slet bagud til linjestart"
-
-#~ msgid "Kill the word following the cursor"
-#~ msgstr "Slet resten af ordet"
-
-#~ msgid "Kill the word preceding the cursor"
-#~ msgstr "Slet ordet før markøren"
-
-#~ msgid "No completions"
-#~ msgstr "Ingen færdiggørelser"
-
-#~ msgid "Not complete"
-#~ msgstr "Ikke færdig"
-
-#~ msgid "List possible completions"
-#~ msgstr "Vis mulige færdiggørelser"
-
-#~ msgid "%d completion:\n"
-#~ msgid_plural "%d completions:\n"
-#~ msgstr[0] "%d færdiggørelse:\n"
-#~ msgstr[1] "%d færdiggørelser:\n"
-
-#~ msgid "Building completions..."
-#~ msgstr "Bygger færdiggørelser ..."
-
-#~ msgid "Scroll the completions window"
-#~ msgstr "Rul færdiggørelsesvinduet"
-
-#~ msgid "looking for file \"%s\""
-#~ msgstr "kigger efter filen »%s«"
-
-#~ msgid "looking for file %s in %s"
-#~ msgstr "kigger efter filen %s i %s"
-
-#~ msgid "found file %s"
-#~ msgstr "fandt filen %s"
-
-#~ msgid "Footnotes could not be displayed"
-#~ msgstr "Fodnoter kunne ikke vises"
-
-#~ msgid "Show the footnotes associated with this node in another window"
-#~ msgstr "Vis fodnoter, det hører til dette emne i et andet vindue"
-
-#~ msgid "---------- Footnotes ----------"
-#~ msgstr "---------- Fodnoter -----------"
-
-#~ msgid "Finding index entries..."
-#~ msgstr "Finder indekspunkter ..."
-
-#~ msgid "Look up a string in the index for this file"
-#~ msgstr "Slå en tekst op i denne fils indeks."
-
-#~ msgid "No indices found."
-#~ msgstr "Ingen indeks fundet."
-
-#~ msgid "Found '%s' in %s. ('\\[next-index-match]' tries to find next.)"
-#~ msgstr "Fandt »%s« i %s. (»\\[next-index-match]« søger efter den næste.)"
-
-#~ msgid ""
-#~ "Go to the next matching index item from the last '\\[index-search]' "
-#~ "command"
-#~ msgstr ""
-#~ "Gå til næste fundne indekspunkt fra sidste »\\[index-search]«-kommando"
-
-#~ msgid "No previous index search string."
-#~ msgstr "Ingen tidligere indekssøgestreng."
-
-#~ msgid "No more index entries containing '%s'."
-#~ msgstr "Ikke flere indekspunkter indeholdende »%s«."
-
-#~ msgid "No index entries containing '%s'."
-#~ msgstr "Ingen indeksposter indeholdende »%s«."
-
-#~ msgid "Scanning indices of '%s'..."
-#~ msgstr "Skanner indeks for »%s« ..."
-
-#~ msgid "Grovel all known info file's indices for a string and build a menu"
-#~ msgstr ""
-#~ "Gennemtrævl alle kendte Info-filers indekser for en tekst og opbyg en menu"
-
-#~ msgid "Index apropos"
-#~ msgstr "Indeks apropos"
-
-#~ msgid "Index entries containing '%s':\n"
-#~ msgstr "Indeksposter indeholdende »%s«:\n"
-
-#~ msgid "List all matches of a string in the index"
-#~ msgstr "Vis alle match for en streng i indekset"
-
-#~ msgid "No available info files have '%s' in their indices."
-#~ msgstr "Ingen tilgængelige info-filer har »%s« i deres indeks."
-
-#~ msgid "Error converting file character encoding."
-#~ msgstr "Der opstod en fejl under konvertering af filtegnkodning"
-
-#~ msgid "No menu item '%s' in node '%s'."
-#~ msgstr "Intet menupunkt »%s« i emne »%s«."
-
-#~ msgid "No file given for node '%s'."
-#~ msgstr "Ingen fil angivet for emnet »%s«."
-
-#~ msgid "Cannot find node '%s'."
-#~ msgstr "Kan ikke finde emnet »%s«."
-
-#~ msgid "No program name given."
-#~ msgstr "Intet programnavn angivet."
-
-#~ msgid "invalid number: %s\n"
-#~ msgstr "ugyldigt nummer: %s\n"
-
-#~ msgid "malformed variable assignment: %s"
-#~ msgstr "forkert udformet variabeludtryk: %s"
-
-#~ msgid "%s: no such variable"
-#~ msgstr "%s: ingen sådan variabel"
-
-#~ msgid "value %s is not valid for variable %s"
-#~ msgstr "værdien %s er ikke gyldig for variabel %s"
-
-#~ msgid "Try --help for more information.\n"
-#~ msgstr "Prøv --help for yderligere information.\n"
-
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ msgstr ""
-#~ "Ophavsret (C) %s Free Software Foundation, Inc.\n"
-#~ "Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/"
-#~ "gpl.html>.\n"
-#~ "Dette er et frit program: du kan frit ændre og videredistribuere "
-#~ "programmet.\n"
-#~ "Der er ingen GARANTI, inden for lovens udstrækning.\n"
-#~ "\n"
-
-#~ msgid "no index entries found for '%s'\n"
-#~ msgstr "ingen indeksposter fundet for «%s»\n"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION]... [MENU-ITEM...]\n"
-#~ "\n"
-#~ "Read documentation in Info format.\n"
-#~ msgstr ""
-#~ "Brug: %s [TILVALG]... [MENU-ITEM...]\n"
-#~ "\n"
-#~ "Læs dokumentationen i Info-formatet.\n"
-
-#~ msgid ""
-#~ "Options:\n"
-#~ " -a, --all use all matching manuals.\n"
-#~ " -k, --apropos=STRING look up STRING in all indices of all "
-#~ "manuals.\n"
-#~ " -d, --directory=DIR add DIR to INFOPATH.\n"
-#~ " --dribble=FILE remember user keystrokes in FILENAME.\n"
-#~ " -f, --file=MANUAL specify Info manual to visit."
-#~ msgstr ""
-#~ "Tilvalg:\n"
-#~ " -a, --all brug alle matchende manualer.\n"
-#~ " -k, --apropos=STRENG slå STRENG op i alle indeks for alle "
-#~ "manualer.\n"
-#~ " -d, --directory=MAPPE tilføj MAPPE til INFOSTI.\n"
-#~ " --dribble=FIL husk brugertast i FILNAVN.\n"
-#~ " -f, --file=MANUAL specificer Info-manual der skal besøges."
-
-#~ msgid ""
-#~ " -h, --help display this help and exit.\n"
-#~ " --index-search=STRING go to node pointed by index entry STRING.\n"
-#~ " -n, --node=NODENAME specify nodes in first visited Info file.\n"
-#~ " -o, --output=FILE output selected nodes to FILE."
-#~ msgstr ""
-#~ " -h, --help vis denne hjælpetekst og afslut.\n"
-#~ " --index-search=STRENG gå til emne som som peget på af "
-#~ "indekspost-\n"
-#~ " STRENG.\n"
-#~ " -n, --node=EMNENAV specificer emner i først besøgte Info-"
-#~ "fil.\n"
-#~ " -o, --output=FIL dan valgte emner i FIL."
-
-#~ msgid ""
-#~ " -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
-#~ " --no-raw-escapes output escapes as literal text.\n"
-#~ " --restore=FILE read initial keystrokes from FILE.\n"
-#~ " -O, --show-options, --usage go to command-line options node."
-#~ msgstr ""
-#~ " -R, --raw-escapes vis »raw« ANSI-undvigetegn (standard).\n"
-#~ " --no-raw-escapes vis undvigetegn som bogstavelig tekst.\n"
-#~ " --restore=FIL læs oprindelig tastetryk fra FIL.\n"
-#~ " -O, --show-options, --usage gå til tilvalgsemne for kommandolinjen."
-
-#~ msgid " -b, --speech-friendly be friendly to speech synthesizers."
-#~ msgstr " -b, --speech-friendly vær talesyntese-venlig."
-
-#~ msgid ""
-#~ "Email bug reports to bug-texinfo@gnu.org,\n"
-#~ "general questions and discussion to help-texinfo@gnu.org.\n"
-#~ "Texinfo home page: http://www.gnu.org/software/texinfo/"
-#~ msgstr ""
-#~ "Rapporter fejl i programmet på engelsk til bug-texinfo@gnu.org,\n"
-#~ "generelle spørgsmål og diskussion til help-texinfo@gnu.org,\n"
-#~ "oversættelsesfejl til dansk@dansk-gruppen.dk.\n"
-#~ "Texinfos hjemmeside: http://www.gnu.org/software/texinfo/"
-
-#~ msgid "Cannot find node '(%s)%s'."
-#~ msgstr "Kan ikke finde emne »(%s)%s«."
-
-#~ msgid "Cannot find a window!"
-#~ msgstr "Kan ikke finde et vindue!"
-
-#~ msgid "Point doesn't appear within this window's node!"
-#~ msgstr "Punktet optræder ikke i dette vindues emne!"
-
-#~ msgid "Cannot delete the last window."
-#~ msgstr "Kan ikke slette det sidste vindue."
-
-#~ msgid "No menu in this node."
-#~ msgstr "Ingen menu i dette emne."
-
-#~ msgid "No footnotes in this node."
-#~ msgstr "Ingen fodnoter i dette emne."
-
-#~ msgid "No cross references in this node."
-#~ msgstr "Ingen krydsreferencer i dette emne."
-
-#~ msgid "No '%s' pointer for this node."
-#~ msgstr "Ingen »%s«-peger mod dette emne."
-
-#~ msgid "Unknown Info command '%c'; try '?' for help."
-#~ msgstr "Ukendt Info-kommando »%c«; prøv »?« for hjælp."
-
-#~ msgid "Terminal type '%s' is not smart enough to run Info."
-#~ msgstr "Terminaltypen »%s« er ikke smart nok til at køre Info."
-
-#~ msgid "You are already at the last page of this node."
-#~ msgstr "Du er i forvejen ved emnets sidste side."
-
-#~ msgid "You are already at the first page of this node."
-#~ msgstr "Du er i forvejen ved emnets første side."
-
-#~ msgid "Only one window."
-#~ msgstr "Kun ét vindue."
-
-#~ msgid "Resulting window would be too small."
-#~ msgstr "Det resulterende vindue ville være for lille."
-
-#~ msgid "Not enough room for a help window, please delete a window."
-#~ msgstr "Ikke nok plads til et hjælpevindue. Fjern venligst et vindue."
-
-#~ msgid "Basic Info command keys\n"
-#~ msgstr "Grundlæggende Info-kommandotaster\n"
-
-#~ msgid "\\%-10[quit-help] Close this help window.\n"
-#~ msgstr "\\%-10[quit-help] Luk denne hjælp.\n"
-
-#~ msgid "\\%-10[quit] Quit Info altogether.\n"
-#~ msgstr "\\%-10[quit] Afslut hele Info-programmet.\n"
-
-#~ msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n"
-#~ msgstr "\\%-10[get-info-help-node] Kør Info-introduktionen.\n"
-
-#~ msgid "\\%-10[prev-line] Move up one line.\n"
-#~ msgstr "\\%-10[prev-line] Flyt en linje op.\n"
-
-#~ msgid "\\%-10[next-line] Move down one line.\n"
-#~ msgstr "\\%-10[next-line] Flyt en linje ned.\n"
-
-#~ msgid "\\%-10[scroll-backward] Scroll backward one screenful.\n"
-#~ msgstr "\\%-10[scroll-backward] Rul en skærmside tilbage.\n"
-
-#~ msgid "\\%-10[scroll-forward] Scroll forward one screenful.\n"
-#~ msgstr "\\%-10[scroll-forward] Rul en skærmside frem.\n"
-
-#~ msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n"
-#~ msgstr "\\%-10[beginning-of-node] GÃ¥ til starten af emnet.\n"
-
-#~ msgid "\\%-10[end-of-node] Go to the end of this node.\n"
-#~ msgstr "\\%-10[end-of-node] GÃ¥ til enden af emnet.\n"
-
-#~ msgid "\\%-10[move-to-next-xref] Skip to the next hypertext link.\n"
-#~ msgstr "\\%-10[move-to-next-xref] Hop til næste hypertekst-henvisning.\n"
-
-#~ msgid ""
-#~ "\\%-10[select-reference-this-line] Follow the hypertext link under the "
-#~ "cursor.\n"
-#~ msgstr ""
-#~ "\\%-10[select-reference-this-line] Følg hypertekst-henvisningen under "
-#~ "markøren.\n"
-
-#~ msgid ""
-#~ "\\%-10[history-node] Go back to the last node seen in this window.\n"
-#~ msgstr ""
-#~ "\\%-10[history-node] GÃ¥ tilbage til vinduets sidste synlige emne.\n"
-
-#~ msgid "\\%-10[global-prev-node] Go to the previous node in the document.\n"
-#~ msgstr "\\%-10[global-prev-node] GÃ¥ til forrige emne i dokumentet.\n"
-
-#~ msgid "\\%-10[global-next-node] Go to the next node in the document.\n"
-#~ msgstr "\\%-10[global-next-node] Gå til næste emne i dokumentet.\n"
-
-#~ msgid "\\%-10[prev-node] Go to the previous node on this level.\n"
-#~ msgstr "\\%-10[prev-node] Gå til forrige emne på dette niveau.\n"
-
-#~ msgid "\\%-10[next-node] Go to the next node on this level.\n"
-#~ msgstr "\\%-10[next-node] Gå til næste emne på dette niveau.\n"
-
-#~ msgid "\\%-10[up-node] Go up one level.\n"
-#~ msgstr "\\%-10[up-node] GÃ¥ et niveau op.\n"
-
-#~ msgid "\\%-10[top-node] Go to the top node of this document.\n"
-#~ msgstr "\\%-10[top-node] GÃ¥ til topemnet i dette dokument.\n"
-
-#~ msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
-#~ msgstr "\\%-10[dir-node] Gå til hovedemnets »mappe«.\n"
-
-#~ msgid "1...9 Pick the first...ninth item in this node's menu.\n"
-#~ msgstr "1...9 Vælg første ... niende punkt i dette emnes menu.\n"
-
-#~ msgid "\\%-10[last-menu-item] Pick the last item in this node's menu.\n"
-#~ msgstr "\\%-10[last-menu-item] Vælg sidste punkt i dette emnes menu.\n"
-
-#~ msgid "\\%-10[menu-item] Pick a menu item specified by name.\n"
-#~ msgstr "\\%-10[menu-item] Vælg menupunkt angivet ved navn.\n"
-
-#~ msgid "\\%-10[xref-item] Follow a cross reference specified by name.\n"
-#~ msgstr "\\%-10[xref-item] Følg en krydshenvisning angivet ved navn.\n"
-
-#~ msgid "\\%-10[goto-node] Go to a node specified by name.\n"
-#~ msgstr "\\%-10[goto-node] GÃ¥ til et emne angivet ved navn.\n"
-
-#~ msgid "\\%-10[search] Search forward for a specified string.\n"
-#~ msgstr "\\%-10[search] Søg fremad efter en given streng.\n"
-
-#~ msgid "\\%-10[search-previous] Search for previous occurrence.\n"
-#~ msgstr "\\%-10[search-previous] Søg efter tidligere forekomster.\n"
-
-#~ msgid "\\%-10[search-next] Search for next occurrence.\n"
-#~ msgstr "\\%-10[search-next] Søg efter næste forekomster.\n"
-
-#~ msgid ""
-#~ "\\%-10[index-search] Search for a specified string in the index, and\n"
-#~ " select the node referenced by the first entry found.\n"
-#~ msgstr ""
-#~ "\\%-10[index-search] Søg efter den angivne streng i dette indeks, og\n"
-#~ " vælg emnet refereret af det først fundne punkt.\n"
-
-#~ msgid "\\%-10[virtual-index] Synthesize menu of matching index entries.\n"
-#~ msgstr ""
-#~ "\\%-10[virtual-index] Syntetiser menu med matchende indekspunkter.\n"
-
-#~ msgid "\\%-10[abort-key] Cancel the current operation.\n"
-#~ msgstr "\\%-10[abort-key] Afbryd nuværende operation.\n"
-
-#~ msgid "This is GNU Info version %s. "
-#~ msgstr "Dette er GNU Info version %s. "
-
-#~ msgid "The current search path is:\n"
-#~ msgstr "Den nuværende søgesti er:\n"
-
-#~ msgid ""
-#~ "Commands available in Info windows:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Tilgængelige kommandoer i infovinduer:\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Commands available in the echo area:\n"
-#~ "\n"
-#~ msgstr "Kommandoer tilgængelige i ekko-området:\n"
-
-#~ msgid ""
-#~ "The following commands can only be invoked via %s:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Følgende kommandoer kan kun køres via %s:\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "The following commands cannot be invoked at all:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Følgende kommandoer kan slet ikke køres:\n"
-#~ "\n"
-
-#~ msgid "Display help message"
-#~ msgstr "Vis denne hjælpetekst"
-
-#~ msgid "Visit Info node '(info)Help'"
-#~ msgstr "Besøg Info-emnet »(info)Help«"
-
-#~ msgid "Print documentation for KEY"
-#~ msgstr "Vis dokumentation for TAST"
-
-#~ msgid "Describe key: %s"
-#~ msgstr "Beskriv tast: %s"
-
-#~ msgid "%s is undefined."
-#~ msgstr "%s er ikke defineret."
-
-#~ msgid "Show what to type to execute a given command"
-#~ msgstr "Vis hvad der skal tastes, for at udføre en given kommando"
-
-#~ msgid "Where is command: "
-#~ msgstr "Hvor er kommando: "
-
-#~ msgid "'%s' is not on any keys"
-#~ msgstr "»%s« er ikke på nogen taster"
-
-#~ msgid "%s can only be invoked via %s."
-#~ msgstr "%s kan kun udføres via %s."
-
-#~ msgid "%s can be invoked via %s."
-#~ msgstr "%s kan udføres via %s."
-
-#~ msgid "There is no function named '%s'"
-#~ msgstr "Der er ingen funktion navngivet »%s«"
-
-#~ msgid "could not open init file %s"
-#~ msgstr "kunne ikke åbne init-fil %s"
-
-#~ msgid "key sequence too long"
-#~ msgstr "tastesekvens er for lang"
-
-#~ msgid "missing key sequence"
-#~ msgstr "manglende tastesekvens"
-
-#~ msgid "NUL character (\\000) not permitted"
-#~ msgstr "Nultegn (\\000) er ikke tilladt"
-
-#~ msgid "NUL character (^%c) not permitted"
-#~ msgstr "Nultegn (^%c) er ikke tilladt"
-
-#~ msgid "missing action name"
-#~ msgstr "manglende handlingsnavn"
-
-#~ msgid "cannot bind key sequence to menu-digit"
-#~ msgstr "kan ikke binde tastesekvens til menu-digit"
-
-#~ msgid "unknown action `%s'"
-#~ msgstr "ukendt handling »%s«"
-
-#~ msgid "action name too long"
-#~ msgstr "handlingsnavn er for langt"
-
-#~ msgid "extra characters following action `%s'"
-#~ msgstr "ekstra tegn følger handlingen »%s«"
-
-#~ msgid "missing variable name"
-#~ msgstr "manglende variabelnavn"
-
-#~ msgid "missing `=' immediately after variable name"
-#~ msgstr "manglende »=« umiddelbart efter variabelnavn"
-
-#~ msgid "variable name too long"
-#~ msgstr "variabelnavn er for langt"
-
-#~ msgid "value too long"
-#~ msgstr "værdien er for lang"
-
-#~ msgid "\"%s\", line %u: "
-#~ msgstr "»%s«, linje %u: "
-
-#~ msgid "Read the name of an Info command and describe it"
-#~ msgstr "Indlæs navnet på en info-kommando og beskriv den"
-
-#~ msgid "Describe command: "
-#~ msgstr "Beskriv kommando: "
-
-#~ msgid "Read a command name in the echo area and execute it"
-#~ msgstr "Indlæs et kommandonavn i ekko-området og udfør den"
-
-#~ msgid "Cannot execute an 'echo-area' command here."
-#~ msgstr "Kan ikke udføre en »ekko-område«-kommando her."
-
-#~ msgid "Undefined command: %s"
-#~ msgstr "Ikke defineret kommando: %s"
-
-#~ msgid "Set the height of the displayed window"
-#~ msgstr "Sæt højden på det viste vindue"
-
-#~ msgid "Set screen height to (%d): "
-#~ msgstr "Sæt skærmhøjden til (%d): "
-
-#~ msgid ""
-#~ " Source files groveled to make this file include:\n"
-#~ "\n"
-#~ msgstr ""
-#~ " Kildetekster gennemtrævlet for at inkludere filen;\n"
-#~ "\n"
-
-#~ msgid "Couldn't manipulate the file %s.\n"
-#~ msgstr "Kunne ikke manipulere filen %s.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "* Menu:\n"
-#~ "\n"
-#~ " (File)Node Lines Size Containing File\n"
-#~ " ---------- ----- ---- ---------------"
-#~ msgstr ""
-#~ "\n"
-#~ "* Menu:\n"
-#~ " (Fil)Emne linjer Størr. Indeholder fil\n"
-#~ " --------- ------ ------ --------------"
-
-#~ msgid ""
-#~ "Here is the menu of nodes you have recently visited.\n"
-#~ "Select one from this menu, or use '\\[history-node]' in another window.\n"
-#~ msgstr ""
-#~ "Her er menuen med emner, du har besøgt for nylig.\n"
-#~ "Vælg et fra denne menu eller brug »\\[history-node]« i et andet vindue,\n"
-
-#~ msgid ""
-#~ "Make a window containing a menu of all of the currently visited nodes"
-#~ msgstr ""
-#~ "Opret et vindue med en menu, der indeholder alle nyligt besøgte emner"
-
-#~ msgid "Select a node which has been previously visited in a visible window"
-#~ msgstr "Vælg et emne, som tidligere har været besøgt i et synligt vindue"
-
-#~ msgid "Select visited node: "
-#~ msgstr "Vælg besøgt emne: "
-
-#~ msgid "The reference disappeared! (%s)."
-#~ msgstr "Referencen forsvandt! (%s)."
-
-#~ msgid "Terminal cannot be initialized: %s\n"
-#~ msgstr "Terminal kan ikke initialiseres: %s\n"
-
-#~ msgid "regexp error: %s"
-#~ msgstr "fejl i regulært udtryk: %s"
-
-#~ msgid "Show all matching files"
-#~ msgstr "Vis alle matchende filer"
-
-#~ msgid "No file index"
-#~ msgstr "Intet filindeks"
-
-#~ msgid ""
-#~ "Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-"
-#~ "info-help-node] for tutorial."
-#~ msgstr ""
-#~ "Velkommen til Info version %s. Skriv \\[get-help-window] for hjælp. [get-"
-#~ "info-help-node] for øvelse."
-
-#~ msgid "can't open %s: %s"
-#~ msgstr "kan ikke åbne %s: %s"
-
-#~ msgid "debugging output diverted to \"%s\""
-#~ msgstr "fejlsøgningsresultat sendt til »%s«"
-
-#~ msgid "Move down to the next line"
-#~ msgstr "Gå ned til næste linje"
-
-#~ msgid "Move up to the previous line"
-#~ msgstr "GÃ¥ op til forrige linje"
-
-#~ msgid "Move the cursor to a specific line of the window"
-#~ msgstr "Flyt markør til bestemt linje i vinduet"
-
-#~ msgid "Move to the end of the line"
-#~ msgstr "GÃ¥ til linjeslutning"
-
-#~ msgid "Move to the start of the line"
-#~ msgstr "GÃ¥ til linjestart"
-
-#~ msgid "Move to the start of this node"
-#~ msgstr "GÃ¥ til starten af dette emne"
-
-#~ msgid "Move to the end of this node"
-#~ msgstr "GÃ¥ til afslutningen af dette emne"
-
-#~ msgid "Scroll forward in this window"
-#~ msgstr "Rul tilbage i vinduet"
-
-#~ msgid "Scroll backward in this window"
-#~ msgstr "Rul tilbage i vinduet"
-
-#~ msgid "Scroll forward in this window and set default window size"
-#~ msgstr "Rul frem i vinduet og sæt standard vinduesstørrelse"
-
-#~ msgid "Scroll backward in this window and set default window size"
-#~ msgstr "Rul tilbage i vinduet og sæt standard vinduesstørrelse"
-
-#~ msgid "Scroll forward in this window staying within node"
-#~ msgstr "Rul frem i vinduet i samme emne"
-
-#~ msgid "Scroll backward in this window staying within node"
-#~ msgstr "Rul tilbage i vinduet indenfor samme emne"
-
-#~ msgid ""
-#~ "Scroll forward in this window staying within node and set default window "
-#~ "size"
-#~ msgstr "Rul frem i vinduet i samme emne og sæt standard vinduesstørrelse"
-
-#~ msgid ""
-#~ "Scroll backward in this window staying within node and set default window "
-#~ "size"
-#~ msgstr ""
-#~ "Rul tilbage i vinduet indenfor samme emne og sæt standard vinduesstørrelse"
-
-#~ msgid "Scroll down by lines"
-#~ msgstr "Rul N linjer ned"
-
-#~ msgid "Scroll up by lines"
-#~ msgstr "Rul N linjer op"
-
-#~ msgid "Scroll down by half screen size"
-#~ msgstr "Rul en halv skærmstørrelse ned"
-
-#~ msgid "Scroll up by half screen size"
-#~ msgstr "Rul en halv skærmstørrelse op"
-
-#~ msgid "Scroll the other window"
-#~ msgstr "Rul det andet vindue"
-
-#~ msgid "Scroll the other window backward"
-#~ msgstr "Rul det andet vindue baglæns"
-
-#~ msgid "Select the next window"
-#~ msgstr "Vælg det næste vindue"
-
-#~ msgid "Select the previous window"
-#~ msgstr "Vælg det forrige vindue"
-
-#~ msgid "Split the current window"
-#~ msgstr "Opdel nuværende vindue"
-
-#~ msgid "Delete the current window"
-#~ msgstr "Slet nuværende vindue"
-
-#~ msgid "Cannot delete a permanent window"
-#~ msgstr "Kan ikke slette et permanent vindue"
-
-#~ msgid "Delete all other windows"
-#~ msgstr "Slet alle andre vinduer"
-
-#~ msgid "Grow (or shrink) this window"
-#~ msgstr "Forstør (eller formindsk) dette vindue"
-
-#~ msgid "Divide the available screen space among the visible windows"
-#~ msgstr "Fordel det tilgængelige skærmområde mellem de synlige vinduer"
-
-#~ msgid "Toggle the state of line wrapping in the current window"
-#~ msgstr "Vælg/fravælg linjeombrydning i nuværende vindue"
-
-#~ msgid "Select this menu item"
-#~ msgstr "Vælg dette menupunkt"
-
-#~ msgid "There isn't %d item in this menu."
-#~ msgid_plural "There aren't %d items in this menu."
-#~ msgstr[0] "Der er ikke %d punkt i denne menu."
-#~ msgstr[1] "Der er ikke %d punkter i denne menu."
-
-#~ msgid "Select the last item in this node's menu"
-#~ msgstr "Vælg det sidste punkt i emnets menu"
-
-#~ msgid "Menu item (%s): "
-#~ msgstr "Menupunkt (%s): "
-
-#~ msgid "Menu item: "
-#~ msgstr "Menupunkt: "
-
-#~ msgid "Follow xref (%s): "
-#~ msgstr "Følg krydsreference (%s): "
-
-#~ msgid "Follow xref: "
-#~ msgstr "Følg krydsreference: "
-
-#~ msgid "Read a menu item and select its node"
-#~ msgstr "Indlæs et menupunkt og vælg dets emne"
-
-#~ msgid "Read a footnote or cross reference and select its node"
-#~ msgstr "Indlæs en fodnote eller krydsreference og vælg dets emne"
-
-#~ msgid "Move to the start of this node's menu"
-#~ msgstr "Flyt til starten af dette emnes menu"
-
-#~ msgid "Visit as many menu items at once as possible"
-#~ msgstr "Besøg så mange menupunkter på en gang, som det er muligt"
-
-#~ msgid "Move to the previous cross reference"
-#~ msgstr "Gå til foregående krydsreference"
-
-#~ msgid "Move to the next cross reference"
-#~ msgstr "Gå til næste krydsreference"
-
-#~ msgid "Select reference or menu item appearing on this line"
-#~ msgstr "Vælg reference eller menupunkt, der optræder på denne linje"
-
-#~ msgid "No menu in node '%s'."
-#~ msgstr "Ingen menu i emne »%s«."
-
-#~ msgid "Unable to find node referenced by '%s' in '%s'."
-#~ msgstr "Kunne ikke finde emnet, der refereres til af »%s« i »%s«."
-
-#~ msgid "Read a list of menus starting from dir and follow them"
-#~ msgstr "Indlæs en liste med menuer, der starter i mappe, og følg dem"
-
-#~ msgid "Follow menus: "
-#~ msgstr "Følg menuer: "
-
-#~ msgid "Select the Prev node"
-#~ msgstr "Vælg forrige emne"
-
-#~ msgid "Select the Up node"
-#~ msgstr "Vælg op-emnet"
-
-#~ msgid "Select the last node in this file"
-#~ msgstr "Vælg det sidste emne i denne fil"
-
-#~ msgid "This window has no additional nodes"
-#~ msgstr "Dette vindue har ingen yderligere emner"
-
-#~ msgid "Select the first node in this file"
-#~ msgstr "Vælg det første emne i denne fil"
-
-#~ msgid "No more nodes within this document."
-#~ msgstr "Ikke flere emner i dette dokument."
-
-#~ msgid "No 'Prev' or 'Up' for this node within this document."
-#~ msgstr "Ingen »Forrige« eller »Op« for dette emne i dette dokument."
-
-#~ msgid "Move forwards or down through node structure"
-#~ msgstr "GÃ¥ frem eller ned gennem emne-strukturen"
-
-#~ msgid "Move backwards or up through node structure"
-#~ msgstr "GÃ¥ tilbage eller op gennem emne-strukturen"
-
-#~ msgid "Read a node name and select it"
-#~ msgstr "Indlæs et emnenavn og vælg det"
-
-#~ msgid "Goto node: "
-#~ msgstr "GÃ¥ til emne: "
-
-#~ msgid "Find the node describing program invocation"
-#~ msgstr "Find emnet, der beskriver hvordan programmet startes"
-
-#~ msgid "Find Invocation node of [%s]: "
-#~ msgstr "Find programstart emne for [%s]: "
-
-#~ msgid "Read a manpage reference and select it"
-#~ msgstr "Indlæs en man-side reference og vælg den"
-
-#~ msgid "Get Manpage: "
-#~ msgstr "Hent man-side: "
-
-#~ msgid "Select the node 'Top' in this file"
-#~ msgstr "Vælg emnet »Top« i denne fil"
-
-#~ msgid "Select the node '(dir)'"
-#~ msgstr "Vælg emnet »(mappe)«"
-
-#~ msgid "Show full file name of node being displayed"
-#~ msgstr "Vis det fulde filnavn for det viste emne"
-
-#~ msgid "Select the most recently selected node"
-#~ msgstr "Vælg det sidst valgt emne"
-
-#~ msgid "No earlier node in history"
-#~ msgstr "Intet tidligere emne i historikken"
-
-#~ msgid "Read the name of a file and select it"
-#~ msgstr "Læs navnet på en fil og vælg filen"
-
-#~ msgid "Find file: "
-#~ msgstr "Find fil: "
-
-#~ msgid "Cannot find '%s'."
-#~ msgstr "Kan ikke finde: »%s«."
-
-#~ msgid "Could not create output file '%s'."
-#~ msgstr "Kunne ikke oprette uddatafilen »%s«."
-
-#~ msgid "error writing to %s: %s"
-#~ msgstr "fejl under skrivning til %s: %s"
-
-#~ msgid "closing %s"
-#~ msgstr "lukker %s"
-
-#~ msgid "writing node %s..."
-#~ msgstr "skriver emne %s ..."
-
-#~ msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-#~ msgstr ""
-#~ "Send via en datakanal indholdet af dette emne gennem INFO_PRINT_COMMAND"
-
-#~ msgid "Cannot open pipe to '%s'."
-#~ msgstr "Kan ikke åbne datakanal til »%s«."
-
-#~ msgid "printing node %s..."
-#~ msgstr "udskriver emne %s ..."
-
-#~ msgid "finished printing node %s"
-#~ msgstr "færdig med at udskrive emne %s"
-
-#~ msgid "Toggle the usage of regular expressions in searches"
-#~ msgstr "Skift brugen af regulære udtryk i søgninger"
-
-#~ msgid "Using regular expressions for searches."
-#~ msgstr "Brug af regulære udtryk for søgninger."
-
-#~ msgid "Using literal strings for searches."
-#~ msgstr "Brug af bogstavelige strenge for søgninger."
-
-#~ msgid "Search continued from the end of the document."
-#~ msgstr "Søgning fortsat fra slutningen af dokumentet."
-
-#~ msgid "Search continued from the beginning of the document."
-#~ msgstr "Søgning fortsat fra begyndelsen af dokumentet."
-
-#~ msgid "Searching subfile %s ..."
-#~ msgstr "Søger i underfilen %s ..."
-
-#~ msgid "Search failed."
-#~ msgstr "Søgning mislykkedes."
-
-#~ msgid "%s%s%s [%s]: "
-#~ msgstr "%s%s%s [%s]: "
-
-#~ msgid "Regexp search"
-#~ msgstr "Regulært udtrykssøgning"
-
-#~ msgid " case-sensitively"
-#~ msgstr " versalfølsomhed"
-
-#~ msgid " backward"
-#~ msgstr " baglæns"
-
-#~ msgid "%s%s%s: "
-#~ msgstr "%s%s%s: "
-
-#~ msgid "Search string too short"
-#~ msgstr "Søgestreng er for kort"
-
-#~ msgid "Going back to last match from %s"
-#~ msgstr "GÃ¥r tilbage til sidste match fra %s"
-
-#~ msgid "No more matches."
-#~ msgstr "Ikke flere match."
-
-#~ msgid "Search this node and subnodes for a string."
-#~ msgstr "Søg i dette emne og underemner efter en streng."
-
-#~ msgid "Go to next match in Info sub-tree"
-#~ msgstr "Gå til næste match i informationsundertræet"
-
-#~ msgid "No active search"
-#~ msgstr "Ingen aktiv søgning"
-
-#~ msgid "Go to previous match in Info sub-tree"
-#~ msgstr "Gå til forrige match i informationsundertræet"
-
-#~ msgid "Read a string and search for it case-sensitively"
-#~ msgstr "Indlæs en tekst og søg efter den uden versalfølsomhed"
-
-#~ msgid "Read a string and search for it"
-#~ msgstr "Indlæs en tekst og søg for den"
-
-#~ msgid "Read a string and search backward for it"
-#~ msgstr "Indlæs en tekst og søg baglæns efter den"
-
-#~ msgid "Repeat last search in the same direction"
-#~ msgstr "Gentag sidste søgning i samme retning"
-
-#~ msgid "No previous search string"
-#~ msgstr "Ingen tidligere søgestreng"
-
-#~ msgid "Repeat last search in the reverse direction"
-#~ msgstr "Gentag sidste søgning i modsat retning"
-
-#~ msgid "Clear displayed search matches"
-#~ msgstr "Ryd viste søgeresultater"
-
-#~ msgid "Search interactively for a string as you type it"
-#~ msgstr "Søg interaktivt efter en tekst, mens du skriver den"
-
-#~ msgid "Regexp I-search backward: "
-#~ msgstr "Regulært udtryk I-søgning baglæns: "
-
-#~ msgid "I-search backward: "
-#~ msgstr "I-søgning baglæns: "
-
-#~ msgid "Regexp I-search: "
-#~ msgstr "Regulært udtryk I-søgning"
-
-#~ msgid "I-search: "
-#~ msgstr "I-søgning: "
-
-#~ msgid "Failing "
-#~ msgstr "Fejler "
-
-#~ msgid "Quit"
-#~ msgstr "Afslut"
-
-#~ msgid "Display version of Info being run"
-#~ msgstr "Vis version for Info der køres"
-
-#~ msgid "GNU Info version %s"
-#~ msgstr "GNU Info-version %s"
-
-#~ msgid "Redraw the display"
-#~ msgstr "Gentegn skærmen"
-
-#~ msgid "Quit using Info"
-#~ msgstr "Afslut Info"
-
-#~ msgid "Run command bound to this key's lowercase variant"
-#~ msgstr "Kør kommandoen, der er bundet til denne tasts småbogstavsvariant"
-
-#~ msgid "Unknown command (%s)."
-#~ msgstr "Ukendt kommando (%s)."
-
-#~ msgid "\"%s\" is invalid"
-#~ msgstr "»%s« er ikke gyldig"
-
-#~ msgid "'%s' is invalid"
-#~ msgstr "»%s« er ugyldig"
-
-#~ msgid "Add this digit to the current numeric argument"
-#~ msgstr "Tilføj dette tegn til det nuværende numeriske parameter"
-
-#~ msgid "Start (or multiply by 4) the current numeric argument"
-#~ msgstr "Start (eller gang med 4) det nuværende numeriske parameter"
-
-#~ msgid "readline: Out of virtual memory!\n"
-#~ msgstr "readline: Virtuel hukommelse opbrugt!\n"
-
-#~ msgid "When \"On\", footnotes appear and disappear automatically"
-#~ msgstr "Når »On«, vises og skjules fodnoter automatisk"
-
-#~ msgid "When \"On\", creating or deleting a window resizes other windows"
-#~ msgstr ""
-#~ "Når »On«, ændres størrelsen på andre vinduer, når det vindues oprettes "
-#~ "eller fjernes"
-
-#~ msgid "When \"On\", flash the screen instead of ringing the bell"
-#~ msgstr "Når »On«, blinker skærmen i stedet for at ringe med systemklokken"
-
-#~ msgid "When \"On\", errors cause the bell to ring"
-#~ msgstr "Når »On«, vil fejl aktivere systemklokken"
-
-#~ msgid ""
-#~ "When \"On\", Info garbage collects files which had to be uncompressed"
-#~ msgstr ""
-#~ "Når »On«, vil info fjerne eventuelle afkomprimerede filer, den laver."
-
-#~ msgid "When \"On\", the portion of the matched search string is highlighted"
-#~ msgstr "Når »On«, vil trufne søgestrenge blive markeret"
-
-#~ msgid ""
-#~ "Controls what happens when scrolling is requested at the end of a node"
-#~ msgstr ""
-#~ "Bestemmer, hvad der sker, når rulning forsøges ved slutning af et emne"
-
-#~ msgid "Same as scroll-behaviour"
-#~ msgstr "Samme som rulleopførsel"
-
-#~ msgid "The number lines to scroll when the cursor moves out of the window"
-#~ msgstr "Antallet af linjer, der rulles, når markøren flytter ud af vinduet"
-
-#~ msgid "Controls whether scroll-behavior affects cursor movement commands"
-#~ msgstr ""
-#~ "Kontrollerer hvorvidt rulleopførsel påvirker markørflytningskommandoer"
-
-#~ msgid "When \"On\", Info accepts and displays ISO Latin characters"
-#~ msgstr "Når »On«, vil Info benytte og vise ISO Latin-tegn"
-
-#~ msgid ""
-#~ "What to do when a scrolling command is issued at the end of the last node"
-#~ msgstr ""
-#~ "Hvad der sker, når rulningskommando udstedes i slutningen af det sidste "
-#~ "emne"
-
-#~ msgid "Minimal length of a search string"
-#~ msgstr "Minimal længde for en søgestreng"
-
-#~ msgid "Skip current window when searching"
-#~ msgstr "Udelad nuværende vindue under søgning"
-
-#~ msgid "Exclude default directories from file search path"
-#~ msgstr "Ekskluder standardmapper fra filsøgesti"
-
-#~ msgid "Hide some Info file syntax in the text of nodes"
-#~ msgstr "Skjul lidt Info-filsyntaks i teksten for emner"
-
-#~ msgid ""
-#~ "Length of time in milliseconds to wait for the next byte in a sequence "
-#~ "indicating that a key has been pressed"
-#~ msgstr ""
-#~ "Tidslængden i millisekunder som der ventes på for den næste bye i en "
-#~ "sekvens, der indikerer at en tast er trykket ned"
-
-#~ msgid "Method to use to track mouse events"
-#~ msgstr "Metode at bruge til at spore musehændelser"
-
-#~ msgid "How to follow a cross-reference"
-#~ msgstr "Hvordan en krydsreference følges"
-
-#~ msgid "Highlight search matches"
-#~ msgstr "Fremhæv søgeresultater"
-
-#~ msgid "Styles for links"
-#~ msgstr "Stile for henvisninger"
-
-#~ msgid "Styles for active links"
-#~ msgstr "Stile for aktive henvisninger"
-
-#~ msgid "Styles for search matches"
-#~ msgstr "Stile for søgematch"
-
-#~ msgid "How to print the information line at the start of a node"
-#~ msgstr "Hvordan informationslinjen skal udskrive i begyndelsen af en knude"
-
-#~ msgid "Explain the use of a variable"
-#~ msgstr "Forklar brugen af en variabel"
-
-#~ msgid "Set the value of an Info variable"
-#~ msgstr "Angiv værdien af en Info-variabel"
-
-#~ msgid "Set %s to value (%d): "
-#~ msgstr "Angiv %s til værdien (%d): "
-
-#~ msgid "Set %s to value (%s): "
-#~ msgstr "Angiver %s til værdi (%s): "
-
-#~ msgid "-----Info: (), lines ----, "
-#~ msgstr "-----Info: (), linjer ---, "
-
-#~ msgid "-%s---Info: %s, %ld lines --%s--"
-#~ msgstr "-%s---Info: %s, %ld linjer --%s--"
-
-#~ msgid "-%s---Info: (%s)%s, %ld lines --%s--"
-#~ msgstr "-%s---Info: (%s)%s, %ld linjer --%s--"
-
-#~ msgid "%s for %s"
-#~ msgstr "%s for %s"
-
-#~ msgid "\tTry `%s --help' for a complete list of options.\n"
-#~ msgstr "\tPrøv »%s --help« for en fuldstændig liste over tilvalg.\n"
-
-#~ msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-#~ msgstr "Brug: %s [TILVALG] ... [INFO-FIL [MAPPE-FIL]\n"
-
-#~ msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
-#~ msgstr "Tilføj eller fjern punkter i INFO-FIL fra Info-mappen MAPPE-FIL."
-
-#~ msgid ""
-#~ "INFO-FILE and DIR-FILE are required unless the --info-file\n"
-#~ "or --dir-file (or --info-dir) options are given, respectively."
-#~ msgstr ""
-#~ "INFO-FIL og MAPPE-FIL er krævet med mindre at --info-file\n"
-#~ "eller --dir-file (eller --info-dir) tilvalg er angivet, respektivt."
-
-#~ msgid ""
-#~ "Options:\n"
-#~ " --add-once add only to first matching section, not all.\n"
-#~ " --align=COL start description of new entries at column COL.\n"
-#~ " --calign=COL format second and subsequent description lines to\n"
-#~ " start at column COL."
-#~ msgstr ""
-#~ "Tilvalg:\n"
-#~ " --add-once tilføj kun til første matchende sektion, ikke alle.\n"
-#~ " --align=COL start beskrivelse af nye poster ved kolonne COL.\n"
-#~ " --calign=COL formater anden og efterfølgende beskrivelseslinjer "
-#~ "til\n"
-#~ " start ved kolonne COL."
-
-#~ msgid ""
-#~ " --help display this help and exit.\n"
-#~ " --info-dir=DIR same as --dir-file=DIR/dir.\n"
-#~ " --info-file=FILE specify Info file to install in the directory;\n"
-#~ " equivalent to using the INFO-FILE argument.\n"
-#~ " --item=TEXT same as --entry=TEXT.\n"
-#~ " --keep-old do not replace entries, or remove empty sections."
-#~ msgstr ""
-#~ " --help vis denne hjælpetekst og afslut.\n"
-#~ " --info-dir=DIR svarer til --dir-file=DIR/dir.\n"
-#~ " --info-file=FILE specificer i informationsfilen installation i "
-#~ "mappen;\n"
-#~ " svarende til brug af INFO-FILE-parameteren.\n"
-#~ " --item=TEXT svarer til --entry=TEXT.\n"
-#~ " --keep-old erstat ikke poster, eller fjern tomme afsnit."
-
-#~ msgid ""
-#~ " --silent suppress warnings.\n"
-#~ " --test suppress updating of DIR-FILE.\n"
-#~ " --version display version information and exit."
-#~ msgstr ""
-#~ " --silent undertryk advarsler.\n"
-#~ " --test undertryk opdatering af DIR-FILE.\n"
-#~ " --version vis versionsinformation og afslut."
-
-#~ msgid ""
-#~ "This is the file .../info/dir, which contains the\n"
-#~ "topmost node of the Info hierarchy, called (dir)Top.\n"
-#~ "The first time you invoke Info you start off looking at this node.\n"
-#~ "%c\n"
-#~ "%s\tThis is the top of the INFO tree\n"
-#~ "\n"
-#~ " This (the Directory node) gives a menu of major topics.\n"
-#~ " Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-#~ " \"h\" gives a primer for first-timers,\n"
-#~ " \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-#~ "\n"
-#~ " In Emacs, you can click mouse button 2 on a menu item or cross "
-#~ "reference\n"
-#~ " to select it.\n"
-#~ "\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Dette er filen .../info/dir, som indeholde det øverste\n"
-#~ "emne i Info-hierakiet, kaldet (mappe)Top.\n"
-#~ "Første gang, du kører Info, vil du indledningsvist se dette emne.\n"
-#~ "%c\n"
-#~ "%s\tDette er toppen af INFO-træet\n"
-#~ "\n"
-#~ " Dette (mappeemnet) indeholder en menu med hovedemner.\n"
-#~ " Afslut med »q«, »?« viser alle Info-kommandoer, »d« returnerer "
-#~ "hertil, »h« introducerer nybegyndere for Info,\n"
-#~ " »mEmacs<Return>« besøger Emacs-manualen, osv.\n"
-#~ "\n"
-#~ " I Emacs kan du klikke med museknap 2 på et menupunkt eller "
-#~ "krydsreference\n"
-#~ " for at vælge den.\n"
-#~ "\n"
-#~ "%s\n"
-
-#~ msgid "%s: could not read (%s) and could not create (%s)"
-#~ msgstr "%s: kunne ikke læse (%s) og kunne ikke oprette (%s)"
-
-#~ msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-#~ msgstr "START-INFO-DIR-ENTRY uden tilhørende END-INFO-DIR-ENTRY"
-
-#~ msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-#~ msgstr "END-INFO-DIR-ENTRY uden tilhørende START-INFO-DIR-ENTRY"
-
-#~ msgid "%s: already have dir file: %s\n"
-#~ msgstr "%s: har allerede mappefilen: %s\n"
-
-#~ msgid "%s: Specify the Info file only once.\n"
-#~ msgstr "%s: Angiv kun Info-filen én gang.\n"
-
-#~ msgid "Extra regular expression specified, ignoring `%s'"
-#~ msgstr "Ekstra regulært udtryk angivet, ignorerer »%s«"
-
-#~ msgid "Error in regular expression `%s': %s"
-#~ msgstr "Fejl i regulært udtryk »%s«: %s"
-
-#~ msgid "excess command line argument `%s'"
-#~ msgstr "overskydende argument for kommandolinjen »%s«"
-
-#~ msgid "No input file specified; try --help for more information."
-#~ msgstr "Ingen inddatafil angivet; prøv --help for yderligere information."
-
-#~ msgid "No dir file specified; try --help for more information."
-#~ msgstr "Ingen mappefil angivet; prøv --help for yderligere information."
-
-#~ msgid "Could not read %s."
-#~ msgstr "Kunne ikke læse %s."
-
-#~ msgid "no info dir entry in `%s'"
-#~ msgstr "ingen info-mappepost i »%s«"
-
-#~ msgid "no entries found for `%s'; nothing deleted"
-#~ msgstr "ingen poster fundet for »%s«; intet slettet"
-
-#~ msgid "could not open %s for writing: %s"
-#~ msgstr "kunne ikke åbne %s for skrivning: %s"
-
-#~ msgid "recursion is always allowed"
-#~ msgstr "rekursion er altid tilladt"
-
-#~ msgid "arguments are quoted by default"
-#~ msgstr "parametre placeres som standard i citationstegn"
-
-#~ msgid "%s is not a valid language code"
-#~ msgstr "%s er ikke en gyldig sprogkode"
-
-#~ msgid "%s is not a valid region code"
-#~ msgstr "%s er ikke en gyldig regionskode"
-
-#~ msgid "%s is not a valid split possibility"
-#~ msgstr "%s er ikke en gyldig opdelingsmulighed"
-
-#~ msgid "could not read %s: %s"
-#~ msgstr "kunne ikke læse %s: %s"
-
-#~ msgid "error on closing @verbatiminclude file %s: %s"
-#~ msgstr "fejl under lukning af @verbatiminclude-filen %s: %s"
-
-#~ msgid "@%s: could not find %s"
-#~ msgstr "@%s: kunne ikke finde: %s"
-
-#~ msgid "could not open html refs config file %s: %s"
-#~ msgstr "kunne ikke åbne html-referencekonfigurationsfilen %s: %s"
-
-#~ msgid "missing type"
-#~ msgstr "manglende type"
-
-#~ msgid "unrecognized type: %s"
-#~ msgstr "typen blev ikke genkendt: %s"
-
-#~ msgid "error on closing html refs config file %s: %s"
-#~ msgstr ""
-#~ "der opstod en fejl under lukning af html-referencekonfigurationsfilen %s: "
-#~ "%s"
-
-#~ msgid "no node to be renamed"
-#~ msgstr "intet navn at omdøbe"
-
-#~ msgid "nodes without a new name at the end of file"
-#~ msgstr "emner uden et navn i slutningen af filen"
-
-#~ msgid "could not open %s: %s"
-#~ msgstr "kunne ikke åbne %s: %s"
-
-#~ msgid "could not protect hash character in @%s"
-#~ msgstr "kunne ikke beskytte hash-tegn i @%s"
-
-#~ msgid "Obsolete variable %s\n"
-#~ msgstr "Forældet variabel %s\n"
-
-#~ msgid "%s: output incompatible with split"
-#~ msgstr "%s: uddata er ikke kompatible med opdeling"
-
-#~ msgid "error on closing %s: %s"
-#~ msgstr "der opstod en fejl under lukning af %s: %s"
-
-#~ msgid "could not create directories `%s' or `%s': %s"
-#~ msgstr "kunne ikke oprette mapper »%s« eller »%s«: %s"
-
-#~ msgid "could not create directory `%s': %s"
-#~ msgstr "kunne ikke oprette mappe »%s«: %s"
-
-#~ msgid "@image file `%s' not found, using `%s'"
-#~ msgstr "@image-filen »%s« blev ikke fundet, anvender »%s«"
-
-#~ msgid "no argument specified for @U"
-#~ msgstr "Intet parameter specificeret for @U"
-
-#~ msgid "@image file `%s' (for HTML) not found, using `%s'"
-#~ msgstr "@image-filen »%s« (for HTML) blev ikke fundet, anvender »%s«"
-
-#~ msgid "raw format %s is not converted"
-#~ msgstr "rå format %s er ikke konverteret"
-
-#~ msgid "string not closed in css file"
-#~ msgstr "streng ikke lukket i css-fil"
-
-#~ msgid "--css-include ended in comment"
-#~ msgstr "--css-include afsluttet i kommentar"
-
-#~ msgid "@import not finished in css file"
-#~ msgstr "@import er ikke færdig i css-fil"
-
-#~ msgid "CSS file %s not found"
-#~ msgstr "CSS-filen %s blev ikke fundet"
-
-#~ msgid "could not open --include-file %s: %s"
-#~ msgstr "kunne ikke åbne --include-file %s: %s"
-
-#~ msgid "error on closing CSS file %s: %s"
-#~ msgstr "der opstod en fejl under lukning af CSS-filen %s: %s"
-
-#~ msgid "no htmlxref.cnf entry found for `%s'"
-#~ msgstr "ingen htmlxref.cnf-poster blev fundet for »%s«"
-
-#~ msgid "error on closing frame file %s: %s"
-#~ msgstr "der opstod en fejl under lukning af frame-filen %s: %s"
-
-#~ msgid "error on closing TOC frame file %s: %s"
-#~ msgstr ""
-#~ "der opstod en fejl under lukning af indholdsfortegnelsens frame-fil %s: %s"
-
-#~ msgid "handler %s of stage %s priority %s failed"
-#~ msgstr "håndtering %s for trin %s prioritet %s mislykkedes"
-
-#~ msgid "must specify a title with a title command or @top"
-#~ msgstr "skal specificere en titel med en titelkommando eller @top"
-
-#~ msgid "error on closing redirection node file %s: %s"
-#~ msgstr "der opstod en fejl under lukning af videresendelsesemnefilen %s: %s"
-
-#~ msgid "old name for `%s' is a node of the document"
-#~ msgstr "gammelt navn for »%s« er et emne for dokumentet"
-
-#~ msgid "file empty for renamed node `%s'"
-#~ msgstr "fil tom for omdøbt emne »%s«"
-
-#~ msgid "target node (new name for `%s') not in document: %s"
-#~ msgstr "målemne (nyt navn for »%s«) er ikke i dokument: %s"
-
-#~ msgid "error on closing renamed node redirection file %s: %s"
-#~ msgstr ""
-#~ "der opstod en fejl under lukning af omdøbt emnevideresendelsesfil %s: %s"
-
-#~ msgid "empty node name"
-#~ msgstr "tomt emnenavn"
-
-#~ msgid "syntax for an external node used for `%s'"
-#~ msgstr "syntaks for et eksternt emne anvendt for »%s«"
-
-#~ msgid "document without nodes"
-#~ msgstr "dokument uden emner"
-
-#~ msgid "document without Top node"
-#~ msgstr "dokument uden Top-emne"
-
-#~ msgid "rename %s failed: %s"
-#~ msgstr "omdøbning af %s mislykkedes: %s"
-
-# hær er det spørg om skrivning til en fil (første argument er t.ex
-# DVI, LATEX, MIDI, TEX)
-#~ msgid "@%s output more than once: %s"
-#~ msgstr "@%s-uddata mere end en gang: %s"
-
-#~ msgid "@node name should not contain `,': %s"
-#~ msgstr "@node-navn må ikke indeholde »,«: %s"
-
-#~ msgid "Index entry in @%s with : produces invalid Info: %s"
-#~ msgstr "Indekspost i @%s med : fremstiller ugyldig Info: %s"
-
-#~ msgid "entry for index `%s' outside of any node"
-#~ msgstr "post for indeks »%s« udenfor et emne"
-
-#~ msgid "error on closing image text file %s: %s"
-#~ msgstr "der opstod en fejl under lukning af billedtekstfilen %s: %s"
-
-#~ msgid "@image file `%s' unreadable: %s"
-#~ msgstr "@image-filen »%s« er ikke læsbar: %s"
-
-#~ msgid "could not find @image file `%s.txt' nor alternate text"
-#~ msgstr "kunne ikke finde @image-filen »%s.txt« eller alternativ tekst"
-
-#~ msgid ""
-#~ "@strong{Note...} produces a spurious cross-reference in Info; reword to "
-#~ "avoid that"
-#~ msgstr ""
-#~ "@strong{Note...} laver en uægte krydsreference i Info; ændr for at undgå "
-#~ "dette"
-
-#~ msgid "@%s cross-reference name should not contain `:'"
-#~ msgstr "@%s-krydsreferencenavn må ikke indeholde »:«"
-
-#~ msgid "@%s node name should not contain `%s'"
-#~ msgstr "@%s-emnenavn må ikke indeholde »%s«"
-
-#~ msgid "@%s node name should not contain `:'"
-#~ msgstr "@%s-emnenavn må ikke indeholde »:«"
-
-#~ msgid "`.' or `,' must follow @xref, not %s"
-#~ msgstr "en @ref skal efterfølges af ».« eller »,«, ikke %s"
-
-#~ msgid "`.' or `,' must follow @xref"
-#~ msgstr "en @xref skal efterfølges af ».« eller »,«"
-
-#~ msgid "menu entry node name should not contain `%s'"
-#~ msgstr "emnenavn for menupunkt må ikke indeholde »%s«"
-
-#~ msgid "menu entry node name should not contain `:'"
-#~ msgstr "menupostens emnenavn må ikke indeholde »:«"
-
-#~ msgid "menu entry name should not contain `:'"
-#~ msgstr "menupostens navn må ikke indeholde »:«"
-
-#~ msgid "@%s should only appear at beginning or end of document"
-#~ msgstr "@%s må ikke fremgå i begyndelsen eller slutningen af dokumentet"
-
-#~ msgid "multiple @%s"
-#~ msgstr "flere @%s"
-
-#~ msgid "bad syntax for @%s argument: %s"
-#~ msgstr "ugyldig syntaks for @%s-parameter: %s"
-
-#~ msgid "bad or empty @%s formal argument: %s"
-#~ msgstr "ugyldig eller tom @%s-formel parameter: %s"
-
-#~ msgid "%c%s requires a name"
-#~ msgstr "%c%s kræver et navn"
-
-#~ msgid "bad name for @%s"
-#~ msgstr "ugyldigt navn for @%s"
-
-#~ msgid "@end %s seen before @%s closing brace"
-#~ msgstr "@end %s set før @%s-lukket firkantet parentes"
-
-#~ msgid "@%s seen before @%s closing brace"
-#~ msgstr "@%s set før @%s-lukket firkantet parentes"
-
-#~ msgid "%c%s missing close brace"
-#~ msgstr "%c%s mangler afsluttende firkantet parentes"
-
-#~ msgid "@itemx should not begin @%s"
-#~ msgstr "@itemx må ikke begynde @%s"
-
-#~ msgid "@itemx must follow @item"
-#~ msgstr "@itemx skal følge @item"
-
-#~ msgid "`@end' expected `%s', but saw `%s'"
-#~ msgstr "»@end« forventede »%s«, men fandt »%s«"
-
-#~ msgid "@%s seen before @end %s"
-#~ msgstr "@%s set før @end %s"
-
-#~ msgid "no matching `%cend %s'"
-#~ msgstr "ingen matchende »%cend %s«"
-
-#~ msgid "misplaced %c"
-#~ msgstr "fejlplaceret %c"
-
-#~ msgid "unmatched `%c%s'"
-#~ msgstr "uparret »%c%s«"
-
-#~ msgid "macro `%s' called with too many args"
-#~ msgstr "makro »%s« kaldt med for mange parametre"
-
-#~ msgid "@%s missing close brace"
-#~ msgstr "@%s mangler afsluttende firkantet parentes"
-
-#~ msgid "macro `%s' declared without argument called with an argument"
-#~ msgstr "makro »%s« erklæret uden parameter kaldt med en parameter"
-
-#~ msgid "\\ in @%s expansion followed `%s' instead of parameter name or \\"
-#~ msgstr ""
-#~ "\\ i @%s-udfoldelse fulgt af »%s« i stedet for parameternavn eller \\"
-
-#, fuzzy
-#~ msgid "@%s `%s' previously defined"
-#~ msgstr "aliasset »%s« er allerede defineret"
-
-#~ msgid "here is the previous definition as @%s"
-#~ msgstr "her er den tidligere definition som @%s"
-
-#~ msgid "missing name for @%s"
-#~ msgstr "mangler navn for @%s"
-
-#~ msgid "missing category for @%s"
-#~ msgstr "mangler kategori for @%s"
-
-#~ msgid "unexpected argument on @%s line: %s"
-#~ msgstr "uventet parameter på @%s-linje: %s"
-
-#, fuzzy
-#~ msgid "empty multitable"
-#~ msgstr "Tom database"
-
-#, fuzzy
-#~| msgid "Bad argument to %c%s"
-#~ msgid "superfluous argument to @%s"
-#~ msgstr "Ugyldigt argument til %c%s"
-
-#, fuzzy
-#~ msgid "bad argument to @%s"
-#~ msgstr "ugyldig %s%s-argument »%s«"
-
-#, fuzzy
-#~ msgid "%s requires an argument: the formatter for %citem"
-#~ msgstr "%s: tilvalget kræver et argument -- »%c«\n"
-
-#~ msgid ""
-#~ "command @%s not accepting argument in brace should not be on @%s line"
-#~ msgstr ""
-#~ "kommandoen @%s der ikke accepterer parametre i firkantede parenteser bør "
-#~ "ikke være på @%s linje"
-
-#, fuzzy
-#~ msgid "accent command `@%s' not allowed as @%s argument"
-#~ msgstr "tilvalget »%s« tillader ikke et argument"
-
-#, fuzzy
-#~ msgid "@%s missing argument"
-#~ msgstr "mangler argument"
-
-#, fuzzy
-#~ msgid "unknown @end %s"
-#~ msgstr "ukendt ord »%s«"
-
-#, fuzzy
-#~ msgid "bad argument to @%s: %s"
-#~ msgstr "ugyldigt paramter »%s« til tilvalg »%s«"
-
-#, fuzzy
-#~ msgid "@%s: could not open %s: %s"
-#~ msgstr "kan ikke åbne »%s«: %s"
-
-#~ msgid "unrecognized encoding name `%s'"
-#~ msgstr "ukendt kodningsnavn »%s«"
-
-#~ msgid "@%s after the first element"
-#~ msgstr "@%s efter det første element"
-
-#, fuzzy
-#~ msgid "empty argument in @%s"
-#~ msgstr "tomt filnavn i #%s"
-
-#, fuzzy
-#~ msgid "empty menu entry name in `%s'"
-#~ msgstr "tomt filnavn i #%s"
-
-#~ msgid "empty node name in menu entry"
-#~ msgstr "tomt emnenavn i menupunkt"
-
-#~ msgid "@%s should not appear in @%s"
-#~ msgstr "@%s bør ikke fremgå i @%s"
-
-#, fuzzy
-#~ msgid "macro `%s' previously defined"
-#~ msgstr "aliasset »%s« er allerede defineret"
-
-#, fuzzy
-#~ msgid "here is the previous definition of `%s'"
-#~ msgstr "placering af den forrige definition"
-
-#, fuzzy
-#~ msgid "@%s without associated character"
-#~ msgstr "%s uden en årsag"
-
-#~ msgid "use braces to give a command as an argument to @%s"
-#~ msgstr ""
-#~ "benyt firkantede parenteser til at angive en kommando som parameter til @"
-#~ "%s"
-
-#, fuzzy
-#~| msgid "%c%s expects `i' or `j' as argument, not `%c'"
-#~ msgid "%c%s expects `i' or `j' as argument, not `%s'"
-#~ msgstr "%c%s kræver 'i' eller 'j' som parameter, ikke '%c'"
-
-#~ msgid "@%s expected braces"
-#~ msgstr "@%s forventede firkantede parenteser"
-
-#~ msgid "undefined flag: %s"
-#~ msgstr "flag er ikke defineret: %s"
-
-#~ msgid "bad syntax for @value"
-#~ msgstr "ugyldig syntaks for @value"
-
-#~ msgid "%c%s is obsolete."
-#~ msgstr "%c%s er forældet."
-
-#~ msgid "%c%s is obsolete; %s"
-#~ msgstr "%c%s er forældet; %s"
-
-#, fuzzy
-#~| msgid "@%s not meaningful inside `@%s' block"
-#~ msgid "@%s not allowed inside `@%s' block"
-#~ msgstr "@%s giver ingen mening i en '@%s'-blok"
-
-#~ msgid "@%s not meaningful inside `@%s' block"
-#~ msgstr "@%s giver ingen mening i en »@%s«-blok"
-
-#~ msgid "@%s in empty multitable"
-#~ msgstr "@%s i tom multitable"
-
-#~ msgid "@tab before @item"
-#~ msgstr "@tab før @item"
-
-#, fuzzy
-#~| msgid "Too many columns in multitable item (max %d)"
-#~ msgid "too many columns in multitable item (max %d)"
-#~ msgstr "For mange søjler i 'multitable' element (maks %d)"
-
-#~ msgid "ignoring @tab outside of multitable"
-#~ msgstr "ignorerer @tab udenfor 'multitable'"
-
-#, fuzzy
-#~| msgid "Must be in `%s' insertion to use `%sx'"
-#~ msgid "must be after `@%s' to use `@%s'"
-#~ msgstr "Skal være i '%s' indsætning for at bruge '%sx'"
-
-#, fuzzy
-#~ msgid "region %s inside region %s is not allowed"
-#~ msgstr "%s: værdi %s er ikke tilladt"
-
-#, fuzzy
-#~| msgid "@menu seen before first @node, creating `Top' node"
-#~ msgid "@%s seen before first @node"
-#~ msgstr "@menu fundet før første @node, opretter 'Top' emne"
-
-#~ msgid ""
-#~ "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
-#~ msgstr ""
-#~ "måske skulle dit @top emne indsættes i @ifnottex i stedet for @ifinfo?"
-
-#, fuzzy
-#~ msgid "unknown command `%s'"
-#~ msgstr "ukendt kommando"
-
-#, fuzzy
-#~ msgid "unexpected @"
-#~ msgstr "uventet eof (filafslutning)"
-
-#, fuzzy
-#~| msgid "@%s not meaningful inside `@%s' block"
-#~ msgid "@%s is not meaningful outside `@float' environment"
-#~ msgstr "@%s giver ingen mening i en '@%s'-blok"
-
-#, fuzzy
-#~ msgid "ignoring multiple @%s"
-#~ msgstr "ignorerer ukendt ly-tilvalg: %s"
-
-#, fuzzy
-#~ msgid "command @%s does not accept arguments"
-#~ msgstr "tilvalget »%s« tillader ikke et argument"
-
-#, fuzzy
-#~ msgid "@image missing filename argument"
-#~ msgstr "mangler argument"
-
-#, fuzzy
-#~ msgid "@%s missing first argument"
-#~ msgstr "mangler argument"
-
-#~ msgid "superfluous arguments for node"
-#~ msgstr "overflødige parametre for emne"
-
-#~ msgid "expected @end %s"
-#~ msgstr "forventede @end %s"
-
-#~ msgid "@%s should only accept a @-command as argument, not `%s'"
-#~ msgstr "@%s bør kun acceptere en @-kommando som parameter, ikke »%s«"
-
-#~ msgid "remaining argument on @%s line: %s"
-#~ msgstr "tilbageværende parameter på @%s linje: %s"
-
-#~ msgid "environment command %s as argument to @%s"
-#~ msgstr "miljøkommandoen %s som parameter til @%s"
-
-#~ msgid "empty @%s"
-#~ msgstr "tom @%s"
-
-#~ msgid "column fraction not a number: %s"
-#~ msgstr "kolonnefraktion er ikke et tal: %s"
-
-#~ msgid "@sp arg must be numeric, not `%s'"
-#~ msgstr "@sp-parameter skal være numerisk, ikke »%s«"
-
-#~ msgid "reserved index name %s"
-#~ msgstr "reserveret indeksnavn %s"
-
-#~ msgid "unknown source index in @%s: %s"
-#~ msgstr "ukendt kildeindeks i @%s: %s"
-
-#~ msgid "unknown destination index in @%s: %s"
-#~ msgstr "ukendt destinatinsindeks i @%s: %s"
-
-#~ msgid "unknown index `%s' in @printindex"
-#~ msgstr "ukendt indeks »%s« i @printindex"
-
-#~ msgid "printing an index `%s' merged in another one `%s'"
-#~ msgstr "udskriver et indeks »%s« sammenføjet i et andet »%s«"
-
-#~ msgid "printindex before document beginning: @printindex %s"
-#~ msgstr "printindex før dokumentbegyndelse: @printindex %s"
-
-#~ msgid "@%s arg must be `top' or `bottom', not `%s'"
-#~ msgstr "@%s-parameter skal være »top« eller »bottom«, ikke »%s«"
-
-#~ msgid "Only @%s 10 or 11 is supported, not `%s'"
-#~ msgstr "Kun @%s 10 eller 11 er understøttet, ikke »%s«"
-
-#~ msgid "@%s arg must be `separate' or `end', not `%s'"
-#~ msgstr "@%s-parameter skal være »separate« eller »end«, ikke »%s«"
-
-#~ msgid "@%s arg must be `on', `off' or `odd', not `%s'"
-#~ msgstr "@%s-parameter skal være »on«, »off« eller »odd«, ikke »%s«"
-
-#~ msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
-#~ msgstr ""
-#~ "@paragraphindent-parameter skal være numerisk/»none«/»asis«, ikke »%s«"
-
-#~ msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
-#~ msgstr ""
-#~ "@firstparagraphindent-parameter skal være »none« eller »insert«, ikke »%s«"
-
-#~ msgid "@exampleindent arg must be numeric/`asis', not `%s'"
-#~ msgstr "@exampleindent-parameter skal være numeric/»asis«, ikke »%s«"
-
-#~ msgid "expected @%s on or off, not `%s'"
-#~ msgstr "forventede @%s aktiveret eller deaktiveret, ikke »%s«"
-
-#~ msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
-#~ msgstr ""
-#~ "@kbdinputstyle-parameter skal være »code«/»example«/»distinct«, ikke »%s«"
-
-#~ msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
-#~ msgstr ""
-#~ "@allowcodebreaks-parameter skal være »true« eller »false«, ikke »%s«"
-
-#~ msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
-#~ msgstr ""
-#~ "@urefbreakstyle-parameter skal være »after«/»before«/»none«, ikke »%s«"
-
-#~ msgid "@%s not empty"
-#~ msgstr "@%s er ikke tom"
-
-#~ msgid "@%s reference to nonexistent node `%s'"
-#~ msgstr "@%s-reference til ikkeeksisterende emne »%s«"
-
-#~ msgid "@%s entry node name `%s' different from %s name `%s'"
-#~ msgstr "@%s-postemnenavn »%s« er forskellig fra %s navn »%s«"
-
-#~ msgid "unreferenced node `%s'"
-#~ msgstr "ikkerefereret emne »%s«"
-
-#~ msgid "node %s `%s' in menu `%s' and in sectioning `%s' differ"
-#~ msgstr "emne %s »%s« i menu »%s« og i afsnitsopdeling »%s« er forskellige"
-
-#~ msgid "node `%s' is %s for `%s' in menu but not in sectioning"
-#~ msgstr "emne »%s« er %s for »%s« i menu men ikke i afsnitsopdeling"
-
-#~ msgid "%s reference to nonexistent `%s'"
-#~ msgstr "%s-reference til ikkeeksisterende »%s«"
-
-#~ msgid "node `%s' lacks menu item for `%s' despite being its Up target"
-#~ msgstr ""
-#~ "emnet »%s« mangler menupunkt for »%s« på trods af at det er dens »Op«-mål"
-
-#~ msgid "for `%s', up in menu `%s' and up `%s' don't match"
-#~ msgstr "for »%s«, op i menu »%s« og op »%s« matcher ikke"
-
-#~ msgid "@%s to `%s', different from %s name `%s'"
-#~ msgstr "@%s til »%s«, forskellig fra %s navn »%s«"
-
-#~ msgid "empty index key in @%s"
-#~ msgstr "tomt indeksnøgle i @%s"
-
-#~ msgid "chm.pm: could not open %s for writing: %s\n"
-#~ msgstr "chm.pm: kunne ikke åbne %s for skrivning: %s\n"
-
-#~ msgid "chm.pm: error on closing %s: %s"
-#~ msgstr "chm.pm: der opstod en fejl under lukning af %s: %s"
-
-#~ msgid "l2h: could not open latex file %s for writing: %s"
-#~ msgstr "l2h: kunne ikke åbne latex-filen %s for skrivning: %s"
-
-#~ msgid "l2h: L2H_TMP directory contains a dot"
-#~ msgstr "l2h: L2H_TMP-mappe indeholder et punktum"
-
-#~ msgid "l2h: current directory contains a dot"
-#~ msgstr "l2h: nuværende mappe indeholder et punktum"
-
-#~ msgid "l2h: command did not succeed: %s"
-#~ msgstr "l2h: kommando lykkedes ikke: %s"
-
-#~ msgid "l2h: image has invalid extension: %s"
-#~ msgstr "l2h: billede har ugyldig filendelse: %s"
-
-#~ msgid "l2h: rename %s as %s failed: %s"
-#~ msgstr "l2h: omdøb %s som %s mislykkedes: %s"
-
-#~ msgid "l2h: could not open %s: %s"
-#~ msgstr "l2h: kunne ikke åbne %s; %s"
-
-#~ msgid "latex2html.pm: end of @%s item %d not found"
-#~ msgstr "latex2html.pm: slutningen på @%s post %d ikke fundet"
-
-#, fuzzy
-#~ msgid "l2h: could not determine the fragment %d for @%s"
-#~ msgstr "kunne ikke bestemme dato og tid"
-
-#, fuzzy
-#~ msgid "l2h: could not load %s: %s"
-#~ msgstr "kan ikke indlæse fra %s: %s"
-
-#, fuzzy
-#~ msgid "l2h: could not open %s for writing: %s"
-#~ msgstr "kan ikke åbne %s for skrivning: %s"
-
-#, fuzzy
-#~ msgid "tex4ht.pm: could not open %s: %s"
-#~ msgstr "kan ikke åbne »%s«: %s"
-
-#~ msgid "error loading %s: %s\n"
-#~ msgstr "fejl under indlæsning af %s: %s\n"
-
-#~ msgid "%s: unknown variable %s"
-#~ msgstr "%s: ukendt variabel %s"
-
-#~ msgid "%s: obsolete variable %s\n"
-#~ msgstr "%s: forældet variabel %s\n"
-
-#~ msgid "%s: unknown variable %s\n"
-#~ msgstr "%s: ukendt variabel %s\n"
-
-#~ msgid "obsolete variable %s\n"
-#~ msgstr "forældet variabel %s\n"
-
-#~ msgid "could not read init file %s"
-#~ msgstr "kunne ikke læse init-filen %s"
-
-#~ msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
-#~ msgstr "ignorerer ej genkendt TEXINFO_OUTPUT_FORMAT-værdi »%s«\n"
-
-#~ msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
-#~ msgstr "Brug: %s [TILVALG] ... TEXINFO-FIL ...\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "Translate Texinfo source documentation to various other formats, by "
-#~| "default\n"
-#~| "Info files suitable for reading online with Emacs or standalone GNU "
-#~| "Info.\n"
-#~ msgid ""
-#~ "Translate Texinfo source documentation to various other formats, by "
-#~ "default\n"
-#~ "Info files suitable for reading online with Emacs or standalone GNU "
-#~ "Info.\n"
-#~ "\n"
-#~ "This program is commonly installed as both `makeinfo' and `texi2any';\n"
-#~ "the behavior is identical, and does not depend on the installed name.\n"
-#~ msgstr ""
-#~ "Oversæt Texinfo kildedokumentation til flere andre formater, som standard "
-#~ "til\n"
-#~ "Info-filer, der er lavet til at blive læst på skærmen med Emacs eller GNU "
-#~ "Info.\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "General options:\n"
-#~| " --error-limit=NUM quit after NUM errors (default %d).\n"
-#~| " --force preserve output even if errors.\n"
-#~| " --help display this help and exit.\n"
-#~| " --no-validate suppress node cross-reference validation.\n"
-#~| " --no-warn suppress warnings (but not errors).\n"
-#~| " --reference-limit=NUM warn about at most NUM references (default "
-#~| "%d).\n"
-#~| " -v, --verbose explain what is being done.\n"
-#~| " --version display version information and exit.\n"
-#~ msgid ""
-#~ "General options:\n"
-#~ " --document-language=STR locale to use in translating Texinfo "
-#~ "keywords\n"
-#~ " for the output document (default C).\n"
-#~ " --error-limit=NUM quit after NUM errors (default %d).\n"
-#~ " --force preserve output even if errors.\n"
-#~ " --help display this help and exit.\n"
-#~ " --no-validate suppress node cross-reference validation.\n"
-#~ " --no-warn suppress warnings (but not errors).\n"
-#~ " --conf-dir=DIR search also for initialization files in "
-#~ "DIR.\n"
-#~ " --init-file=FILE load FILE to modify the default behavior.\n"
-#~ " -c, --set-customization-variable VAR=VAL set customization variable "
-#~ "VAR \n"
-#~ " to value VAL.\n"
-#~ " -v, --verbose explain what is being done.\n"
-#~ " --version display version information and exit.\n"
-#~ msgstr ""
-#~ "Generelle tilvalg:\n"
-#~ " --error-limit=ANTAL afbryd efter ANTAL fejl (standard %d).\n"
-#~ " --force bevar uddata selvom der opstår fejl.\n"
-#~ " --help vis denne hjælp og afslut.\n"
-#~ " --no-validate undertryk validering af emne-"
-#~ "krydsreferencer.\n"
-#~ " --no-warn undertryk advarsler (men ikke fejl).\n"
-#~ " --reference-limit=ANTAL advar højst om ANTAL referencer (standard "
-#~ "%d).\n"
-#~ " -v, --verbose forklar, hvad der sker.\n"
-#~ " --version vis versionsoplysninger og afslut.\n"
-
-#~ msgid ""
-#~ "Output format selection (default is to produce Info):\n"
-#~ " --docbook output Docbook XML rather than Info.\n"
-#~ " --html output HTML rather than Info.\n"
-#~ " --plaintext output plain text rather than Info.\n"
-#~ " --xml output Texinfo XML rather than Info.\n"
-#~ " --dvi, --dvipdf, --ps, --pdf call texi2dvi to generate given "
-#~ "output,\n"
-#~ " after checking validity of TEXINFO-FILE.\n"
-#~ msgstr ""
-#~ "Valg af format på uddata (ellers laves Info):\n"
-#~ " --docbook lav DocBook XML i stedet for Info.\n"
-#~ " --html lav HTML i stedet for Info.\n"
-#~ " --plaintext lav klartekst i stedet for Info.\n"
-#~ " --xml lav Texinfo XML i stedet for Info.\n"
-#~ " --dvi, --dvipdf, --ps, --pdf kald texi2dvi for at oprette angivet "
-#~ "format,\n"
-#~ " efter kontrol af validitet for TEXINFO-"
-#~ "FIL.\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "General output options:\n"
-#~| " -E, --macro-expand FILE output macro-expanded source to FILE.\n"
-#~| " ignoring any @setfilename.\n"
-#~| " --no-headers suppress node separators, Node: lines, and "
-#~| "menus\n"
-#~| " from Info output (thus producing plain "
-#~| "text)\n"
-#~| " or from HTML (thus producing shorter "
-#~| "output);\n"
-#~| " also, write to standard output by "
-#~| "default.\n"
-#~| " --no-split suppress splitting of Info or HTML output,\n"
-#~| " generate only one output file.\n"
-#~| " --number-sections output chapter and sectioning numbers.\n"
-#~| " -o, --output=FILE output to FILE (directory if split HTML),\n"
-#~ msgid ""
-#~ "General output options:\n"
-#~ " -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
-#~ " ignoring any @setfilename.\n"
-#~ " --no-headers suppress node separators, Node: lines, and "
-#~ "menus\n"
-#~ " from Info output (thus producing plain "
-#~ "text)\n"
-#~ " or from HTML (thus producing shorter "
-#~ "output).\n"
-#~ " Also, if producing Info, write to\n"
-#~ " standard output by default.\n"
-#~ " --no-split suppress any splitting of the output;\n"
-#~ " generate only one output file.\n"
-#~ " --[no-]number-sections output chapter and sectioning numbers;\n"
-#~ " default is on.\n"
-#~ " -o, --output=DEST output to DEST.\n"
-#~ " With split output, create DEST as a "
-#~ "directory\n"
-#~ " and put the output files there.\n"
-#~ " With non-split output, if DEST is "
-#~ "already\n"
-#~ " a directory or ends with a /,\n"
-#~ " put the output file there.\n"
-#~ " Otherwise, DEST names the output file.\n"
-#~ msgstr ""
-#~ "Generelle uddatatilvalg:\n"
-#~ " -E, --macro-expand FIL send makroekspanderet kildetekst til FIL.\n"
-#~ " ignorér eventuelle @setfilename.\n"
-#~ " --no-headers undertryk emneadskillere, Node:­linjer og "
-#~ "menuer\n"
-#~ " fra Infos uddata (og lav dermed simpel "
-#~ "tekst)\n"
-#~ " og skriv som udgangspunkt til standard-ud."
-#~ "n --no-split undertryk opdeling af Info eller HTML-"
-#~ "uddata,\n"
-#~ " lav kun én uddatafil.\n"
-#~ " --number-sections lav afsnits- og sektionsnumre.\n"
-#~ " -o, --output=FILE send til FIL (mappe i tilfældet opdelt "
-#~ "HTML),\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "Options for Info and plain text:\n"
-#~| " --enable-encoding output accented and special characters in\n"
-#~| " Info output based on @documentencoding.\n"
-#~| " --fill-column=NUM break Info lines at NUM characters "
-#~| "(default %d).\n"
-#~| " --footnote-style=STYLE output footnotes in Info according to "
-#~| "STYLE:\n"
-#~| " `separate' to put them in their own "
-#~| "node;\n"
-#~| " `end' to put them at the end of the "
-#~| "node\n"
-#~| " in which they are defined (default).\n"
-#~| " --paragraph-indent=VAL indent Info paragraphs by VAL spaces "
-#~| "(default %d).\n"
-#~| " If VAL is `none', do not indent; if VAL "
-#~| "is\n"
-#~| " `asis', preserve existing indentation.\n"
-#~| " --split-size=NUM split Info files at size NUM (default "
-#~| "%d).\n"
-#~ msgid ""
-#~ "Options for Info and plain text:\n"
-#~ " --disable-encoding do not output accented and special "
-#~ "characters\n"
-#~ " in Info output based on "
-#~ "@documentencoding.\n"
-#~ " --enable-encoding override --disable-encoding (default).\n"
-#~ " --fill-column=NUM break Info lines at NUM characters (default "
-#~ "%d).\n"
-#~ " --footnote-style=STYLE output footnotes in Info according to "
-#~ "STYLE:\n"
-#~ " `separate' to put them in their own "
-#~ "node;\n"
-#~ " `end' to put them at the end of the node, "
-#~ "in\n"
-#~ " which they are defined (this is the "
-#~ "default).\n"
-#~ " --paragraph-indent=VAL indent Info paragraphs by VAL spaces "
-#~ "(default %d).\n"
-#~ " If VAL is `none', do not indent; if VAL "
-#~ "is\n"
-#~ " `asis', preserve existing indentation.\n"
-#~ " --split-size=NUM split Info files at size NUM (default %d).\n"
-#~ msgstr ""
-#~ "Tilvalg for Info og ren tekst:\n"
-#~ " --enable-encoding konstruér specialtegn i Infouddata i "
-#~ "henhold til\n"
-#~ " @documentencoding.\n"
-#~ " --fill-column=ANTAL opdel Info-linjer ved ANTAL tegn (standard "
-#~ "%d).\n"
-#~ " --footnote-style=STIL vis fodnoter i Info med valgt STIL:\n"
-#~ " `separate' for at placere dem i deres "
-#~ "eget emne;\n"
-#~ " `end' for at placere dem i slutningen af "
-#~ "det emne,\n"
-#~ " de er defineret(standard).\n"
-#~ " --paragraph-indent=ANTAL indryk Info-afsnit med ANTAL mellemrum "
-#~ "(standard %d).\n"
-#~ " Hvis ANTAL er 'none' indrykkes ikke. Hvis "
-#~ "ANTAL er\n"
-#~ " `asis', bevares eksisterende indrykning.\n"
-#~ " --split-size=ANTAL opdel Info-filer ved størrelsen ANTAL "
-#~ "(standard %d).\n"
-
-#~ msgid ""
-#~ "Input file options:\n"
-#~ " --commands-in-node-names does nothing, retained for "
-#~ "compatibility.\n"
-#~ " -D VAR define the variable VAR, as with @set.\n"
-#~ " -D 'VAR VAL' define VAR to VAL (one shell argument).\n"
-#~ " -I DIR append DIR to the @include search path.\n"
-#~ " -P DIR prepend DIR to the @include search path.\n"
-#~ " -U VAR undefine the variable VAR, as with "
-#~ "@clear.\n"
-#~ msgstr ""
-#~ "Inddata-tilvalg:\n"
-#~ " --commands-in-node-names gør intet, bevaret for kompatibilitet.\n"
-#~ " -D VAR definer variablen VAR som med @set.\n"
-#~ " -D »VAR VAL« definer VAR til VAL (et skalargument).\n"
-#~ " -I MAPPE tilføj MAPPE til @include-søgestien.\n"
-#~ " -P MAPPE indsæt MAPPE forrest i @include-"
-#~ "søgestien.\n"
-#~ " -U VAR fjern definitione for variablen VAR, som\n"
-#~ " med @clear.\n"
-
-#, fuzzy
-#~| msgid ""
-#~| "Conditional processing in input:\n"
-#~| " --ifhtml process @ifhtml and @html even if not generating "
-#~| "HTML.\n"
-#~| " --ifinfo process @ifinfo even if not generating Info.\n"
-#~| " --ifplaintext process @ifplaintext even if not generating plain "
-#~| "text.\n"
-#~| " --iftex process @iftex and @tex; implies --no-split.\n"
-#~| " --ifxml process @ifxml and @xml.\n"
-#~| " --no-ifhtml do not process @ifhtml and @html text.\n"
-#~| " --no-ifinfo do not process @ifinfo text.\n"
-#~| " --no-ifplaintext do not process @ifplaintext text.\n"
-#~| " --no-iftex do not process @iftex and @tex text.\n"
-#~| " --no-ifxml do not process @ifxml and @xml text.\n"
-#~ msgid ""
-#~ "Conditional processing in input:\n"
-#~ " --ifdocbook process @ifdocbook and @docbook even if\n"
-#~ " not generating Docbook.\n"
-#~ " --ifhtml process @ifhtml and @html even if not generating "
-#~ "HTML.\n"
-#~ " --ifinfo process @ifinfo even if not generating Info.\n"
-#~ " --ifplaintext process @ifplaintext even if not generating plain "
-#~ "text.\n"
-#~ " --iftex process @iftex and @tex.\n"
-#~ " --ifxml process @ifxml and @xml.\n"
-#~ " --no-ifdocbook do not process @ifdocbook and @docbook text.\n"
-#~ " --no-ifhtml do not process @ifhtml and @html text.\n"
-#~ " --no-ifinfo do not process @ifinfo text.\n"
-#~ " --no-ifplaintext do not process @ifplaintext text.\n"
-#~ " --no-iftex do not process @iftex and @tex text.\n"
-#~ " --no-ifxml do not process @ifxml and @xml text.\n"
-#~ "\n"
-#~ " Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
-#~ msgstr ""
-#~ "Betinget behandling i inddata:\n"
-#~ " --ifhtml behandl @ifhtml og @html selvom der ikke laves HTML.\n"
-#~ " --ifinfo behandl @ifinfo-tekst selvom der laves HTML.\n"
-#~ " --ifplaintext behandl @ifplaintext selvom der ikke laves ren "
-#~ "tekst.\n"
-#~ " --iftex behandl @iftex og @tex; underforstår --no-split.\n"
-#~ " --ifxml behandl @ifxml og @xml.\n"
-#~ " --no-ifhtml behandl ikke @ifhtml og @html-tekst.\n"
-#~ " --no-ifinfo behandl ikke @ifinfo-tekst.\n"
-#~ " --no-ifplaintext behandl ikke @ifplaintext-tekst.\n"
-#~ " --no-iftex behandl ikke @iftex og @tex-tekst.\n"
-#~ " --no-ifxml behandl ikke @ifxml og @xml-tekst.\n"
-
-#~ msgid ""
-#~ " The defaults for the @if... conditionals depend on the output format:\n"
-#~ " if generating Docbook, --ifdocbook is on and the others are off;\n"
-#~ " if generating HTML, --ifhtml is on and the others are off;\n"
-#~ " if generating Info, --ifinfo is on and the others are off;\n"
-#~ " if generating plain text, --ifplaintext is on and the others are off;\n"
-#~ " if generating XML, --ifxml is on and the others are off.\n"
-#~ msgstr ""
-#~ " Standarden for @if... betingelser afhænger af uddataformatet:\n"
-#~ " hvis der laves Docbook, er --ifdocbook aktiveret og de andre er "
-#~ "deaktiveret\n"
-#~ " hvis der laves HTML, er --ifhtml aktiveret, mens de andre er "
-#~ "deaktiverede;\n"
-#~ " hvis der laves Info er --ifinfo aktiveret og de andre er deaktiverede;\n"
-#~ " hvis der laves ren tekst er --ifplaintext aktiveret og de andre "
-#~ "deaktiverede.\n"
-#~ " hvis der laves XML, er --ifxml aktiveret, mens de andre er "
-#~ "deaktiverede.\n"
-
-#~ msgid ""
-#~ "Examples:\n"
-#~ " makeinfo foo.texi write Info to foo's "
-#~ "@setfilename\n"
-#~ " makeinfo --html foo.texi write HTML to @setfilename\n"
-#~ " makeinfo --xml foo.texi write Texinfo XML to "
-#~ "@setfilename\n"
-#~ " makeinfo --docbook foo.texi write Docbook XML to "
-#~ "@setfilename\n"
-#~ " makeinfo --plaintext foo.texi write plain text to standard "
-#~ "output\n"
-#~ " makeinfo --pdf foo.texi write PDF using texi2dvi\n"
-#~ "\n"
-#~ " makeinfo --html --no-headers foo.texi write html without node lines, "
-#~ "menus\n"
-#~ " makeinfo --number-sections foo.texi write Info with numbered "
-#~ "sections\n"
-#~ " makeinfo --no-split foo.texi write one Info file however big\n"
-#~ msgstr ""
-#~ "Eksempler:\n"
-#~ " makeinfo foo.texi skriv Info til xxx's "
-#~ "@setfilename\n"
-#~ " makeinfo --html xxx.texi skriv HTML til @setfilename\n"
-#~ " makeinfo --xml xxx.texi skriv Texinfo XML til "
-#~ "@setfilename\n"
-#~ " makeinfo --docbook xxx.texi skriv Docbook XML til "
-#~ "@setfilename\n"
-#~ " makeinfo --plaintext xxx.texi skriv klartekst til standardud "
-#~ "makeinfo --pdf xxx.texi skriv PDF via texi2dvi\n"
-#~ "\n"
-#~ " makeinfo --html --no-headers xxx.texi skriv html uden emnelinjer og "
-#~ "menuer\n"
-#~ " makeinfo --number-sections xxx.texi skriv Info med nummererede "
-#~ "afsnit\n"
-#~ " makeinfo --no-split xxx.texi skriv en Info-fil, uanset "
-#~ "størrelsen\n"
-
-#~ msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
-#~ msgstr ""
-#~ "%s: --footnote-style parameter skal være 'separate' eller 'end', ikke "
-#~ "'%s'.\n"
-
-#~ msgid ""
-#~ "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
-#~ msgstr ""
-#~ "%s: --paragraph-indent parameter skal være tal/»none«/»asis«, ikke »%s«.\n"
-
-#~ msgid "--Xopt option without printed output"
-#~ msgstr "tilvalget --Xopt uden udskrevne uddata"
-
-#~ msgid "unknown tree transformation %s"
-#~ msgstr "ukendt trætransformation %s"
-
-#~ msgid "ignoring splitting for format %s"
-#~ msgstr "ignorerer opdeling for format %s"
-
-#~ msgid "%s: missing file argument.\n"
-#~ msgstr "%s: mangler filargument.\n"
-
-#~ msgid "Try `%s --help' for more information.\n"
-#~ msgstr "Prøv »%s --help« for yderligere information.\n"
-
-#~ msgid "fill_gaps_in_sectioning transformation return no result. No section?"
-#~ msgstr ""
-#~ "fill_gaps_in_sectioning-transformering gav intet resultat. Ingen sektion?"
-
-#~ msgid "error on closing macro expand file %s: %s\n"
-#~ msgstr "der opstod en fejl under lukning af makro udvid-filen %s: %s\n"
-
-#~ msgid "could not open %s for writing: %s\n"
-#~ msgstr "kunne ikke åbne %s for skrivning: %s\n"
-
-#~ msgid "%s: error on closing %s: %s\n"
-#~ msgstr "%s: der opstod en fejl under lukning af %s: %s\n"
-
-#~ msgid "%s: error on closing internal links file %s: %s\n"
-#~ msgstr ""
-#~ "%s: der opstod en fejl under lukning af intern henvisningsfil %s: %s\n"
-
-#~ msgid "%s: could not open %s for writing: %s\n"
-#~ msgstr "%s: kunne ikke åbne %s for skrivning: %s\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Email bug reports to bug-texinfo@gnu.org,\n"
-#~ "general questions and discussion to help-texinfo@gnu.org.\n"
-#~ "Texinfo home page: http://www.gnu.org/software/texinfo/"
-#~ msgstr ""
-#~ "\n"
-#~ "Rapportér fejl i programmet på engelsk til bug-texinfo@gnu.org,\n"
-#~ "generelle spørgsmål og diskussion til help-texinfo@gnu.org,\n"
-#~ "oversættelsesfejl til claus_h@image.dk\n"
-#~ "Texinfos hjemmeside: http://www.gnu.org/software/texinfo/"
-
-#~ msgid "--*** Tags out of Date ***"
-#~ msgstr "--*** Mærker (tags) er forældede ***"
-
-#~ msgid " Subfile: %s"
-#~ msgstr " Underfil: %s"
diff --git a/macros/texinfo/texinfo/po_document/de.gmo b/macros/texinfo/texinfo/po_document/de.gmo
index 05cc6c7192..af41cd37ca 100644
--- a/macros/texinfo/texinfo/po_document/de.gmo
+++ b/macros/texinfo/texinfo/po_document/de.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/de.po b/macros/texinfo/texinfo/po_document/de.po
index 054ca23e09..58d39de35e 100644
--- a/macros/texinfo/texinfo/po_document/de.po
+++ b/macros/texinfo/texinfo/po_document/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 5.0\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2014-04-11 22:11+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -20,795 +20,813 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funktion"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Makro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Spezielle Form"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variable"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Benutzeroption"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Instanzvariable"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Method"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} in {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} von {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day}. {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Anhang {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} in {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} von {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Januar"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Februar"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "März"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "April"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Mai"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Juni"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Juli"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "August"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "September"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Oktober"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "November"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Dezember"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Siehe Info-Datei @file{{myfile}}, Absatz @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Siehe Absatz @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Siehe Info-Datei @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "Abschnitt »{section_name}« in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Siehe Abschnitt »{section_name}« in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "siehe Abschnitt »{section_name}« in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Siehe @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "siehe @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Siehe {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "siehe {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(außerhalb aller Absätze)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{kein Wert für »{value}«@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {name} {arguments}"
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{ }-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {name}"
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{ }-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {type} {name} {arguments}"
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}:@*{type}@*{name}"
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{ }-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {type} {name}"
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{ }-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} von {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {name}"
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{ }-- {category} von {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} in {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {name}"
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{ }-- {category} in {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} in {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {type} {name}"
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{ }-- {category} in {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} von {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {type} {name}"
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{ }-- {category} von {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Anfang"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Inhalt"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Ãœbersicht"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Index"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "aktuell"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Vorh."
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Nach oben "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Nächste"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Nach oben"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Vorige"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Absatz vor"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Absatz zurück"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Nächste Datei"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Vorige Datei"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Titelseite des Dokuments"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Inhaltsverzeichnis"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Kurzes Inhaltsverzeichnis"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Aktueller Abschnitt"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Voriger Abschnitt in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Anfang dieses oder des letzten Kapitels"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Voriger Abschnitt derselben Ebene"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Abschnitt nach oben"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Nächster Abschitt derselben Ebene"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Absatz nach oben"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Nächster Absatz"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Voriger Absatz"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Nächster Absatz in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Voriger Absatz in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Nächster Abschnitt in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Nächstes Kapitel"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Info (Hilfe)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Erster Abschnitt in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Letzter Abschnitt in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Abschnitt vor in nächster Datei"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Abschnitt zurück in nächster Datei"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Diese"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Zurück"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Schnellrücklauf"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "Absatz nach oben"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "Nächster Absatz"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "Voriger Absatz"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "Absatz vor"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "Absatz zurück"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Vor"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Schnellvorlauf"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Info"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Erste"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Letzte"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "Nächste Datei"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "Vorige Datei"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Info zu diesem Dokument"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Inhaltsverzeichnis"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Kurzes Inhaltsverzeichnis"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Fußnoten"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "siehe Abschnitt {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "siehe {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Siehe Abschnitt {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Siehe {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "siehe {reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "siehe @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "siehe »{section}« in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "siehe {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "siehe »{section}«"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Siehe {reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Siehe @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Siehe »{section}« in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Siehe {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Siehe »{section}«"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "»{section}« in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "»{section}«"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Springe zu"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Indexeintrag"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Abschnitt"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} von {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} in {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} in {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} in {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} von {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} von {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -817,43 +835,44 @@ msgstr ""
"Dieses Dokument wurde am @emph{@today{}} mittels @uref{{program_homepage}, "
"@emph{{program}}} erstellt."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr ""
"Dieses Dokument wurde mittels @uref{{program_homepage}, @emph{{program}}} "
"erstellt."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, fuzzy, perl-brace-format
+#| msgid "{text} ({url})"
msgid "{element_text} ({title})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Der Absatz, nach dem Sie suchen, befindet sich bei {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " Die Links in der Navigationsleiste haben die folgende Bedeutung: "
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Knopf"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Name"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Gehe zu"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Von 1.2.3 gehe zu"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -863,50 +882,51 @@ msgstr ""
"@strong{ Unterabschnitt 1-2-3 } in einem Dokument mit folgender Struktur "
"liegt:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Abschnitt 1"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Unterabschnitt 1-1"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Unterabschnitt 1-2"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Unterabschnitt 1-2-1"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Unterabschnitt 1-2-2"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Unterabschnitt 1-2-3"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Aktuelle Position"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Unterabschnitt 1-2-4"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Unterabschnitt 1-3"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Unterabschnitt 1-4"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Unbenanntes Dokument"
+#, perl-brace-format
#~ msgid "{title}: {element_text}"
#~ msgstr "{title}: {element_text}"
diff --git a/macros/texinfo/texinfo/po_document/de.us-ascii.gmo b/macros/texinfo/texinfo/po_document/de.us-ascii.gmo
index 18c9b070f2..e105cb41e5 100644
--- a/macros/texinfo/texinfo/po_document/de.us-ascii.gmo
+++ b/macros/texinfo/texinfo/po_document/de.us-ascii.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/de.us-ascii.po b/macros/texinfo/texinfo/po_document/de.us-ascii.po
index f82918a8d5..4f234ce655 100644
--- a/macros/texinfo/texinfo/po_document/de.us-ascii.po
+++ b/macros/texinfo/texinfo/po_document/de.us-ascii.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 5.0\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2014-04-11 22:11+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -19,795 +19,795 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funktion"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Makro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Spezielle Form"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variable"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Benutzeroption"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Instanzvariable"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Method"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} in {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} von {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day}. {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Anhang {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} in {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} von {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Januar"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Februar"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "März"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "April"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Mai"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Juni"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Juli"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "August"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "September"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Oktober"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "November"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Dezember"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Siehe Info-Datei @file{{myfile}}, Absatz @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Siehe Absatz @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Siehe Info-Datei @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "Abschnitt »{section_name}« in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Siehe Abschnitt »{section_name}« in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "siehe Abschnitt »{section_name}« in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Siehe @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "siehe @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Siehe {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "siehe {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(außerhalb aller Absätze)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{kein Wert für »{value}«@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{ }-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{ }-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{ }-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{ }-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} von {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{ }-- {category} von {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} in {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{ }-- {category} in {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} in {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{ }-- {category} in {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} von {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{ }-- {category} von {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Anfang"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Inhalt"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Ãœbersicht"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Index"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "aktuell"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Vorh."
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Nach oben "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Nächste"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Nach oben"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Vorige"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Absatz vor"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Absatz zurück"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Nächste Datei"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Vorige Datei"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Titelseite des Dokuments"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Inhaltsverzeichnis"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Kurzes Inhaltsverzeichnis"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Aktueller Abschnitt"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Voriger Abschnitt in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Anfang dieses oder des letzten Kapitels"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Voriger Abschnitt derselben Ebene"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Abschnitt nach oben"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Nächster Abschitt derselben Ebene"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Absatz nach oben"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Nächster Absatz"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Voriger Absatz"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Nächster Absatz in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Voriger Absatz in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Nächster Abschnitt in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Nächstes Kapitel"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Info (Hilfe)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Erster Abschnitt in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Letzter Abschnitt in Lesereihenfolge"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Abschnitt vor in nächster Datei"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Abschnitt zurück in nächster Datei"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Diese"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Zurück"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Schnellrücklauf"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "Absatz nach oben"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "Nächster Absatz"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "Voriger Absatz"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "Absatz vor"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "Absatz zurück"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Vor"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Schnellvorlauf"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Info"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Erste"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Letzte"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "Nächste Datei"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "Vorige Datei"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Info zu diesem Dokument"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Inhaltsverzeichnis"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Kurzes Inhaltsverzeichnis"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Fußnoten"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "siehe Abschnitt {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "siehe {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Siehe Abschnitt {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Siehe {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "siehe {reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "siehe @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "siehe »{section}« in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "siehe {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "siehe »{section}«"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Siehe {reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Siehe @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Siehe »{section}« in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Siehe {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Siehe »{section}«"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "»{section}« in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "»{section}«"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Springe zu"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Indexeintrag"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Abschnitt"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} von {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} in {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} in {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} in {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} von {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} von {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -816,43 +816,43 @@ msgstr ""
"Dieses Dokument wurde am @emph{@today{}} mittels @uref{{program_homepage}, "
"@emph{{program}}} erstellt."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr ""
"Dieses Dokument wurde mittels @uref{{program_homepage}, @emph{{program}}} "
"erstellt."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, fuzzy, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Der Absatz, nach dem Sie suchen, befindet sich bei {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " Die Links in der Navigationsleiste haben die folgende Bedeutung: "
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Knopf"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Name"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Gehe zu"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Von 1.2.3 gehe zu"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -862,47 +862,47 @@ msgstr ""
"@strong{ Unterabschnitt 1-2-3 } in einem Dokument mit folgender Struktur "
"liegt:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Abschnitt 1"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Unterabschnitt 1-1"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Unterabschnitt 1-2"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Unterabschnitt 1-2-1"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Unterabschnitt 1-2-2"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Unterabschnitt 1-2-3"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Aktuelle Position"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Unterabschnitt 1-2-4"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Unterabschnitt 1-3"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Unterabschnitt 1-4"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Unbenanntes Dokument"
diff --git a/macros/texinfo/texinfo/po_document/el.gmo b/macros/texinfo/texinfo/po_document/el.gmo
deleted file mode 100644
index c2da229efc..0000000000
--- a/macros/texinfo/texinfo/po_document/el.gmo
+++ /dev/null
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/el.po b/macros/texinfo/texinfo/po_document/el.po
deleted file mode 100644
index d5fc68bbe7..0000000000
--- a/macros/texinfo/texinfo/po_document/el.po
+++ /dev/null
@@ -1,1113 +0,0 @@
-# Greek translations for texinfo package.
-# Copyright (C) 2015 Free Software Foundation, Inc.
-# This file is distributed under the same license as the texinfo package.
-# Tsiolkas Michail <cs112152@cs.uoi.gr>, 2015.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU texinfo 6.0.90\n"
-"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
-"PO-Revision-Date: 2015-12-28 00:59+0200\n"
-"Last-Translator: Tsiolkas Michail <cs112152@cs.uoi.gr>\n"
-"Language-Team: Greek <team@lists.gnome.gr>\n"
-"Language: el\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
-msgid "Function"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:728
-msgid "Macro"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:729
-msgid "Special Form"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
-msgid "Variable"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:731
-msgid "User Option"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
-msgid "Instance Variable"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
-msgid "Method"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1245
-#, perl-brace-format
-msgid "{category} on {class}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1252
-#, perl-brace-format
-msgid "{category} of {class}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1274
-#, perl-brace-format
-msgid "{month} {day}, {year}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
-#, perl-brace-format
-msgid "Appendix {number} {section_title}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
-#, perl-brace-format
-msgid "{number} {section_title}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1570
-#, perl-brace-format
-msgid "{float_type} {float_number}: "
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1574
-#, perl-brace-format
-msgid "{float_type}: "
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1579
-#, perl-brace-format
-msgid "{float_type} {float_number}\n"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1583
-#, perl-brace-format
-msgid "{float_type}\n"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1589
-#, perl-brace-format
-msgid "{float_number}: "
-msgstr ""
-
-#: tp/Texinfo/Common.pm:1592
-#, perl-brace-format
-msgid "{float_number}\n"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2578
-#, perl-brace-format
-msgid "{name} on {class}"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:2588
-#, perl-brace-format
-msgid "{name} of {class}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:99
-msgid "error@arrow{}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:934
-msgid "January"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:935
-msgid "February"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:936
-msgid "March"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:937
-msgid "April"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:938
-msgid "May"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:939
-msgid "June"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:940
-msgid "July"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:941
-msgid "August"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:942
-msgid "September"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:943
-msgid "October"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:944
-msgid "November"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:945
-msgid "December"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:996
-#, perl-brace-format
-msgid "{float_type} {float_number}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:1000
-#, perl-brace-format
-msgid "{float_type}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Converter.pm:1004
-#, perl-brace-format
-msgid "{float_number}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:834
-#, perl-brace-format
-msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:839
-#, perl-brace-format
-msgid "See node @samp{{mynode}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:843
-#, perl-brace-format
-msgid "See Info file @file{{myfile}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:899
-#, perl-brace-format
-msgid "section ``{section_name}'' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:904
-#, perl-brace-format
-msgid "See section ``{section_name}'' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:909
-#, perl-brace-format
-msgid "see section ``{section_name}'' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
-#, perl-brace-format
-msgid "@cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
-#, perl-brace-format
-msgid "See @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
-#, perl-brace-format
-msgid "see @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:938
-#, perl-brace-format
-msgid "{title_ref}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:943
-#, perl-brace-format
-msgid "See {title_ref}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:948
-#, perl-brace-format
-msgid "see {title_ref}"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
-#, perl-brace-format
-msgid "{abbr_or_acronym} ({explanation})"
-msgstr ""
-
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
-#, perl-brace-format
-msgid "@b{{quotation_arg}:} "
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1275
-msgid "(outside of any node)"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1863
-#, perl-brace-format
-msgid "{name} @url{{email}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1866
-#, perl-brace-format
-msgid "@url{{email}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1890
-#, perl-brace-format
-msgid "{text} ({url})"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1895
-#, perl-brace-format
-msgid "@t{<{url}>}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
-#, perl-brace-format
-msgid "@{No value for `{value}'@}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2787
-#, perl-brace-format
-msgid "@tie{}-- {category}: {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2792
-#, perl-brace-format
-msgid "@tie{}-- {category}: {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2805
-#, perl-brace-format
-msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2808
-#, perl-brace-format
-msgid "@tie{}-- {category}: {type} {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2817
-#, perl-brace-format
-msgid "@tie{}-- {category}:@*{type}@*{name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2820
-#, perl-brace-format
-msgid "@tie{}-- {category}: {type} {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2828
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}: {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2834
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}: {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2843
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}: {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2849
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}: {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2864
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2868
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2879
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2883
-#, perl-brace-format
-msgid "@tie{}-- {category} on {class}: {type} {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2897
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2901
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2912
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2916
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}: {type} {name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
-#, perl-brace-format
-msgid "@center --- @emph{{author}}\n"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
-msgid "Top"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
-msgid "Contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
-msgid "Overview"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
-msgid "Index"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:745
-msgid "current"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
-msgid "Prev"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:749
-msgid " Up "
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
-msgid "Next"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
-msgid "Up"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:756
-msgid "Previous"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:757
-msgid "Forward node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:758
-msgid "Back node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:764
-msgid "Next file"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:765
-msgid "Previous file"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:771
-msgid "Cover (top) of document"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:772
-msgid "Table of contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:773
-msgid "Short table of contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:775
-msgid "Current section"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:776
-msgid "Previous section in reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:777
-msgid "Beginning of this chapter or previous chapter"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:778
-msgid "Previous section on same level"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:779
-msgid "Up section"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:780
-msgid "Next section on same level"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:781
-msgid "Up node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:782
-msgid "Next node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:783
-msgid "Previous node"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:784
-msgid "Next node in node reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:785
-msgid "Previous node in node reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:786
-msgid "Next section in reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:787
-msgid "Next chapter"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:788
-msgid "About (help)"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:789
-msgid "First section in reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:790
-msgid "Last section in reading order"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:791
-msgid "Forward section in next file"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:792
-msgid "Back section in previous file"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:801
-msgid "This"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:802
-msgid "Back"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:803
-msgid "FastBack"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:807
-msgid "NodeUp"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:808
-msgid "NodeNext"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:809
-msgid "NodePrev"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:810
-msgid "NodeForward"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:811
-msgid "NodeBack"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:812
-msgid "Forward"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:813
-msgid "FastForward"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:814
-msgid "About"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:815
-msgid "First"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:816
-msgid "Last"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:817
-msgid "NextFile"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:818
-msgid "PrevFile"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:822
-msgid "About This Document"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:823
-msgid "Table of Contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:824
-msgid "Short Table of Contents"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:825
-msgid "Footnotes"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:1533
-#, perl-brace-format
-msgid "{explained_string} ({explanation})"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3196
-#, perl-brace-format
-msgid "see section {reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3199
-#, perl-brace-format
-msgid "see {reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3204
-#, perl-brace-format
-msgid "See section {reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3207
-#, perl-brace-format
-msgid "See {reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3211
-#, perl-brace-format
-msgid "{reference_name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3273
-#, perl-brace-format
-msgid "see {reference} in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3277
-#, perl-brace-format
-msgid "see @cite{{book_reference}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3281
-#, perl-brace-format
-msgid "see `{section}' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3288
-#, perl-brace-format
-msgid "see {reference}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3291
-#, perl-brace-format
-msgid "see `{section}'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3296
-#, perl-brace-format
-msgid "See {reference} in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3300
-#, perl-brace-format
-msgid "See @cite{{book_reference}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3304
-#, perl-brace-format
-msgid "See `{section}' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3311
-#, perl-brace-format
-msgid "See {reference}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3314
-#, perl-brace-format
-msgid "See `{section}'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3319
-#, perl-brace-format
-msgid "{reference} in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3323
-#, perl-brace-format
-msgid "@cite{{book_reference}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3327
-#, perl-brace-format
-msgid "`{section}' in @cite{{book}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3334
-#, perl-brace-format
-msgid "{reference}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3337
-#, perl-brace-format
-msgid "`{section}'"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3450
-msgid "Jump to"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3458
-msgid "Index Entry"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:3460
-msgid "Section"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4080
-#, perl-brace-format
-msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4085
-#, perl-brace-format
-msgid "{category}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4102
-#, perl-brace-format
-msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4106
-#, perl-brace-format
-msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4115
-#, perl-brace-format
-msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4118
-#, perl-brace-format
-msgid "{category}: @emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4126
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4132
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4141
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4147
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4162
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4166
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4177
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4181
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4195
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4199
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4210
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:4214
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6181
-#, perl-brace-format
-msgid ""
-"This document was generated on @emph{@today{}} using "
-"@uref{{program_homepage}, @emph{{program}}}."
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6186
-msgid "This document was generated on @emph{@today{}}."
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6237
-#, perl-brace-format
-msgid "{element_text} ({title})"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6381
-#, perl-brace-format
-msgid "The node you are looking for is at {href}."
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6450
-msgid " The buttons in the navigation panels have the following meaning:"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6456
-msgid "Button"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6457
-msgid "Name"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6458
-msgid "Go to"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6459
-msgid "From 1.2.3 go to"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6485
-msgid ""
-" where the @strong{ Example } assumes that the current position is at "
-"@strong{ Subsubsection One-Two-Three } of a document of the following "
-"structure:"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6495
-msgid "Section One"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6497
-msgid "Subsection One-One"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6504
-msgid "Subsection One-Two"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6506
-msgid "Subsubsection One-Two-One"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6507
-msgid "Subsubsection One-Two-Two"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6508
-msgid "Subsubsection One-Two-Three"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6510
-msgid "Current Position"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6511
-msgid "Subsubsection One-Two-Four"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6514
-msgid "Subsection One-Three"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6521
-msgid "Subsection One-Four"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6929
-msgid "Untitled Document"
-msgstr ""
-
-#~ msgid "%s: option '%s' is ambiguous; possibilities:"
-#~ msgstr "%s: η επιλογή «%s» δεν είναι σαφής· δυνατότητες:"
-
-#~ msgid "%s: option '%s' is ambiguous\n"
-#~ msgstr "%s: η επιλογή «%s» δεν είναι σαφής\n"
-
-#~ msgid "%s: option '--%s' doesn't allow an argument\n"
-#~ msgstr "%s: η επιλογή «--%s» δεν επιτÏέπει οÏίσματα\n"
-
-#~ msgid "%s: option '%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: η επιλογή «%c%s» δεν επιτÏέπει οÏίσματα\n"
-
-#~ msgid "%s: option '--%s' requires an argument\n"
-#~ msgstr "%s: η επιλογή «--%s» απαιτεί ένα ÏŒÏισμα\n"
-
-#~ msgid "%s: unrecognized option '--%s'\n"
-#~ msgstr "%s: άγνωστη επιλογή «--%s»\n"
-
-#~ msgid "%s: unrecognized option '%c%s'\n"
-#~ msgstr "%s: άγνωστη επιλογή «%c%s»\n"
-
-#~ msgid "%s: invalid option -- '%c'\n"
-#~ msgstr "%s: μη έγκυÏη επιλογή -- «%c»\n"
-
-#~ msgid "%s: option requires an argument -- '%c'\n"
-#~ msgstr "%s: η επιλογή απαιτεί ένα ÏŒÏισμα -- «%c»\n"
-
-#~ msgid "%s: option '-W %s' is ambiguous\n"
-#~ msgstr "%s: η επιλογή «-W %s» δεν είναι σαφής\n"
-
-#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: η επιλογή «-W %s» δεν επιτÏέπει οÏίσματα\n"
-
-#~ msgid "%s: option '-W %s' requires an argument\n"
-#~ msgstr "%s: η επιλογή «-W %s» απαιτεί ένα ÏŒÏισμα\n"
-
-#~ msgid "Success"
-#~ msgstr "Επιτυχία"
-
-#~ msgid "No match"
-#~ msgstr "Δε βÏέθηκε"
-
-#~ msgid "Invalid regular expression"
-#~ msgstr "Μη έγκυÏη κανονική έκφÏαση"
-
-#~ msgid "Invalid collation character"
-#~ msgstr "Μη έγκυÏος χαÏακτήÏας σειÏάς ταξινόμησης"
-
-#~ msgid "Invalid character class name"
-#~ msgstr "Μη έγκυÏος χαÏακτήÏας ονόματος κλάσης"
-
-#~ msgid "Trailing backslash"
-#~ msgstr "Ακολουθεί ανάστÏοφη κάθετος"
-
-#~ msgid "Invalid back reference"
-#~ msgstr "Μη έγκυÏη Ï€ÏοηγοÏμενη αναφοÏά"
-
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Δε βÏέθηκε αντιστοιχία για το [ ή το [^"
-
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Δε βÏέθηκε αντιστοιχία για το ( ή το \\("
-
-#~ msgid "Unmatched \\{"
-#~ msgstr "Δε βÏέθηκε αντιστοιχία για το \\{"
-
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Μη έγκυÏο πεÏιεχόμενο του \\{\\}"
-
-#~ msgid "Invalid range end"
-#~ msgstr "Μη έγκυÏο εÏÏος"
-
-#~ msgid "Memory exhausted"
-#~ msgstr "Η μνήμη εξαντλήθηκε"
-
-#~ msgid "Basic Info command keys\n"
-#~ msgstr "Βασικές εντολές Info\n"
-
-#~ msgid "\\%-10[quit-help] Close this help window.\n"
-#~ msgstr "\\%-10[quit-help] Κλείσε αυτό το παÏάθυÏο βοήθειας.\n"
-
-#~ msgid "\\%-10[quit] Quit Info altogether.\n"
-#~ msgstr "\\%-10[quit] Έξοδος από το Info.\n"
-
-#~ msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n"
-#~ msgstr "\\%-10[get-info-help-node] Εκκίνηση της εκμάθησης Info.\n"
-
-#~ msgid "\\%-10[prev-line] Move up one line.\n"
-#~ msgstr "\\%-10[prev-line] Μετακίνηση μία γÏαμμή Ï€Ïος τα πάνω.\n"
-
-#~ msgid "\\%-10[next-line] Move down one line.\n"
-#~ msgstr "\\%-10[next-line] Μετακίνηση μία γÏαμμή Ï€Ïος τα κάτω.\n"
-
-#~ msgid "\\%-10[scroll-backward] Scroll backward one screenful.\n"
-#~ msgstr ""
-#~ "\\%-10[scroll-backward] Μετακίνηση στην Ï€ÏοηγοÏμενη σελίδα της οθόνης.\n"
-
-#~ msgid "\\%-10[scroll-forward] Scroll forward one screenful.\n"
-#~ msgstr ""
-#~ "\\%-10[scroll-forward] Μετακίνηση στην επόμενη σελίδα της οθόνης.\n"
-
-#~ msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n"
-#~ msgstr "\\%-10[beginning-of-node] Πήγαινε στην αÏχή Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… κόμβου.\n"
-
-#~ msgid "\\%-10[end-of-node] Go to the end of this node.\n"
-#~ msgstr "\\%-10[end-of-node] Πήγαινε στο τέλος Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… κόμβου.\n"
-
-#~ msgid "\\%-10[move-to-next-xref] Skip to the next hypertext link.\n"
-#~ msgstr ""
-#~ "\\%-10[move-to-next-xref] Μετάβαση στον επόμενο σÏνδεσμο υπεÏκειμένου.\n"
-
-#~ msgid ""
-#~ "\\%-10[select-reference-this-line] Follow the hypertext link under the "
-#~ "cursor.\n"
-#~ msgstr ""
-#~ "\\%-10[select-reference-this-line] ΑκολοÏθησε το σÏνδεσμο κάτω από τον "
-#~ "δείκτη του ποντικιοÏ.\n"
-
-#~ msgid ""
-#~ "\\%-10[history-node] Go back to the last node seen in this window.\n"
-#~ msgstr ""
-#~ "\\%-10[history-node] Πήγαινε πίσω στον τελευταίο κόμβο που "
-#~ "επισκέφθηκες.\n"
-
-#~ msgid "\\%-10[global-prev-node] Go to the previous node in the document.\n"
-#~ msgstr ""
-#~ "\\%-10[global-prev-node] Πήγαινε στον Ï€ÏοηγοÏμενο κόμβο του εγγÏάφου.\n"
-
-#~ msgid "\\%-10[global-next-node] Go to the next node in the document.\n"
-#~ msgstr ""
-#~ "\\%-10[global-next-node] Πήγαινε στον επόμενο κόμβο του εγγÏάφου.\n"
-
-#~ msgid "\\%-10[prev-node] Go to the previous node on this level.\n"
-#~ msgstr ""
-#~ "\\%-10[prev-node] Πήγαινε στον Ï€ÏοηγοÏμενο κόμβο στο Ï„Ïέχον επίπεδο.\n"
-
-#~ msgid "\\%-10[next-node] Go to the next node on this level.\n"
-#~ msgstr "\\%-10[next-node] Πήγαινε στον επόμενο κόμβο στο Ï„Ïέχον επίπεδο.\n"
-
-#~ msgid "\\%-10[up-node] Go up one level.\n"
-#~ msgstr "\\%-10[up-node] Πήγαινε πάνω ένα επίπεδο.\n"
-
-#~ msgid "\\%-10[top-node] Go to the top node of this document.\n"
-#~ msgstr "\\%-10[top-node] Πήγαινε στον αÏχικό κόμβο του εγγÏάφου.\n"
-
-#~ msgid "\\%-10[dir-node] Go to the main 'directory' node.\n"
-#~ msgstr "\\%-10[dir-node] Πήγαινε στον κόμβο «κατάλογο».\n"
-
-#~ msgid "1...9 Pick the first...ninth item in this node's menu.\n"
-#~ msgstr ""
-#~ "1...9 Διάλεξε το Ï€Ïώτο...ένατο αντικείμενο στο Î¼ÎµÎ½Î¿Ï Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… "
-#~ "κόμβου.\n"
-
-#~ msgid "\\%-10[last-menu-item] Pick the last item in this node's menu.\n"
-#~ msgstr ""
-#~ "\\%-10[last-menu-item] Διάλεξε το τελευταίο αντικείμενο στο Î¼ÎµÎ½Î¿Ï Î±Ï…Ï„Î¿Ï "
-#~ "του κόμβου.\n"
-
-#~ msgid "\\%-10[menu-item] Pick a menu item specified by name.\n"
-#~ msgstr ""
-#~ "\\%-10[menu-item] Διάλεξε ένα αντικείμενο του Î¼ÎµÎ½Î¿Ï ÏƒÏμφωνα με το "
-#~ "όνομα.\n"
-
-#~ msgid "\\%-10[xref-item] Follow a cross reference specified by name.\n"
-#~ msgstr "\\%-10[xref-item] ΑκολοÏθησε μία παÏαπομπή σÏμφωνα με το όνομα.\n"
-
-#~ msgid "\\%-10[goto-node] Go to a node specified by name.\n"
-#~ msgstr "\\%-10[goto-node] Πήγαινε σε έναν κόμβο σÏμφωνα με το όνομα.\n"
-
-#~ msgid "\\%-10[search] Search forward for a specified string.\n"
-#~ msgstr "\\%-10[search] Ψάξε για ένα αλφαÏιθμητικό.\n"
-
-#~ msgid "\\%-10[search-previous] Search for previous occurrence.\n"
-#~ msgstr "\\%-10[search-previous] Ψάξε για Ï€ÏοηγοÏμενη εμφάνιση.\n"
-
-#~ msgid "\\%-10[search-next] Search for next occurrence.\n"
-#~ msgstr "\\%-10[search-next] Ψάξε για επόμενη εμφάνιση.\n"
-
-#~ msgid ""
-#~ "\\%-10[index-search] Search for a specified string in the index, and\n"
-#~ " select the node referenced by the first entry found.\n"
-#~ msgstr ""
-#~ "\\%-10[index-search] Ψάξε για ένα αλφαÏιθμητικό στο ευÏετήÏιο και "
-#~ "επέλεξε \n"
-#~ " τον κόμβο που αντιστοιχεί στην Ï€Ïώτη εισαγωγή που θα "
-#~ "βÏεθεί.\n"
-
-#~ msgid "\\%-10[virtual-index] Synthesize menu of matching index entries.\n"
-#~ msgstr ""
-#~ "\\%-10[virtual-index] ΣÏνθεσε ένα Î¼ÎµÎ½Î¿Ï Î±Ï€ÏŒ εισαγωγές που αντιστοιχοÏν "
-#~ "στο ευÏετήÏιο.\n"
-
-#~ msgid "\\%-10[abort-key] Cancel the current operation.\n"
-#~ msgstr "\\%-10[abort-key] ΑκÏÏωσε την Ï„Ïέχουσα λειτουÏγία.\n"
-
-#~ msgid "This is GNU Info version %s. "
-#~ msgstr "Αυτό είναι το GNU Info, έκδοση %s. "
-
-#~ msgid "The current search path is:\n"
-#~ msgstr "Το Ï„Ïέχον μονοπάτι αναζήτησης είναι:\n"
-
-#~ msgid ""
-#~ "Commands available in Info windows:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Διαθέσιμες εντολές σε παÏάθυÏα του Info:\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Welcome to Info version %s. Type \\[get-help-window] for help, \\[get-"
-#~ "info-help-node] for tutorial."
-#~ msgstr ""
-#~ "ΚαλωσήÏθατε στο Info %s. ΠληκτÏολογήστε \\[get-help-window] για βοήθεια, "
-#~ "\\[get-info-help-node] για εκμάθηση."
-
-#, fuzzy
-#~ msgid "No more matches."
-#~ msgstr "Δε βÏέθηκε"
diff --git a/macros/texinfo/texinfo/po_document/en@boldquot.header b/macros/texinfo/texinfo/po_document/en@boldquot.header
index fedb6a06d1..506ca9e9ec 100644
--- a/macros/texinfo/texinfo/po_document/en@boldquot.header
+++ b/macros/texinfo/texinfo/po_document/en@boldquot.header
@@ -2,7 +2,7 @@
# The msgids must be ASCII and therefore cannot contain real quotation
# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
#
# This catalog translates grave accent (0x60) and apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019).
diff --git a/macros/texinfo/texinfo/po_document/en@quot.header b/macros/texinfo/texinfo/po_document/en@quot.header
index a9647fc35c..6522f0ce01 100644
--- a/macros/texinfo/texinfo/po_document/en@quot.header
+++ b/macros/texinfo/texinfo/po_document/en@quot.header
@@ -2,7 +2,7 @@
# The msgids must be ASCII and therefore cannot contain real quotation
# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
#
# This catalog translates grave accent (0x60) and apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019).
diff --git a/macros/texinfo/texinfo/po_document/eo.gmo b/macros/texinfo/texinfo/po_document/eo.gmo
index f777a307a3..bad1c35a20 100644
--- a/macros/texinfo/texinfo/po_document/eo.gmo
+++ b/macros/texinfo/texinfo/po_document/eo.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/eo.po b/macros/texinfo/texinfo/po_document/eo.po
index 5c02240430..56b13e83d1 100644
--- a/macros/texinfo/texinfo/po_document/eo.po
+++ b/macros/texinfo/texinfo/po_document/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.4.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2018-05-24 21:45-0300\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -18,795 +18,795 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"X-Generator: Poedit 1.5.4\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funkcio"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Makroo"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Speciala Formo"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variablo"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Opcio de Uzanto"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Ekzemplera Variablo"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Metodo"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} en {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} de {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{year} {month} {day}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Aldono {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} en {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} de {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "januaro"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "februaro"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "marto"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "aprilo"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "majo"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "junio"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "julio"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "augusto"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "septembro"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "oktobro"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "novembro"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "decembro"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Konsultu la Info-dosieron @file{{myfile}}, nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Konsultu la nodon @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Konsultu la Info-dosieron @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "sekcio ``{section_name}'' en @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Konsultu la sekcion ``{section_name}'' en @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "konsultu la sekcion ``{section_name}'' en @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Konsultu @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "konsultu @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Konsultu {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "konsultu {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(for de iu ajn nodo)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Neniu valoro por `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}-- {category} de {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}-- {category} de {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}-- {category} en {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}-- {category} en {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} en {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} en {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} en {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}-- {category} en {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} de {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} de {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} de {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}-- {category} de {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Pinto"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Enhavo"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Superrigardo"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Indekso"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "nuna"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Antaue"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Supre "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Sekve"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Supre"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Antaue"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Antauenira nodo"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Retroira nodo"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Sekva dosiero"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Antaua dosiero"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Kovro (pinto) de dokumento"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Enhavtabelo"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Malgranda enhavtabelo"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Nuna sekcio"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Antaua sekcio lau lega ordo"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Komenco de tiu @^{c} @^{c}apitro au antaua @^{c}apitro"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Antaua sekcio en la sama nivelo"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Supra sekcio"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Sekva sekcio en la sama nivelo"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Supra nodo"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Sekva nodo"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Antaua nodo"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Sekva nodo lau nod-lega ordo"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Antaua nodo lau nod-lega ordo"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Sekva sekcio lau lega ordo"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Venonta @^{c}apitro"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Pri (helpo)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Unua sekcio lau lega ordo"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Lasta sekcio lau lega ordo"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Antaueniri sekcion en la sekva dosiero"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Retroiri sekcion en la antaua dosiero"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Tio @^{c}i"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Retroiro"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "RapidRetroiro"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "NodSupren"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "SekvaNodo"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "AntauaNodo"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "NodAntaueniro"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "NodRetroiro"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Antaueniro"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "RapidAntaueniro"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Pri"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Unua"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Lasta"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "SekvaDosiero"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "AntauaDosiero"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Pri tiu @^{c}i Dokumento"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Enhavtabelo"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Malgranda Enhavtabelo"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Piednotoj"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "konsultu la sekcion {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "konsultu {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Konsultu la sekcion {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Konsultu {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "konsultu {reference} en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "konsultu @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "konsultu `{section}' en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "konsultu {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "konsultu `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Konsultu {reference} en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Konsultu @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Konsultu `{section}' en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Konsultu {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Konsultu `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "`{section}' en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "`{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Salti al"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Indeksa Ero"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Sekcio"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} de {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} en {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} en {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -815,41 +815,41 @@ msgstr ""
"Tiu @^{c}i dokumento estis generata en @emph{@today{}} uzante "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Tiu @^{c}i dokumento estis generata en @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "La nodo kiun vi ser@^{c}as estas @^{c}e {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " La butonoj en la krozpaneloj havas la jenajn signifojn:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Butono"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nomo"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Iri al"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "De 1.2.3 iru al"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -858,47 +858,47 @@ msgstr ""
" kie la @strong{ Ekzemplo } agnoskas ke la nuna pozicio estas @^{c}e "
"@strong{ Subsubsekcio Unu-Du-Tri } de dokumento kun la jena strukturo:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Sekcio Unu"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Subsekcio Unu-Unu"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Subsekcio Unu-Du"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Subsubsekcio Unu-Du-Unu"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Subsubsekcio Unu-Du-Du"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Subsubsekcio Unu-Du-Tri"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Nuna Pozicio"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Subsubsekcio Unu-Du-Kvar"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Subsekcio Unu-Tri"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Subsekcio Unu-Kvar"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Sentitola Dokumento"
diff --git a/macros/texinfo/texinfo/po_document/es.gmo b/macros/texinfo/texinfo/po_document/es.gmo
index 37f8ca234a..aaa00b8917 100644
--- a/macros/texinfo/texinfo/po_document/es.gmo
+++ b/macros/texinfo/texinfo/po_document/es.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/es.po b/macros/texinfo/texinfo/po_document/es.po
index aa1e083819..7ee7462f1b 100644
--- a/macros/texinfo/texinfo/po_document/es.po
+++ b/macros/texinfo/texinfo/po_document/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document-6.4.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-07-18 00:44+0200\n"
"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
@@ -18,795 +18,795 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Función"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Forma especial"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variable"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Opción del usuario"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Variable de instancia"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Método"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} en {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} de {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "el {day} {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Apéndice {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} en {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} de {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "enero"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "febrero"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "marzo"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "abril"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "mayo"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "junio"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "julio"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "agosto"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "septiembre"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "octubre"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "noviembre"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "diciembre"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Véase el fichero Info @file{{myfile}}, nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Véase el nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Véase el fichero Info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "sección ``{section_name}'' en @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Véase la sección ``{section_name}'' en @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "véase la sección ``{section_name}'' en @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Véase @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "véase @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Véase {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "véase {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(fuera de todos los nodos)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{No hay valor para `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}-- {category} de {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}-- {category} de {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}-- {category} en {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}-- {category} en {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} en {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} en {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} en {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}-- {category} en {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} de {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} de {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} de {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}-- {category} de {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Arriba"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Ãndice general"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Visión de conjunto"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Ãndice"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "actual"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Ant"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Subir "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Siguiente"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Subir"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Anterior"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Avanzar nodo"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Retroceder nodo"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Archivo siguiente"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Archivo anterior"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Portada del documento"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Ãndice general"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Resumen del contenido"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Sección actual"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Sección anterior en orden de lectura"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Inicio de este capítulo o capítulo anterior"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Sección anterior en el mismo nivel"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Subir sección"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Sección siguiente en el mismo nivel"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Subir nodo"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Nodo siguiente"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Nodo anterior"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Nodo siguiente en orden de lectura de nodos"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Nodo anterior en orden de lectura de nodos"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Sección siguiente en orden de lectura"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Capítulo siguiente"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Acerca de (página de ayuda)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Primera sección en orden de lectura"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Última sección en orden de lectura"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Avanzar sección en el siguiente archivo"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Retroceder sección en el archivo anterior"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Este"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Atrás"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "RetrocesoRápido"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "SubirNodo"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "NodoSiguiente"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "NodoAnterior"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "NodoAdelante"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "NodoAtrás"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Adelante"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "AvanceRápido"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Acerca de"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Primero"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Último"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "ArchivoSiguiente"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "ArchivoAnterior"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Acerca de este documento"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Ãndice general"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Resumen del contenido"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Notas al pie"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "véase la sección {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "véase {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Véase la sección {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Véase {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "véase {reference} en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "véase @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "véase `{section}' en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "véase {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "véase `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Véase {reference} en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Véase @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Véase `{section}' en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Véase {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Véase `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "`{section}' en @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "`{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Saltar a"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Entrada de índice"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Sección"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} de {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} en {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} en {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -815,42 +815,42 @@ msgstr ""
"Este documento se generó el @emph{@today{}} utilizando "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Este documento se generó el @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "El nodo que busca se encuentra en {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" Los botones de los paneles de navegación tienen el significado siguiente:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Botón"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nombre"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Ir a"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Desde 1.2.3 ir a"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -860,47 +860,47 @@ msgstr ""
"@strong{ Sub-subsección uno-dos-tres } de un documento de la estructura "
"siguiente:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Sección Uno"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Subsección uno-uno"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Subsección uno-dos"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Sub-subsección uno-dos-uno"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Sub-subsección uno-dos-dos"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Sub-subsección uno-dos-tres"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Posición actual"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Sub-subsección uno-dos-cuatro"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Subsección uno-tres"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Subsección uno-cuatro"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Documento sin título"
diff --git a/macros/texinfo/texinfo/po_document/fr.gmo b/macros/texinfo/texinfo/po_document/fr.gmo
index dbe06f7e63..0e729af289 100644
--- a/macros/texinfo/texinfo/po_document/fr.gmo
+++ b/macros/texinfo/texinfo/po_document/fr.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/fr.po b/macros/texinfo/texinfo/po_document/fr.po
index 3ab7a20674..cc7d8af3bc 100644
--- a/macros/texinfo/texinfo/po_document/fr.po
+++ b/macros/texinfo/texinfo/po_document/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.5.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2019-01-16 19:31+0100\n"
"Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -18,795 +18,795 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Fonction"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Forme Sp@'eciale"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variable"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Option de l'utilisateur"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Variable d'instance"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "M@'ethode"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} de {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} de {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "le {day} {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Annexe {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}@ : "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}@ : "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}@ : "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} de {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} de {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "erreur@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "janvier"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "f@'evrier"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "mars"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "avril"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "mai"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "juin"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "juillet"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "ao@^ut"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "septembre"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "octobre"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "novembre"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "d@'ecembre"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Voir le fichier Info @file{{myfile}}, n@oe{}ud @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Voir le n@oe{}ud @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Voir le fichier Info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "voir la section `{section_name}' dans @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "voir la section `{section_name}' dans @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "voir la section `{section_name}' dans @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Voir @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "voir @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Voir {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "voir {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}@ :} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(en dehors de tout n@oe{}ud)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Aucune valeur pour `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{ }-- {category}@ : {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{ }-- {category}@ : {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category}@ :@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category}@ : {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{ }-- {category}@ :@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{ }-- {category}@ : {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} de {class}@ : {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{ }-- {category} de {class}@ : {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} de {class}@ : {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{ }-- {category} de {class}@ : {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} de {class}@ : {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{ }-- {category} de {class}@ : {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} de {class}@ : {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{ }-- {category} de {class}@ : {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Racine"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Table des mati@`eres"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Vue d'ensemble"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Index"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "courante"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Pr@'ec@'edent"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr "Plus haut"
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Suivant"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Monter"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Pr@'ec@'edent"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Prochain n@oe{}ud"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "N@oe{}ud en arri@`ere"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Fichier suivant"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Fichier pr@'ec@'edent"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Couverture (top) du document"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Table des mati@`eres"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "R@'esum@'e du contenu"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Section actuelle"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Section pr@'ec@'edente dans l'ordre de lecture"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "D@'ebut de ce chapitre ou chapitre pr@'ec@'edent"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Section pr@'ec@'edente au m@^eme niveau"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Section sup@'erieure"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Section suivante au m@^eme niveau"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "N@oe{}ud au dessus"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "N@oe{}ud suivant"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "N@oe{}ud pr@'ec@'edent"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "N@oe{}ud suivant dans l'ordre de lecture"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "N@oe{}ud pr@'ec@'edent dans l'ordre de lecture"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Section suivante dans l'ordre de lecture"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Chapitre suivant"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "A propos (page d'aide)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Premi@`e section dans l'ordre de lecture"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Derni@`ere section dans l'ordre de lecture"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Section du fichier suivant"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Section du fichier pr@'ec@'edent"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Ici"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Arri@`ere"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "RetourRapide"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "N@oe{}udMonter"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "N@oe{}udSuivant"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "N@oe{}udPr@'ec@'edent"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "ProchainN@oe{}ud"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "N@oe{}udArri@`ere"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Avant"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "AvanceRapide"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "A propos"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Premier"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Dernier"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "FichierSuivant"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "FichierPr@'ec@'edent"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "A propos de ce document"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Table des mati@`eres"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "R@'esum@'e du contenu"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Notes de bas de page"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "voir la section {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "voir {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Voir la section {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Voir {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "voir {reference} dans @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "voir @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "voir `{section}' dans @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "voir {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "voir `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Voir {reference} dans @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Voir @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Voir `{section}' dans @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Voir {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Voir `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} dans @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "`{section}' dans @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "`{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Aller @`a"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Entr@'ee d'index"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Section"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}@ : @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}@ : @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}@ :@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}@ : @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} de {class}@ : @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} de {class}@ : @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -815,42 +815,42 @@ msgstr ""
"Ce document a @'et@'e g@'en@'er@'e @emph{@today{}} en utilisant "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Ce document a @'et@'e g@'en@'er@'e le @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Le n@oe{}ud que vous recherchez est ici@ : {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" Les boutons du panneau de navigation ont la signification suivante@ :"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Bouton"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nom"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Aller @`a"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Depuis 1.2.3 aller @`a"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -859,46 +859,46 @@ msgstr ""
" Dans cet exemple on est @`a @strong{ Sous-sous-section un-deux-trois } "
"dans un document dont la structure est@ :"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Section un"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Sous-section un-un"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Sous-section un-deux"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Sous-sous-section un-deux-un"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Sous-sous-section un-deux-deux"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Sous-sous-section un-deux-trois"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Position actuelle"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Sous-sous-section un-deux-quatre"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Sous-section un-trois"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Sous-section un-quatre"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Document sans titre"
diff --git a/macros/texinfo/texinfo/po_document/hr.gmo b/macros/texinfo/texinfo/po_document/hr.gmo
index 2259575264..d5492302d2 100644
--- a/macros/texinfo/texinfo/po_document/hr.gmo
+++ b/macros/texinfo/texinfo/po_document/hr.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/hr.po b/macros/texinfo/texinfo/po_document/hr.po
index 6dcbc15874..1dfefd13a4 100644
--- a/macros/texinfo/texinfo/po_document/hr.po
+++ b/macros/texinfo/texinfo/po_document/hr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU texinfo_document 6.5.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2019-02-04 19:16-0800\n"
"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -22,795 +22,795 @@ msgstr ""
"X-Generator: Lokalize 2.0\n"
"X-Poedit-SourceCharset: UTF-8\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funkcija"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Makro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Specijalna forma"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Varijabla"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "KorisniÄka opcija"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Primjer varijable"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Metoda"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} na {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} od {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Privitak {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} na {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} od {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "greška@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "sijeÄanj"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "veljaÄa"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "ožujak"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "travanj"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "svibanj"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "lipanj"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "srpanj"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "kolovoz"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "rujan"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "listopad"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "studeni"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "prosinac"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Pogledajte Info-datoteku @file{{myfile}}, Ävor @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Pogledajte Ävor @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Pogledajte Info datoteku @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "odlomak „{section_name}“ u @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Pogledajte odlomak „{section_name}“ u @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "pogledajte odlomak „{section_name}“ u @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Pogledajte @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "pogledajte @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Pogledajte {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "pogledajte {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(izvan svakog Ävora)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{nema vrijednosti za „{value}“@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}-- {category} od {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}-- {category} od {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}-- {category} na {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}-- {category} na {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} na {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} na {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}-- {category} na {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} od {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} od {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} od {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}-- {category} od {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Vrh"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Sadržaj"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Pregled"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Indeks"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "aktualno"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Prethodno"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Gore "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Sljedeće"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Gore"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Prethodno"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "ÄŒvor ispred"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "ÄŒvor iza"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Sljedeća datoteka"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Prethodna datoteka"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Naslovna stranica (top) dokumenta"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Sadržaj"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Kratki sadržaj"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Aktualni odlomak"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Prethodni odlomak u redoslijedu Äitanja"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "PoÄetak ovog ili prethodnog poglavlja"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Prethodni odlomak na istoj razini"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Odjeljak iznad"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Sljedeći odlomak na istoj razini"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "ÄŒvor iznad"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Sljedeći Ävor"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Prethodni Ävor"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Sljedeći Ävor u redoslijedu Äitanja Ävorova"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Prethodni Ävor u redoslijedu Äitanja Ävorova"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Sljedeći odlomak u redoslijedu Äitanja"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Sljedeće poglavlje"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "O programu (pomoć)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Prvi odlomak u redoslijedu Äitanja"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Zadnji odlomak u redoslijedu Äitanja"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Odlomak naprijed u sljedećoj datoteci"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Odlomak unatrag u sljedećoj datoteci"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Ovaj"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Unatrag"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "BrzoUnatrag"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "ÄŒvor iznad"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "SljedećiČvor"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "PrethodniÄŒvor"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "ÄŒvorUnaprijed"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "ÄŒvorUnatrag"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Naprijed"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "BrzoUnaprijed"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "O programu"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Prvo"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Zadnje"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "SljedećaDatoteka"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "PrethodnaDatoteka"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "O ovom dokumentu"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Sadržaj"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Kratki sadržaj"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Fusnote"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "pogledajte odlomak {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "pogledajte {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Pogledajte odlomak {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Pogledajte {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "pogledajte {reference} u @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "pogledajte @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "pogledajte „{section}“ u @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "pogledajte {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "pogledajte „{section}“"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Pogledajte {reference} u @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Pogledajte @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Pogledajte „{section}“ u @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Pogledajte {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Pogledajte „{section}“"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} u @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "„{section}“ u @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "„{section}“"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "PreskoÄi na"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Stavka indeksa"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Odlomak"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} od {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} od {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} na {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} na {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} na {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} od {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} od {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} od {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} od {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -819,41 +819,41 @@ msgstr ""
"Ovaj dokument je generiran na @emph{@today{}} rabeći "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Ovaj dokument je generiran na @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Čvor koji tražite nalazi se pri {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " Gumbi u navigacijskom panelu imaju sljedeća znaÄenja:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Gumb"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Ime"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Idi na/u"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Od 1.2.3 idi na/u"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -862,47 +862,47 @@ msgstr ""
" gdje @strong{ primjer } pretpostavlja da je trenutaÄna pozicija na/u "
"@strong{ Pododlomak jedan-dva-tri } dokumenta sljedeće strukture:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Odlomak jedan"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Pododlomak jedan-jedan"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Pododlomak jedan-dva"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Pododlomak jedan-dva-jedan"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Pododlomak jedan-dva-dva"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Pododlomak jedan-dva-tri"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "TrenutaÄna pozicija"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Pododlomak jedan-dva-Äetri"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Pododlomak jedan-tri"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Pododlomak jedan-Äetri"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Dokument bez naslova"
diff --git a/macros/texinfo/texinfo/po_document/hu.gmo b/macros/texinfo/texinfo/po_document/hu.gmo
index 66e0cf2d6f..0056b34262 100644
--- a/macros/texinfo/texinfo/po_document/hu.gmo
+++ b/macros/texinfo/texinfo/po_document/hu.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/hu.po b/macros/texinfo/texinfo/po_document/hu.po
index 077a5a9900..c7e319f510 100644
--- a/macros/texinfo/texinfo/po_document/hu.po
+++ b/macros/texinfo/texinfo/po_document/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.4.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2018-01-20 14:27+0100\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -20,749 +20,749 @@ msgstr ""
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Függvény"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Makró"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Speciális űrlap"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Változó"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Felhasználói beállítás"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Példányváltozó"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Metódus"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} ezen: {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} - {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{year}. {month} {day}."
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Függelék {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} ezen: {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} típusa: {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "január"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "február"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "március"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "április"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "május"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "június"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "július"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "augusztus"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "szeptember"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "október"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "november"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "december"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Lásd: @file{{myfile}} információs fájl, @samp{{mynode}} csomópont"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Lásd: @samp{{mynode}} csomópont"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Lásd: @file{{myfile}} információs fájl"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "„{section_name}†szakasz ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Lásd a(z) „{section_name}†szakaszt ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "lásd a(z) „{section_name}†szakaszt ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Lásd: @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "lásd: @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Lásd: {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "lásd: {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(bármelyik csomóponton kívül)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Nincs érték ehhez: „{value}â€@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}-- {category} - {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}-- {category} - {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}-- {category} ezen: {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}-- {category} ezen: {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} ezen: {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} ezen: {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} ezen: {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}-- {category} ezen: {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} - {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} - {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} - {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}-- {category} - {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Címoldal"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Tartalom"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Ãttekintés"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Tárgymutató"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "jelenlegi"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Előző"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Fel "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Következő"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Fel"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Előző"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Elülső csomópont"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Hátsó csomópont"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Következő fájl"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Előző fájl"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Dokumentum borítója (címoldala)"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Tartalomjegyzék"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Rövid tartalomjegyzék"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Jelenlegi szakasz"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Előző szakasz az olvasási sorrendben"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Ezen fejezet eleje vagy előző fejezet"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Előző szakasz ugyanazon a szinten"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Szülő szakasz"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Következő szakasz ugyanazon a szinten"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Szülő csomópont"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Következő csomópont"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Előző csomópont"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Következő csomópont a csomópont olvasási sorrendben"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Előző csomópont a csomópont olvasási sorrendben"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Következő szakasz az olvasási sorrendben"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Következő fejezet"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Névjegy (súgó)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Első szakasz az olvasási sorrendben"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Utolsó szakasz az olvasási sorrendben"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Elülső szakasz a következő fájlban"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Hátsó szakasz az előző fájlban"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Ez a(z)"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Vissza"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Visszaugrás"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "SzülőCsomópont"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "KövetkezőCsomópont"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "ElőzőCsomópont"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "ElülsőCsomópont"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "HátsóCsomópont"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Előre"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Előreugrás"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Névjegy"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Első"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Utolsó"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "KövetkezőFájl"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "ElőzőFájl"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Ezen dokumentum névjegye"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Tartalomjegyzék"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Rövid tartalomjegyzék"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Lábjegyzet"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "lásd ezt a szakaszt: {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "lásd: {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Lásd ezt a szakaszt: {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Lásd: {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "lásd: {reference} ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "lásd: @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "lásd ezt a szakaszt: „{section}†ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "lásd: {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "lásd: „{section}â€"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Lásd: {reference} ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Lásd: @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Lásd ezt a szakaszt: „{section}†ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Lásd: {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Lásd: „{section}â€"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "„{section}†szakasz ebben: @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "„{section}â€"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Ugrás ide"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Tárgymutató-bejegyzés"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Szakasz"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} - {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} - {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} ezen: {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} ezen: {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
@@ -770,45 +770,45 @@ msgstr ""
"{category} ezen: {class}:@* @emph{{type}}@* @strong{{name}} "
"@emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} ezen: {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} ezen: {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} ezen: {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} - {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category} - {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} - {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} - {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -817,41 +817,41 @@ msgstr ""
"Ezt a dokumentumot @emph{@today{}} napon állította elő a(z) "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Ezt a dokumentumot @emph{@today{}} napon állították elő."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "A keresett csomópont itt található: {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " A navigációs panelen levő gombok jelentése a következő:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Gomb"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Név"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Cél"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "1.2.3-ból ide jutunk"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -860,46 +860,46 @@ msgstr ""
" ahol a @strong{ Példa } azt feltételezi, hogy a jelenlegi pozíció a "
"következő szerkezetű dokumentum @strong{ 1.2.3. alalszakasza }:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "1. szakasz"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "1.1 alszakasz"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "1.2. alszakasz"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "1.2.3. alalszakasz"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "1.2.2. alalszakasz"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "1.2.3. alalszakasz"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Jelenlegi pozíció"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "1.2.4. alalszakasz"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "1.3. alszakasz"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "1.4. alszakasz"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Névtelen dokumentum"
diff --git a/macros/texinfo/texinfo/po_document/insert-header.sin b/macros/texinfo/texinfo/po_document/insert-header.sin
index b26de01f6c..ceeebb937a 100644
--- a/macros/texinfo/texinfo/po_document/insert-header.sin
+++ b/macros/texinfo/texinfo/po_document/insert-header.sin
@@ -1,5 +1,10 @@
# Sed script that inserts the file called HEADER before the header entry.
#
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Written by Bruno Haible <bruno@clisp.org>, 2001.
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to use, copy, distribute, and modify it.
+#
# At each occurrence of a line starting with "msgid ", we execute the following
# commands. At the first occurrence, insert the file. At the following
# occurrences, do nothing. The distinction between the first and the following
diff --git a/macros/texinfo/texinfo/po_document/it.gmo b/macros/texinfo/texinfo/po_document/it.gmo
index fe44aeb95b..58c1f0937a 100644
--- a/macros/texinfo/texinfo/po_document/it.gmo
+++ b/macros/texinfo/texinfo/po_document/it.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/it.po b/macros/texinfo/texinfo/po_document/it.po
index 2bb008fc37..f2c1f0c6f0 100644
--- a/macros/texinfo/texinfo/po_document/it.po
+++ b/macros/texinfo/texinfo/po_document/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.4.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-07-11 10:52+0200\n"
"Last-Translator: Federico Bruni <fede@inventati.org>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,795 +19,795 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funzione"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Forma speciale"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variabile"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Opzione utente"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Variabile dell'istanza"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Metodo"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} su {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} di {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Appendice {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} in {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} di {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Gennaio"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Febbraio"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "Marzo"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "Aprile"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Maggio"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Giugno"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Luglio"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "Agosto"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "Settembre"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Ottobre"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "Novembre"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Dicembre"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Vedi file Info @file{{myfile}}, nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Vedi nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Vedi file Info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "sezione «{section_name}» in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Vedi la sezione «{section_name}» in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "vedi la sezione «{section_name}» in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Vedi @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "vedi @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Vedi {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "vedi {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(fuori da qualsiasi nodo)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Nessun valore per \\\"{value}\\\"@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}-- {category} of {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}-- {category} of {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}-- {category} su {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}-- {category} su {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} su {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} su {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} su {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}-- {category} su {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} di {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} di {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} di {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}-- {category} di {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Inizio"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Contenuti"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Panoramica"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Indice"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "attuale"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Prec"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Su "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Successivo"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Su"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Precedente"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Nodo successivo"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Nodo precedente"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "File successivo"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "File precedente"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Copertina (inizio) del documento"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Indice"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Indice breve"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Sezione attuale"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Sezione precedente in ordine di lettura"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Inizio di questo capitolo o capitolo precedente"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Sezione precedente sullo stesso livello"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Sezione superiore"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Sezione successiva sullo stesso livello"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Nodo superiore"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Nodo successivo"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Nodo precedente"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Nodo successivo in ordine di lettura"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Nodo precedente in ordine di lettura"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Sezione successiva in ordine di lettura"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Capitolo successivo"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Informazioni (aiuto)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Prima sezione in ordine di lettura"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Ultima sezione in ordine di lettura"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Sezione successiva nel prossimo file"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Sezione precedente del file precedente"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Questo"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Indietro"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Indietro veloce"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "Nodo superiore"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "Nodo successivo"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "Nodo precedente"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "Nodo successivo"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "Nodo precedente"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Avanti"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Avanti veloce"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Informazioni"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Primo"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Ultimo"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "File successivo"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "File precedente"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Informazioni su questo documento"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Indice"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Indice breve"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Note a piè di pagina"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "vedi la sezione {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "vedi {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Vedi la sezione {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Vedi {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "vedi {reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "vedi @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "vedi \\\"{section}\\\" in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "vedi {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "vedi \\\"{section}\\\""
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Vedi {reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Vedi @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Vedi \\\"{section}\\\" in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Vedi {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Vedi \\\"{section}\\\""
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "\\\"{section}\\\" in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "\\\"{section}\\\""
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Salta a"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Voce dell'indice"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Sezione"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} di {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} di {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} su {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} su {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} su {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} su {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} su {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} su {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} di {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} di {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} di {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} di {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -816,42 +816,42 @@ msgstr ""
"Questo documento è stato generato il @emph{@today{}} con "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Questo documento è stato generato il @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Il nodo cercato è {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" I pulsanti nei pannelli di navigazione hanno il seguente significato:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Pulsante"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nome"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Vai a"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Da 1.2.3 vai a"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -861,47 +861,47 @@ msgstr ""
"@strong{ Sottosottosezione Uno-Due-Tre } di un documento che ha la seguente "
"struttura:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Sezione uno"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Sottosezione Uno-Uno"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Sottosezione Uno-Due"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Sottosottosezione Uno-Due-Uno"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Sottosottosezione Uno-Due-Due"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Sottosottosezione Uno-Due-Tre"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Posizione Attuale"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Sottosottosezione Uno-Due-Quattro"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Sottosezione Uno-Tre"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Sottosezione Uno-Quattro"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Documento senza titolo"
diff --git a/macros/texinfo/texinfo/po_document/nl.gmo b/macros/texinfo/texinfo/po_document/nl.gmo
index 258141d86c..277de96efd 100644
--- a/macros/texinfo/texinfo/po_document/nl.gmo
+++ b/macros/texinfo/texinfo/po_document/nl.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/nl.po b/macros/texinfo/texinfo/po_document/nl.po
index 4156ef1cdc..37d95160b0 100644
--- a/macros/texinfo/texinfo/po_document/nl.po
+++ b/macros/texinfo/texinfo/po_document/nl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document-6.3.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-04-26 21:52+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -22,796 +22,814 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.0\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Functie"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Speciale vorm"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variabele"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Gebruikeroptie"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Instantiatievariabele"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Methode"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} over {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} van {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Appendix {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} over {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} van {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Januari"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Februari"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "Maart"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "April"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Mei"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Juni"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Juli"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "Augustus"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "September"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Oktober"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "November"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "December"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Zie Info-bestand @file{{myfile}}, pagina @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Zie pagina @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Zie Info-bestand @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "sectie “{section_name}†in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Zie sectie “{section_name}†in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "zie sectie “{section_name}†in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Zie @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "zie @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Zie {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "zie {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(buiten alle pagina's)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Geen waarde voor '{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {name} {arguments}"
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{ }-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {name}"
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{ }-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {type} {name} {arguments}"
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}:@*{type}@*{name}"
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{ }-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category}: {type} {name}"
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{ }-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} van {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {name}"
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{ }-- {category} van {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} over {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {name}"
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{ }-- {category} over {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} over {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} over {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} over {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} on {class}: {type} {name}"
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{ }-- {category} over {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} van {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} van {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} van {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, fuzzy, perl-brace-format
+#| msgid "@tie{ }-- {category} of {class}: {type} {name}"
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{ }-- {category} van{class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Top"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Inhoud"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Overzicht"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Index"
# Met een hoofdletter want komt aan begin van zin, en voor "beleid" of "prioriteit".
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "huidige"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Vrg"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Op "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Volgende"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Omhoog"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Voorgaande"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Vooruit"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Terug"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Volgend bestand"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Voorgaand bestand"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Omslag van document (top)"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Inhoudsopgave"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Korte inhoudsopgave"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Huidige sectie"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Voorgaande sectie in leesvolgorde"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Begin van dit (of voorgaand) hoofdstuk"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Voorgaande sectie op zelfde niveau"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Bovenliggende sectie"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Volgende sectie op zelfde niveau"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Bovenliggende pagina"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Volgende pagina"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Voorgaande pagina"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Volgende pagina in leesvolgorde"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Voorgaande pagina in leesvolgorde"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Volgende sectie in leesvolgorde"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Volgende hoofdstuk"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Info (hulp)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Eerste sectie in leesvolgorde"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Laatste sectie in leesvolgorde"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Sectie vooruit in volgend bestand"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Sectie terug in voorgaand bestand"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Deze"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Terug"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Snel-terug"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "Pagina-omhoog"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "Volgende-pagina"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "Voorgaande-pagina"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "Pagina-vooruit"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "Pagina-terug"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Vooruit"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Snel-vooruit"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Info"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Eerste"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Laatste"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "Volgend-bestand"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "Voorgaand-bestand"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Over dit document"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Inhoudsopgave"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Korte inhoudsopgave"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Voetnoten"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "zie sectie {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "zie {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Zie sectie {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Zie {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "zie {reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "zie @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "zie ‘{section}’ in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "zie {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "zie ‘{section}’"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Zie {reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Zie @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Zie ‘{section}’ in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Zie {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Zie ‘{section}’"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "‘{section}’ in @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "‘{section}’"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Spring naar"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Index-item"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Sectie"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} van {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} van {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} over {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} over {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} over {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} over {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} over {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} over {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} van {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} van {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} van {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} van {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -820,41 +838,41 @@ msgstr ""
"Dit document werd gegenereerd op @emph{@today{}} met behulp van "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Dit document werd gegenereerd op @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "De pagina die u zoekt bevindt zich op {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " De knoppen in de navigatiepanelen hebben de volgende functies:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Knop"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Naam"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Gaat naar"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Gaat van 1.2.3 naar"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -864,46 +882,46 @@ msgstr ""
"@strong{ subsubsectie één-twee-drie } is in een document met de volgende "
"structuur:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Sectie één"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Subsectie één-één"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Subsectie één-twee"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Subsectie één-twee-één"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Subsectie één-twee-twee"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Subsectie één-twee-drie"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Huidige positie"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Subsectie één-twee-vier"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Subsectie één-drie"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Subsectie één-vier"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Naamloos document"
diff --git a/macros/texinfo/texinfo/po_document/no.us-ascii.gmo b/macros/texinfo/texinfo/po_document/no.us-ascii.gmo
index bd7b076070..2f96268350 100644
--- a/macros/texinfo/texinfo/po_document/no.us-ascii.gmo
+++ b/macros/texinfo/texinfo/po_document/no.us-ascii.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/no.us-ascii.po b/macros/texinfo/texinfo/po_document/no.us-ascii.po
index 70507436e9..2bdb66a9e9 100644
--- a/macros/texinfo/texinfo/po_document/no.us-ascii.po
+++ b/macros/texinfo/texinfo/po_document/no.us-ascii.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 5.0\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2001-01-01\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -16,878 +16,878 @@ msgstr ""
"Content-Type: text/plain; charset=us-ascii\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr ""
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr ""
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr ""
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr ""
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr ""
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr ""
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr ""
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr ""
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr ""
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr ""
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr ""
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr ""
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr ""
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "januar"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "februar"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "mars"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "april"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "mai"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "juni"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "juli"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "august"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "september"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "oktober"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "november"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "desember"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Indeks"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "No translation available!"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Innholdsfortegnelse"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Kort innholdsfortegnelse"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "No translation available!"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
"@uref{{program_homepage}, @emph{{program}}}."
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
"structure:"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr ""
diff --git a/macros/texinfo/texinfo/po_document/pl.gmo b/macros/texinfo/texinfo/po_document/pl.gmo
index 11ffe541be..35b03a6ca8 100644
--- a/macros/texinfo/texinfo/po_document/pl.gmo
+++ b/macros/texinfo/texinfo/po_document/pl.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/pl.po b/macros/texinfo/texinfo/po_document/pl.po
index 52bff75395..5a41bc2c9a 100644
--- a/macros/texinfo/texinfo/po_document/pl.po
+++ b/macros/texinfo/texinfo/po_document/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.4.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-07-11 22:19+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -17,749 +17,749 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Bugs: Report translation errors to the Language-Team address.\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Funkcja"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Makro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Postać specjalna"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Zmienna"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Opcja użytkownika"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Przykład zmiennej"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Metoda"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} dla klasy {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} klasy {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Załącznik {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} dla klasy {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} klasy {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "błąd@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "styczeń"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "luty"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "marzec"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "kwiecień"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "maj"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "czerwiec"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "lipiec"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "sierpień"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "wrzesień"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "październik"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "listopad"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "grudzień"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "P. plik Info @file{{myfile}}, węzeł @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "P. węzeł @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "P. plik info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "sekcja ``{section_name}'' in @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "P. sekcja ``{section_name}'' w @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "p. sekcja ``{section_name}'' w @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "P. @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "p. @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "P. {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "p. {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(poza węzłem)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Brak wartości dla `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}- {category} klasy {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}- {category} klasy {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}- {category} dla klasy {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}- {category} dla klasy {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}- {category} dla klasy {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}- {category} dla klasy {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}- {category} dla klasy {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}- {category} dla klasy {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}- {category} klasy {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}- {category} klasy {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}- {category} klasy {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}- {category} klasy {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center - @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Szczytowy"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Treść"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "PrzeglÄ…d"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Indeks"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "bieżący"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Poprzedni"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " W górę "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Następny"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "W górę"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Poprzedni"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Węzeł w przód"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Węzeł w tył"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Następny plik"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Poprzedni plik"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Okładka (szczyt) dokumentu"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Spis treści"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Skrócony spis treści"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Sekcja bieżąca"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Sekcja poprzednia w kolejności czytania"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Początek tego rozdziału lub rozdział poprzedni"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Sekcja poprzednia na tym samym poziomie"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Sekcja w górę"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Sekcja następna na tym samym poziomie"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Węzęł w górę"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Następny węzeł"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Poprzedni węzeł"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Węzeł następny w kolejności czytania"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Węzeł poprzedni w kolejności czytania"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Sekcja następna w kolejności czytania"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Następny rozdział"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "O dokumencie (pomoc)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Sekcja pierwsza w kolejości czytania"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Sekcja ostatnia w kolejości czytania"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Sekcja w przód w następnym pliku"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Sekcja wstecz w poprzednim pliku"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Ten"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Wstecz"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "SzybkoWstecz"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "WęzełWGórę"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "WęzełNastępny"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "WęzełPoprzedni"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "WęzełWPrzód"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "WęzełWstecz"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "WPrzód"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "SzybkoWPrzód"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "O"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Pierwszy"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Ostatni"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "PlikNastępny"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "PlikPoprzedni"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "O tym dokumencie"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Spis treści"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Skrócony spis treści"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Przypisy"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "p. sekcja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "p. {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "P. sekcja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "P. {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "p. {reference} w @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "p. @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "p. `{section}' w @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "p. {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "p. `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "P. {reference} w @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "P. @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "P. `{section}' w @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "P. {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "P. `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} w @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "`{section}' w @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "`{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Skok do"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Wpis indeksu"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Sekcja"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} klasy {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} klasy {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} dla klasy {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} dla klasy {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
@@ -767,24 +767,24 @@ msgstr ""
"{category} dla klasy {class}:@* @emph{{type}}@* @strong{{name}} "
"@emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} dla klasy {class}: @emph{{type}} @strong{{name}} "
"@emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} dla klasy {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} dla klasy {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
@@ -792,23 +792,23 @@ msgstr ""
"{category} klasy {class}:@* @emph{{type}}@* @strong{{name}} "
"@emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} klasy {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} klasy {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} klasy {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -817,41 +817,41 @@ msgstr ""
"Ten dokument został wygenerowany @emph{@today{}} przy użyciu programu "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Ten dokument został wygenerowany @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Poszukiwany węzeł jest pod {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " Przyciski w panelach nawigacyjnych mają następujące znaczenie:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Przycisk"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nazwa"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Przechodzi do"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "Z 1.2.3 przechodzi do"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -861,46 +861,46 @@ msgstr ""
"@strong{ Podpodsekcja Jeden-Dwa-Trzy } w dokumencie o następującej "
"strukturze:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Sekcja Jeden"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Podsekcja Jeden-Jeden"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Podsekcja Jeden-Dwa"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Podpodsekcja Jeden-Dwa-Jeden"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Podpodsekcja Jeden-Dwa-Dwa"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Podpodsekcja Jeden-Dwa-Trzy"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Bieżąca pozycja"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Podpodsekcja Jeden-Dwa-Cztery"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Podsekcja Jeden-Trzy"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Podsekcja Jeden-Cztery"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Dokument bez tytułu"
diff --git a/macros/texinfo/texinfo/po_document/pt.gmo b/macros/texinfo/texinfo/po_document/pt.gmo
index 512a689482..554492f69f 100644
--- a/macros/texinfo/texinfo/po_document/pt.gmo
+++ b/macros/texinfo/texinfo/po_document/pt.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/pt.po b/macros/texinfo/texinfo/po_document/pt.po
index 95ccb2e422..05fbf1842a 100644
--- a/macros/texinfo/texinfo/po_document/pt.po
+++ b/macros/texinfo/texinfo/po_document/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.4.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2018-10-24 09:03+0100\n"
"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
"Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -19,795 +19,795 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\\n\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Função"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Formulário especial"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Variável"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Opção do utilizador"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Variável de instância"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Método"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} na {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} da {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} de {month} de {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Apêndice {number}, {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number}, {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} na {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} da {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Janeiro"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Fevereiro"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "Março"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "Abril"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Maio"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Junho"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Julho"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "Agosto"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "Setembro"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Outubro"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "Novembro"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Dezembro"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Veja o ficheiro @file{{myfile}}, nó @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Veja o nó @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Veja o ficheiro @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "secção ``{section_name}'' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "veja a secção ``{section_name}'' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "veja a secção ``{section_name}'' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Veja {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "veja {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(fora de qualquer nó)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Sem valor para `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}-- {category} da {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}-- {category} da {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}-- {category} na {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}-- {category} na {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} na {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} na {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}-- {category} na {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} da {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} da {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} da {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}-- {category} da {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Topo"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Conteúdo"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Resumo"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Ãndice"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "actual"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Anterior"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Acima "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Seguinte"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Acima"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Anterior"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Avançar"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Recuar"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Ficheiro seguinte"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Ficheiro anterior"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Capa (topo) do documento"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Ãndice"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Ãndice breve"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Secção actual"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Secção anterior na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Começo deste capítulo ou do capítulo anterior"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Secção anterior no mesmo nível"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Secção acima"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Secção seguinte no mesmo nível"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Nó acima"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Nó seguinte"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Nó anterior"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Nó seguinte na ordem de leitura de nós"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Nó anterior na ordem de leitura de nós"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Secção seguinte na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Capítulo seguinte"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Acerca (ajuda)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Primeira secção na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "Última secção na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Avançar para secção no ficheiro seguinte"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Recuar para secção no ficheiro anterior"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Este"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Recuar"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Recuo rápido"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "NóAcima"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "NóSeguinte"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "NóAnterior"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "NóAvançar"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "NóRecuar"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Avançar"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "AvançoRápido"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Acerca"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Primeiro"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "Último"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "FicheiroSeguinte"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "FicheiroAnterior"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Acerca deste documento"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Ãndice"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Ãndice breve"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Notas de rodapé"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "veja a secção {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Veja a secção {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "veja {reference} em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "veja @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "veja `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "veja {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "veja `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Veja {reference} em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Veja @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Veja `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Veja {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Veja `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "`{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "`{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Ir para"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Entrada de índice"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Secção"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} da {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} na {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} na {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} na {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} da {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} da {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -816,41 +816,41 @@ msgstr ""
"Este documento foi gerado em @emph{@today{}}, usando o "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Este documento foi gerado em @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "O nó que procura está em {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " Os botões nos painéis de navegação têm o seguinte significado:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Botão"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nome"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Ir para"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "De 1.2.3 ir para"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -859,47 +859,47 @@ msgstr ""
" onde o @strong{ Exemplo } assume que a posição actual é a @strong{ Sub-sub-"
"secção Um-Dois-TrÊs } de um documento com a seguinte estrutura:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Secção um"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Sub-secção um-um"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Sub-secção um-dois"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Sub-sub-secção um-dois-um"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Sub-sub-secção um-dois-dois"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Sub-sub-secção um-dois-três"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Posição actual"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Sub-sub-secção um-dois-quatro"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Sub-secção um-três"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Sub-secção um-quatro"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Documento sem nome"
diff --git a/macros/texinfo/texinfo/po_document/pt.us-ascii.gmo b/macros/texinfo/texinfo/po_document/pt.us-ascii.gmo
index 6eccd5d8e5..bd1569f5ce 100644
--- a/macros/texinfo/texinfo/po_document/pt.us-ascii.gmo
+++ b/macros/texinfo/texinfo/po_document/pt.us-ascii.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/pt.us-ascii.po b/macros/texinfo/texinfo/po_document/pt.us-ascii.po
index d6a2a8edc4..a686d7cc8f 100644
--- a/macros/texinfo/texinfo/po_document/pt.us-ascii.po
+++ b/macros/texinfo/texinfo/po_document/pt.us-ascii.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo 5.0\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2006-01-09\n"
"Last-Translator: Jorge Barros de Abreu <ficmatin01@solar.com.br>\n"
"Language-Team: Unknown\n"
@@ -16,804 +16,804 @@ msgstr ""
"Content-Type: text/plain; charset=us-ascii\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
#, fuzzy
msgid "Function"
msgstr "Se@,{c}@~ao"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr ""
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr ""
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr ""
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
#, fuzzy
msgid "User Option"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr ""
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr ""
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} na {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} da {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} de {month} de {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr ""
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr ""
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} na {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} da {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Janeiro"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Fevereiro"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "Mar@,{c}o"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "Abril"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Maio"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Junho"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Julho"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "Agosto"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "Setembro"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Outubro"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "Novembro"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Dezembro"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, fuzzy, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "veja se@,{c}@~ao `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, fuzzy, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "veja se@,{c}@~ao `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, fuzzy, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "veja se@,{c}@~ao `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{ }-- {category} da {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} na {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{ }-- {category} na {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{ }-- {category} da {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{ }-- {category} na {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} na {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{ }-- {category} na {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} da {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{ }-- {category} da {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Topo"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Conte@'udo"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Vis@~ao geral"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "@'Indice"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "atual"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Pr@'evio"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Acima "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Pr@'oximo"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Acima"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
#, fuzzy
msgid "Forward node"
msgstr "Avan@,{c}ar"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
#, fuzzy
msgid "Back node"
msgstr "Nodo acima"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "In@'icio (topo) do documento"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Sum@'ario"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Breve sum@'ario"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Se@,{c}@~ao atual"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Se@,{c}@~ao anterior na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Se@,{c}@~ao anterior no mesmo n@'ivel"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Pr@'oxima se@,{c}@~ao no mesmo n@'ivel"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Nodo acima"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Pr@'oximo nodo"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Nodo anterior"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
#, fuzzy
msgid "Next node in node reading order"
msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
#, fuzzy
msgid "Previous node in node reading order"
msgstr "Se@,{c}@~ao anterior na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Pr@'oximo cap@'itulo"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Sobre (ajuda)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Primeira se@,{c}@~ao na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "@'Ultima se@,{c}@~ao na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Esse"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Volta"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Voltar R@'apido"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "Nodo Acima"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "Pr@'oximo Nodo"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "Nodo Anterior"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
#, fuzzy
msgid "NodeForward"
msgstr "Avan@,{c}ar"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
#, fuzzy
msgid "NodeBack"
msgstr "Volta"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Avan@,{c}ar"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Avan@,{c}ar R@'apido"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Sobre"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Primeiro"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "@'Ultimo"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Sobre Esse Documento"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Sum@'ario"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Breve Sum@'ario"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Notas de Rodap@'e"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "veja se@,{c}@~ao {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Veja se@,{c}@~ao {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "veja {node_file_href} @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, fuzzy, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Veja {node_file_href} @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, fuzzy, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Veja se@,{c}@~ao `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "Veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, fuzzy, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Pular para"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Entrada de @'Indice"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Se@,{c}@~ao"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, fuzzy, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, fuzzy, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} da {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} na {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, fuzzy, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, fuzzy, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, fuzzy, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, fuzzy, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -822,45 +822,45 @@ msgstr ""
"Esse documento foi gerado em @i{{date}} usando @uref{{program_homepage}, "
"@i{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
#, fuzzy
msgid "This document was generated on @emph{@today{}}."
msgstr ""
"Esse documento foi gerado usando @uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "O nodo que vo@^e est@'a olhando est@'a em {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" Os bot@~oes nos pain@'eis de navega@,{c}@~ao possuem os seguintes "
"significados:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Bot@~ao"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nome"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "V@'a para"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "De 1.2.3 v@'a para"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -870,47 +870,47 @@ msgstr ""
"@strong{ Subsub@,{c}@~ao Um-Dois-Tr@^es } de um documento com a seguinte "
"estrutura:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Se@,{c}@~ao Um"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Subse@,{c}@~ao Um-Um"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Subse@,{c}@~ao Um-Dois"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Subse@,{c}@~ao Um-Dois-Um"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Subse@,{c}@~ao Um-Dois-Dois"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Posi@,{c}@~ao Atual"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Subse@,{c}@~ao Um-Tr@^es"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Subse@,{c}@~ao Um-Quatro"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Documento Sem Nome"
diff --git a/macros/texinfo/texinfo/po_document/pt_BR.gmo b/macros/texinfo/texinfo/po_document/pt_BR.gmo
index 33c9acbe61..36155d2680 100644
--- a/macros/texinfo/texinfo/po_document/pt_BR.gmo
+++ b/macros/texinfo/texinfo/po_document/pt_BR.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/pt_BR.po b/macros/texinfo/texinfo/po_document/pt_BR.po
index 10e6d085ee..808c4339a7 100644
--- a/macros/texinfo/texinfo/po_document/pt_BR.po
+++ b/macros/texinfo/texinfo/po_document/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.5.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2019-01-05 07:11-0300\n"
"Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -20,799 +20,823 @@ msgstr ""
"X-Bugs: Report translation errors to the Language-Team address.\n"
"X-Generator: Poedit 1.6.10\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "Fun@,{c}@~{a}o"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Forma Especial"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Vari@'{a}vel"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Op@,{c}@~{a}o de Usu@'ario"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Vari@'{a}vel de inst@^{a}ncia"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "M@'{e}todo"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} na {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} da {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} de {month} de {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Ap@^{e}ndice {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} na {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} da {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Janeiro"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Fevereiro"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "Mar@,{c}o"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "Abril"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Maio"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Junho"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Julho"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "Agosto"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "Setembro"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Outubro"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "Novembro"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Dezembro"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Veja arquivo Info @file{{myfile}}, nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Veja nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Veja arquivo Info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "se@,{c}@~{a}o ``{section_name}'' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Veja se@,{c}@~{a}o ``{section_name}'' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "veja se@,{c}@~{a}o ``{section_name}'' em @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Veja {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "veja {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(fora de qualquer nodo)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Nenhum valor para `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, fuzzy, perl-brace-format
+#| msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, fuzzy, perl-brace-format
+#| msgid "{category}: @strong{{name}}"
msgid "@tie{}-- {category}: {name}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, fuzzy, perl-brace-format
+#| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, fuzzy, perl-brace-format
+#| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, fuzzy, perl-brace-format
+#| msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, fuzzy, perl-brace-format
+#| msgid "{category}: @emph{{type}} @strong{{name}}"
msgid "@tie{}-- {category}: {type} {name}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}: @strong{{name}}"
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "{category} de {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "{category} em {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}: @strong{{name}}"
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "{category} em {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, fuzzy, perl-brace-format
+#| msgid ""
+#| "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#| "@emph{{arguments}}"
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr ""
"{category} em {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, fuzzy, perl-brace-format
+#| msgid ""
+#| "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr ""
"{category} em {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "{category} em {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, fuzzy, perl-brace-format
+#| msgid ""
+#| "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#| "@emph{{arguments}}"
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr ""
"{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, fuzzy, perl-brace-format
+#| msgid ""
+#| "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr ""
"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "{category} da {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Topo"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Conte@'{u}do"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Vis@~{a}o geral"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "@'{I}ndice"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "atual"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Anterior"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Acima "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Pr@'{o}ximo"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Acima"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Anterior"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Avan@,{c}ar nodo"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Voltar nodo"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Arquivo seguinte"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Arquivo anterior"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "In@'{i}cio (topo) do documento"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Sum@'{a}rio"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Breve sum@'{a}rio"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Se@,{c}@~{a}o atual"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Se@,{c}@~{a}o anterior na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Come@,{c}o desse cap@'{i}tulo ou cap@'{i}tulo anterior"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Se@,{c}@~{a}o anterior no mesmo n@'{i}vel"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Se@,{c}@~{a}o acima"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Pr@'{o}xima se@,{c}@~{a}o no mesmo n@'{i}vel"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Nodo acima"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Pr@'{o}ximo nodo"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Nodo anterior"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "Pr@'{o}ximo nodo na ordem de leitura de nodo"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Nodo anterior na ordem de leitura de nodo"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Pr@'{o}xima se@,{c}@~{a}o na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Pr@'{o}ximo cap@'{i}tulo"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Sobre (ajuda)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Primeira se@,{c}@~{a}o na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "@'{u}ltima se@,{c}@~{a}o na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Avan@,{c}a se@,{c}@~{a}o no arquivo seguinte"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Volta se@,{c}@~{a}o no arquivo anterior"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Esse"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Volta"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Voltar R@'{a}pido"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "Nodo Acima"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "Pr@'{o}ximo Nodo"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "Nodo Anterior"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "Avan@,{c}ar Nodo"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "Voltar Nodo"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Avan@,{c}ar"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Avan@,{c}ar R@'{a}pido"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Sobre"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Primeiro"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "@'{u}ltimo"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "Proximo Arquivo"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "Arquivo Anterior"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Sobre Esse Documento"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Sum@'{a}rio"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Breve Sum@'{a}rio"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Notas de Rodap@'{e}"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "veja se@,{c}@~{a}o {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Veja se@,{c}@~{a}o {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "veja {reference} em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "veja @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "veja `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "veja {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "veja `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Veja {reference} em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Veja @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Veja `{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Veja {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Veja `{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "`{section}' em @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "`{section}'"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Pular para"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Entrada de @'{i}ndice"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Se@,{c}@~{a}o"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} de {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} em {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} em {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} em {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} em {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} em {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} da {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -821,43 +845,43 @@ msgstr ""
"Esse documento foi gerado em @emph{@today{}} usando "
"@uref{{program_homepage}, @emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Esse documento foi gerado em @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "O nodo atualmente visto encontra-se em {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" Os bot@~{o}es nos pain@'{e}is de navega@,{c}@~{a}o possuem os seguintes "
"significados:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Bot@~{a}o"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nome"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "V@'{a} para"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "De 1.2.3 v@'{a} para"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -867,46 +891,46 @@ msgstr ""
"em @strong{ Subsub@,{c}@~{a}o Um-Dois-Tr@^es } de um documento com a "
"seguinte estrutura:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Se@,{c}@~{a}o Um"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Subse@,{c}@~{a}o Um-Um"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Subse@,{c}@~{a}o Um-Dois"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Subse@,{c}@~{a}o Um-Dois-Um"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Subse@,{c}@~{a}o Um-Dois-Dois"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Subse@,{c}@~{a}o Um-Dois-Tr@^es"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Posi@,{c}@~{a}o Atual"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Subse@,{c}@~{a}o Um-Dois-Quatro"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Subse@,{c}@~{a}o Um-Tr@^es"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Subse@,{c}@~{a}o Um-Quatro"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Documento Sem Nome"
diff --git a/macros/texinfo/texinfo/po_document/pt_BR.us-ascii.gmo b/macros/texinfo/texinfo/po_document/pt_BR.us-ascii.gmo
index ba8d12bc33..63e5bf9459 100644
--- a/macros/texinfo/texinfo/po_document/pt_BR.us-ascii.gmo
+++ b/macros/texinfo/texinfo/po_document/pt_BR.us-ascii.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/pt_BR.us-ascii.po b/macros/texinfo/texinfo/po_document/pt_BR.us-ascii.po
index 30872237af..206f553451 100644
--- a/macros/texinfo/texinfo/po_document/pt_BR.us-ascii.po
+++ b/macros/texinfo/texinfo/po_document/pt_BR.us-ascii.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 5.9.93\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2015-06-07 06:25-0300\n"
"Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -18,842 +18,842 @@ msgstr ""
"Content-Type: text/plain; charset=us-ascii\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
#, fuzzy
msgid "Function"
msgstr "Se@,{c}@~ao"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "Macro"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Forma Especial"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Vari@'{a}vel"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
#, fuzzy
msgid "User Option"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Vari@'{a}vel de inst@^{a}ncia"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "M@'{e}todo"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, fuzzy, perl-brace-format
msgid "{category} on {class}"
msgstr "{name} na {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, fuzzy, perl-brace-format
msgid "{category} of {class}"
msgstr "{name} da {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} de {month} de {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Ap@^{e}ndice {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, fuzzy, perl-brace-format
msgid "{number} {section_title}"
msgstr "Ap@^{e}ndice {number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} na {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} da {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "Janeiro"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "Fevereiro"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "Mar@,{c}o"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "Abril"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "Maio"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "Junho"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "Julho"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "Agosto"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "Setembro"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "Outubro"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "Novembro"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "Dezembro"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_number}\n"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, fuzzy, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}\n"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Veja arquivo Info @file{{myfile}}, nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Veja nodo @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Veja arquivo Info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Veja {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "veja {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(fora de qualquer nodo)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Nenhum valor para `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{ }-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{ }-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{ }-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{ }-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{ }-- {category} da {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{ }-- {category} na {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} na {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{ }-- {category} na {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{ }-- {category} da {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{ }-- {category} da {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Topo"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "Conte@'udo"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "Vis@~ao geral"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "@'Indice"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "atual"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Pr@'evio"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr " Acima "
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Pr@'oximo"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Acima"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Anterior"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
#, fuzzy
msgid "Forward node"
msgstr "Avan@,{c}ar"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
#, fuzzy
msgid "Back node"
msgstr "Nodo acima"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "Arquivo seguinte"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Arquivo anterior"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "In@'icio (topo) do documento"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "Sum@'ario"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Breve sum@'ario"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Se@,{c}@~ao atual"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Se@,{c}@~ao anterior na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Se@,{c}@~ao anterior no mesmo n@'ivel"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "Pr@'oxima se@,{c}@~ao no mesmo n@'ivel"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Nodo acima"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "Pr@'oximo nodo"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Nodo anterior"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
#, fuzzy
msgid "Next node in node reading order"
msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
#, fuzzy
msgid "Previous node in node reading order"
msgstr "Se@,{c}@~ao anterior na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "Pr@'oxima se@,{c}@~ao na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "Pr@'oximo cap@'itulo"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Sobre (ajuda)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Primeira se@,{c}@~ao na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "@'Ultima se@,{c}@~ao na ordem de leitura"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Avan@,{c}a se@,{c}@~ao no arquivo seguinte"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Volta se@,{c}@~ao no arquivo anterior"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Esse"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Volta"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "Voltar R@'apido"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "Nodo Acima"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "Pr@'oximo Nodo"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "Nodo Anterior"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
#, fuzzy
msgid "NodeForward"
msgstr "Avan@,{c}ar"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
#, fuzzy
msgid "NodeBack"
msgstr "Volta"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Avan@,{c}ar"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "Avan@,{c}ar R@'apido"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "Sobre"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Primeiro"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "@'Ultimo"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "ProximoArquivo"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "ArquivoAnterior"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Sobre Esse Documento"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "Sum@'ario"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Breve Sum@'ario"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "Notas de Rodap@'e"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "veja se@,{c}@~ao {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Veja se@,{c}@~ao {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, fuzzy, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, fuzzy, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "Veja {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, fuzzy, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "Se@,{c}@~ao acima"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Pular para"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Entrada de @'Indice"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Se@,{c}@~ao"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, fuzzy, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "@tie{ }-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, fuzzy, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, fuzzy, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, fuzzy, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, fuzzy, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, fuzzy, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, fuzzy, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "@tie{ }-- {category} da {class}: {name}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, fuzzy, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, fuzzy, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "@tie{ }-- {category} na {class}: {name}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, fuzzy, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, fuzzy, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, fuzzy, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, fuzzy, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, fuzzy, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, fuzzy, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, fuzzy, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, fuzzy, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
"@uref{{program_homepage}, @emph{{program}}}."
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, fuzzy, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "O nodo que vo@^e est@'a olhando est@'a em {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" Os bot@~oes nos pain@'eis de navega@,{c}@~ao possuem os seguintes "
"significados:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Bot@~ao"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Nome"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "V@'a para"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "De 1.2.3 v@'a para"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -863,47 +863,47 @@ msgstr ""
"@strong{ Subsub@,{c}@~ao Um-Dois-Tr@^es } de um documento com a seguinte "
"estrutura:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Se@,{c}@~ao Um"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Subse@,{c}@~ao Um-Um"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Subse@,{c}@~ao Um-Dois"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Subse@,{c}@~ao Um-Dois-Um"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Subse@,{c}@~ao Um-Dois-Dois"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Posi@,{c}@~ao Atual"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Subse@,{c}@~ao Um-Tr@^es"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Subse@,{c}@~ao Um-Quatro"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Documento Sem Nome"
diff --git a/macros/texinfo/texinfo/po_document/remove-potcdate.sin b/macros/texinfo/texinfo/po_document/remove-potcdate.sin
index 2436c49e78..8c70dfbf14 100644
--- a/macros/texinfo/texinfo/po_document/remove-potcdate.sin
+++ b/macros/texinfo/texinfo/po_document/remove-potcdate.sin
@@ -1,6 +1,12 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
+# Sed script that removes the POT-Creation-Date line in the header entry
# from a POT file.
#
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
+#
# The distinction between the first and the following occurrences of the
# pattern is achieved by looking at the hold space.
/^"POT-Creation-Date: .*"$/{
diff --git a/macros/texinfo/texinfo/po_document/sv.gmo b/macros/texinfo/texinfo/po_document/sv.gmo
new file mode 100644
index 0000000000..c6c198ad84
--- /dev/null
+++ b/macros/texinfo/texinfo/po_document/sv.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/sv.po b/macros/texinfo/texinfo/po_document/sv.po
new file mode 100644
index 0000000000..b0fd601f71
--- /dev/null
+++ b/macros/texinfo/texinfo/po_document/sv.po
@@ -0,0 +1,905 @@
+# Swedish messages for texinfo_document.
+# Copyright (C) 2019 Free Software Foundation, Inc.
+# This file is distributed under the same license as the texinfo package.
+# Sebastian Rasmussen <sebras@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU texinfo_document 6.5.90\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
+"PO-Revision-Date: 2019-04-19 05:41+0800\n"
+"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.2.1\n"
+
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
+msgid "Function"
+msgstr "Funktion"
+
+#: tp/Texinfo/Common.pm:723
+msgid "Macro"
+msgstr "Makro"
+
+#: tp/Texinfo/Common.pm:724
+msgid "Special Form"
+msgstr "Specialform"
+
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
+msgid "Variable"
+msgstr "Variable"
+
+#: tp/Texinfo/Common.pm:726
+msgid "User Option"
+msgstr "Användarinställning"
+
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
+msgid "Instance Variable"
+msgstr "Instantsvariabel"
+
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
+msgid "Method"
+msgstr "Metod"
+
+#: tp/Texinfo/Common.pm:1242
+#, perl-brace-format
+msgid "{category} on {class}"
+msgstr "{category} på {class}"
+
+#: tp/Texinfo/Common.pm:1249
+#, perl-brace-format
+msgid "{category} of {class}"
+msgstr "{category} av {class}"
+
+#: tp/Texinfo/Common.pm:1271
+#, perl-brace-format
+msgid "{month} {day}, {year}"
+msgstr "{month} {day}, {year}"
+
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
+#, perl-brace-format
+msgid "Appendix {number} {section_title}"
+msgstr "Appendix {number} {section_title}"
+
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
+#, perl-brace-format
+msgid "{number} {section_title}"
+msgstr "{number} {section_title}"
+
+#: tp/Texinfo/Common.pm:1567
+#, perl-brace-format
+msgid "{float_type} {float_number}: "
+msgstr "{float_type} {float_number}: "
+
+#: tp/Texinfo/Common.pm:1571
+#, perl-brace-format
+msgid "{float_type}: "
+msgstr "{float_type}: "
+
+#: tp/Texinfo/Common.pm:1576
+#, perl-brace-format
+msgid "{float_type} {float_number}\n"
+msgstr "{float_type} {float_number}\n"
+
+#: tp/Texinfo/Common.pm:1580
+#, perl-brace-format
+msgid "{float_type}\n"
+msgstr "{float_type}\n"
+
+#: tp/Texinfo/Common.pm:1586
+#, perl-brace-format
+msgid "{float_number}: "
+msgstr "{float_number}: "
+
+#: tp/Texinfo/Common.pm:1589
+#, perl-brace-format
+msgid "{float_number}\n"
+msgstr "{float_number}\n"
+
+#: tp/Texinfo/Common.pm:2522
+#, perl-brace-format
+msgid "{name} on {class}"
+msgstr "{name} på {class}"
+
+#: tp/Texinfo/Common.pm:2532
+#, perl-brace-format
+msgid "{name} of {class}"
+msgstr "{name} av {class}"
+
+#: tp/Texinfo/Convert/Converter.pm:97
+msgid "error@arrow{}"
+msgstr "error@arrow{}"
+
+#: tp/Texinfo/Convert/Converter.pm:897
+msgid "January"
+msgstr "Januari"
+
+#: tp/Texinfo/Convert/Converter.pm:898
+msgid "February"
+msgstr "Februari"
+
+#: tp/Texinfo/Convert/Converter.pm:899
+msgid "March"
+msgstr "Mars"
+
+#: tp/Texinfo/Convert/Converter.pm:900
+msgid "April"
+msgstr "April"
+
+#: tp/Texinfo/Convert/Converter.pm:901
+msgid "May"
+msgstr "Maj"
+
+#: tp/Texinfo/Convert/Converter.pm:902
+msgid "June"
+msgstr "Juni"
+
+#: tp/Texinfo/Convert/Converter.pm:903
+msgid "July"
+msgstr "Juli"
+
+#: tp/Texinfo/Convert/Converter.pm:904
+msgid "August"
+msgstr "Augusti"
+
+#: tp/Texinfo/Convert/Converter.pm:905
+msgid "September"
+msgstr "September"
+
+#: tp/Texinfo/Convert/Converter.pm:906
+msgid "October"
+msgstr "Oktober"
+
+#: tp/Texinfo/Convert/Converter.pm:907
+msgid "November"
+msgstr "November"
+
+#: tp/Texinfo/Convert/Converter.pm:908
+msgid "December"
+msgstr "December"
+
+#: tp/Texinfo/Convert/Converter.pm:959
+#, perl-brace-format
+msgid "{float_type} {float_number}"
+msgstr "{float_type} {float_number}"
+
+#: tp/Texinfo/Convert/Converter.pm:963
+#, perl-brace-format
+msgid "{float_type}"
+msgstr "{float_type}"
+
+#: tp/Texinfo/Convert/Converter.pm:967
+#, perl-brace-format
+msgid "{float_number}"
+msgstr "{float_number}"
+
+#: tp/Texinfo/Convert/DocBook.pm:863
+#, perl-brace-format
+msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
+msgstr "Se Info-fil @file{{myfile}}, nod @samp{{mynode}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:868
+#, perl-brace-format
+msgid "See node @samp{{mynode}}"
+msgstr "Se nod @samp{{mynode}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:872
+#, perl-brace-format
+msgid "See Info file @file{{myfile}}"
+msgstr "Se Info-fil @file{{myfile}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:928
+#, perl-brace-format
+msgid "section ``{section_name}'' in @cite{{book}}"
+msgstr "avsnitt ``{section_name}'' i @cite{{book}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:933
+#, perl-brace-format
+msgid "See section ``{section_name}'' in @cite{{book}}"
+msgstr "Se avsnitt ``{section_name}'' i @cite{{book}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:938
+#, perl-brace-format
+msgid "see section ``{section_name}'' in @cite{{book}}"
+msgstr "se avsnitt ``{section_name}'' i @cite{{book}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
+#, perl-brace-format
+msgid "@cite{{book}}"
+msgstr "@cite{{book}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
+#, perl-brace-format
+msgid "See @cite{{book}}"
+msgstr "Se @cite{{book}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
+#, perl-brace-format
+msgid "see @cite{{book}}"
+msgstr "se @cite{{book}}"
+
+#: tp/Texinfo/Convert/DocBook.pm:967
+#, perl-brace-format
+msgid "{title_ref}"
+msgstr "{title_ref}"
+
+#: tp/Texinfo/Convert/DocBook.pm:972
+#, perl-brace-format
+msgid "See {title_ref}"
+msgstr "Se {title_ref}"
+
+#: tp/Texinfo/Convert/DocBook.pm:977
+#, perl-brace-format
+msgid "see {title_ref}"
+msgstr "se {title_ref}"
+
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
+#, perl-brace-format
+msgid "{abbr_or_acronym} ({explanation})"
+msgstr "{abbr_or_acronym} ({explanation})"
+
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
+#, perl-brace-format
+msgid "@b{{quotation_arg}:} "
+msgstr "@b{{quotation_arg}:} "
+
+#: tp/Texinfo/Convert/Plaintext.pm:1291
+msgid "(outside of any node)"
+msgstr "(utanför varje annan nod)"
+
+#: tp/Texinfo/Convert/Plaintext.pm:1880
+#, perl-brace-format
+msgid "{name} @url{{email}}"
+msgstr "{name} @url{{email}}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:1883
+#, perl-brace-format
+msgid "@url{{email}}"
+msgstr "@url{{email}}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:1907
+#, perl-brace-format
+msgid "{text} ({url})"
+msgstr "{text} ({url})"
+
+#: tp/Texinfo/Convert/Plaintext.pm:1912
+#, perl-brace-format
+msgid "@t{<{url}>}"
+msgstr "@t{<{url}>}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
+#, perl-brace-format
+msgid "@{No value for `{value}'@}"
+msgstr "@{Inget värdet för `{value}'@}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2808
+#, perl-brace-format
+msgid "@tie{}-- {category}: {name} {arguments}"
+msgstr "@tie{}-- {category}: {name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2813
+#, perl-brace-format
+msgid "@tie{}-- {category}: {name}"
+msgstr "@tie{}-- {category}: {name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2826
+#, perl-brace-format
+msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
+msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2829
+#, perl-brace-format
+msgid "@tie{}-- {category}: {type} {name} {arguments}"
+msgstr "@tie{}-- {category}: {type} {name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2838
+#, perl-brace-format
+msgid "@tie{}-- {category}:@*{type}@*{name}"
+msgstr "@tie{}-- {category}:@*{type}@*{name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2841
+#, perl-brace-format
+msgid "@tie{}-- {category}: {type} {name}"
+msgstr "@tie{}-- {category}: {type} {name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2849
+#, perl-brace-format
+msgid "@tie{}-- {category} of {class}: {name} {arguments}"
+msgstr "@tie{}-- {category} av {class}: {name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2855
+#, perl-brace-format
+msgid "@tie{}-- {category} of {class}: {name}"
+msgstr "@tie{}-- {category} av {class}: {name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2864
+#, perl-brace-format
+msgid "@tie{}-- {category} on {class}: {name} {arguments}"
+msgstr "@tie{}-- {category} på {class}: {name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2870
+#, perl-brace-format
+msgid "@tie{}-- {category} on {class}: {name}"
+msgstr "@tie{}-- {category} på {class}: {name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2885
+#, perl-brace-format
+msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
+msgstr "@tie{}-- {category} på {class}:@*{type}@*{name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2889
+#, perl-brace-format
+msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
+msgstr "@tie{}-- {category} på {class}: {type} {name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2900
+#, perl-brace-format
+msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
+msgstr "@tie{}-- {category} på {class}:@*{type}@*{name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2904
+#, perl-brace-format
+msgid "@tie{}-- {category} on {class}: {type} {name}"
+msgstr "@tie{}-- {category} på {class}: {type} {name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2918
+#, perl-brace-format
+msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+msgstr "@tie{}-- {category} av {class}:@*{type}@*{name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2922
+#, perl-brace-format
+msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
+msgstr "@tie{}-- {category} av {class}: {type} {name} {arguments}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2933
+#, perl-brace-format
+msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+msgstr "@tie{}-- {category} av {class}:@*{type}@*{name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:2937
+#, perl-brace-format
+msgid "@tie{}-- {category} of {class}: {type} {name}"
+msgstr "@tie{}-- {category} av {class}: {type} {name}"
+
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
+#, perl-brace-format
+msgid "@center --- @emph{{author}}\n"
+msgstr "@center --- @emph{{author}}\n"
+
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
+msgid "Top"
+msgstr "Överst"
+
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
+msgid "Contents"
+msgstr "Innehåll"
+
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
+msgid "Overview"
+msgstr "Översikt"
+
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
+msgid "Index"
+msgstr "Index"
+
+#: tp/Texinfo/Convert/HTML.pm:782
+msgid "current"
+msgstr "aktuell"
+
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
+msgid "Prev"
+msgstr "Föreg."
+
+#: tp/Texinfo/Convert/HTML.pm:786
+msgid " Up "
+msgstr "Upp"
+
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
+msgid "Next"
+msgstr "Nästa"
+
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
+msgid "Up"
+msgstr "Upp"
+
+#: tp/Texinfo/Convert/HTML.pm:793
+msgid "Previous"
+msgstr "Föregående"
+
+#: tp/Texinfo/Convert/HTML.pm:794
+msgid "Forward node"
+msgstr "Framåt nod"
+
+#: tp/Texinfo/Convert/HTML.pm:795
+msgid "Back node"
+msgstr "Bakåt nod"
+
+#: tp/Texinfo/Convert/HTML.pm:801
+msgid "Next file"
+msgstr "Nästa fil"
+
+#: tp/Texinfo/Convert/HTML.pm:802
+msgid "Previous file"
+msgstr "Föregående fil"
+
+#: tp/Texinfo/Convert/HTML.pm:808
+msgid "Cover (top) of document"
+msgstr "Dokumentomslag (topp)"
+
+#: tp/Texinfo/Convert/HTML.pm:809
+msgid "Table of contents"
+msgstr "Innehållsförteckning"
+
+#: tp/Texinfo/Convert/HTML.pm:810
+msgid "Short table of contents"
+msgstr "Kort innehållsförteckning"
+
+#: tp/Texinfo/Convert/HTML.pm:812
+msgid "Current section"
+msgstr "Aktuellt avsnitt"
+
+#: tp/Texinfo/Convert/HTML.pm:813
+msgid "Previous section in reading order"
+msgstr "Föregående avsnitt i läsordning"
+
+#: tp/Texinfo/Convert/HTML.pm:814
+msgid "Beginning of this chapter or previous chapter"
+msgstr "Början på detta kapitel eller föregående kapitel"
+
+#: tp/Texinfo/Convert/HTML.pm:815
+msgid "Previous section on same level"
+msgstr "Föregåens avsnitt på samma nivå"
+
+#: tp/Texinfo/Convert/HTML.pm:816
+msgid "Up section"
+msgstr "Upp ett avsnitt"
+
+#: tp/Texinfo/Convert/HTML.pm:817
+msgid "Next section on same level"
+msgstr "Nästa avsnitt på samma nivå"
+
+#: tp/Texinfo/Convert/HTML.pm:818
+msgid "Up node"
+msgstr "Upp en nod"
+
+#: tp/Texinfo/Convert/HTML.pm:819
+msgid "Next node"
+msgstr "Nästa nod"
+
+#: tp/Texinfo/Convert/HTML.pm:820
+msgid "Previous node"
+msgstr "Föregående nod"
+
+#: tp/Texinfo/Convert/HTML.pm:821
+msgid "Next node in node reading order"
+msgstr "Nästa nod i nodläsordning"
+
+#: tp/Texinfo/Convert/HTML.pm:822
+msgid "Previous node in node reading order"
+msgstr "Föregående nod i nodläsordning"
+
+#: tp/Texinfo/Convert/HTML.pm:823
+msgid "Next section in reading order"
+msgstr "Nästa avsnitt i läsordning"
+
+#: tp/Texinfo/Convert/HTML.pm:824
+msgid "Next chapter"
+msgstr "Nästa kapitel"
+
+#: tp/Texinfo/Convert/HTML.pm:825
+msgid "About (help)"
+msgstr "Om (hjälp)"
+
+#: tp/Texinfo/Convert/HTML.pm:826
+msgid "First section in reading order"
+msgstr "Första avsnitt i läsordning"
+
+#: tp/Texinfo/Convert/HTML.pm:827
+msgid "Last section in reading order"
+msgstr "Sista avsnitt i läsordning"
+
+#: tp/Texinfo/Convert/HTML.pm:828
+msgid "Forward section in next file"
+msgstr "Framåt ett avsnitt i nästa fil"
+
+#: tp/Texinfo/Convert/HTML.pm:829
+msgid "Back section in previous file"
+msgstr "Bakåt ett avsnitt i föregående fil"
+
+#: tp/Texinfo/Convert/HTML.pm:838
+msgid "This"
+msgstr "Detta"
+
+#: tp/Texinfo/Convert/HTML.pm:839
+msgid "Back"
+msgstr "Bakåt"
+
+#: tp/Texinfo/Convert/HTML.pm:840
+msgid "FastBack"
+msgstr "Snabbt bakåt"
+
+#: tp/Texinfo/Convert/HTML.pm:844
+msgid "NodeUp"
+msgstr "Nod upp"
+
+#: tp/Texinfo/Convert/HTML.pm:845
+msgid "NodeNext"
+msgstr "Nod nästa"
+
+#: tp/Texinfo/Convert/HTML.pm:846
+msgid "NodePrev"
+msgstr "Nod Föreg."
+
+#: tp/Texinfo/Convert/HTML.pm:847
+msgid "NodeForward"
+msgstr "Nod framåt"
+
+#: tp/Texinfo/Convert/HTML.pm:848
+msgid "NodeBack"
+msgstr "Nod bakåt"
+
+#: tp/Texinfo/Convert/HTML.pm:849
+msgid "Forward"
+msgstr "Framåt"
+
+#: tp/Texinfo/Convert/HTML.pm:850
+msgid "FastForward"
+msgstr "Snabbt framåt"
+
+#: tp/Texinfo/Convert/HTML.pm:851
+msgid "About"
+msgstr "Om"
+
+#: tp/Texinfo/Convert/HTML.pm:852
+msgid "First"
+msgstr "Första"
+
+#: tp/Texinfo/Convert/HTML.pm:853
+msgid "Last"
+msgstr "Sista"
+
+#: tp/Texinfo/Convert/HTML.pm:854
+msgid "NextFile"
+msgstr "Nästa fil"
+
+#: tp/Texinfo/Convert/HTML.pm:855
+msgid "PrevFile"
+msgstr "Föreg. fil"
+
+#: tp/Texinfo/Convert/HTML.pm:859
+msgid "About This Document"
+msgstr "Om detta dokument"
+
+#: tp/Texinfo/Convert/HTML.pm:860
+msgid "Table of Contents"
+msgstr "Innehållsförteckning"
+
+#: tp/Texinfo/Convert/HTML.pm:861
+msgid "Short Table of Contents"
+msgstr "Kort innehållsförteckning"
+
+#: tp/Texinfo/Convert/HTML.pm:862
+msgid "Footnotes"
+msgstr "Fotnoter"
+
+#: tp/Texinfo/Convert/HTML.pm:1566
+#, perl-brace-format
+msgid "{explained_string} ({explanation})"
+msgstr "{explained_string} ({explanation})"
+
+#: tp/Texinfo/Convert/HTML.pm:3213
+#, perl-brace-format
+msgid "see section {reference_name}"
+msgstr "se avsnitt {reference_name}"
+
+#: tp/Texinfo/Convert/HTML.pm:3216
+#, perl-brace-format
+msgid "see {reference_name}"
+msgstr "se {reference_name}"
+
+#: tp/Texinfo/Convert/HTML.pm:3221
+#, perl-brace-format
+msgid "See section {reference_name}"
+msgstr "Se avsnitt {reference_name}"
+
+#: tp/Texinfo/Convert/HTML.pm:3224
+#, perl-brace-format
+msgid "See {reference_name}"
+msgstr "Se {reference_name}"
+
+#: tp/Texinfo/Convert/HTML.pm:3228
+#, perl-brace-format
+msgid "{reference_name}"
+msgstr "{reference_name}"
+
+#: tp/Texinfo/Convert/HTML.pm:3290
+#, perl-brace-format
+msgid "see {reference} in @cite{{book}}"
+msgstr "se {reference} i @cite{{book}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3294
+#, perl-brace-format
+msgid "see @cite{{book_reference}}"
+msgstr "se @cite{{book_reference}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3298
+#, perl-brace-format
+msgid "see `{section}' in @cite{{book}}"
+msgstr "se `{section}' i @cite{{book}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3305
+#, perl-brace-format
+msgid "see {reference}"
+msgstr "se {reference}"
+
+#: tp/Texinfo/Convert/HTML.pm:3308
+#, perl-brace-format
+msgid "see `{section}'"
+msgstr "se `{section}'"
+
+#: tp/Texinfo/Convert/HTML.pm:3313
+#, perl-brace-format
+msgid "See {reference} in @cite{{book}}"
+msgstr "Se {reference} i @cite{{book}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3317
+#, perl-brace-format
+msgid "See @cite{{book_reference}}"
+msgstr "Se @cite{{book_reference}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3321
+#, perl-brace-format
+msgid "See `{section}' in @cite{{book}}"
+msgstr "Se `{section}' i @cite{{book}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3328
+#, perl-brace-format
+msgid "See {reference}"
+msgstr "Se {reference}"
+
+#: tp/Texinfo/Convert/HTML.pm:3331
+#, perl-brace-format
+msgid "See `{section}'"
+msgstr "Se `{section}'"
+
+#: tp/Texinfo/Convert/HTML.pm:3336
+#, perl-brace-format
+msgid "{reference} in @cite{{book}}"
+msgstr "{reference} i @cite{{book}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3340
+#, perl-brace-format
+msgid "@cite{{book_reference}}"
+msgstr "@cite{{book_reference}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3344
+#, perl-brace-format
+msgid "`{section}' in @cite{{book}}"
+msgstr "`{section}' i @cite{{book}}"
+
+#: tp/Texinfo/Convert/HTML.pm:3351
+#, perl-brace-format
+msgid "{reference}"
+msgstr "{reference}"
+
+#: tp/Texinfo/Convert/HTML.pm:3354
+#, perl-brace-format
+msgid "`{section}'"
+msgstr "`{section}'"
+
+#: tp/Texinfo/Convert/HTML.pm:3467
+msgid "Jump to"
+msgstr "Hoppa till"
+
+#: tp/Texinfo/Convert/HTML.pm:3475
+msgid "Index Entry"
+msgstr "Indexpost"
+
+#: tp/Texinfo/Convert/HTML.pm:3477
+msgid "Section"
+msgstr "Avsnitt"
+
+#: tp/Texinfo/Convert/HTML.pm:4098
+#, perl-brace-format
+msgid "{category}: @strong{{name}} @emph{{arguments}}"
+msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4103
+#, perl-brace-format
+msgid "{category}: @strong{{name}}"
+msgstr "{category}: @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4120
+#, perl-brace-format
+msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4124
+#, perl-brace-format
+msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4133
+#, perl-brace-format
+msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
+msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4136
+#, perl-brace-format
+msgid "{category}: @emph{{type}} @strong{{name}}"
+msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4144
+#, perl-brace-format
+msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+msgstr "{category} av {class}: @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4150
+#, perl-brace-format
+msgid "{category} of {class}: @strong{{name}}"
+msgstr "{category} av {class}: @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4159
+#, perl-brace-format
+msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+msgstr "{category} på {class}: @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4165
+#, perl-brace-format
+msgid "{category} on {class}: @strong{{name}}"
+msgstr "{category} på {class}: @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4180
+#, perl-brace-format
+msgid ""
+"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+msgstr ""
+"{category} på {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4184
+#, perl-brace-format
+msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+msgstr ""
+"{category} på {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4195
+#, perl-brace-format
+msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+msgstr "{category} på {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4199
+#, perl-brace-format
+msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+msgstr "{category} på {class}: @emph{{type}} @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4213
+#, perl-brace-format
+msgid ""
+"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+msgstr ""
+"{category} av {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4217
+#, perl-brace-format
+msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+msgstr ""
+"{category} av {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4228
+#, perl-brace-format
+msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+msgstr "{category} av {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:4232
+#, perl-brace-format
+msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+msgstr "{category} av {class}: @emph{{type}} @strong{{name}}"
+
+#: tp/Texinfo/Convert/HTML.pm:6192
+#, perl-brace-format
+msgid ""
+"This document was generated on @emph{@today{}} using "
+"@uref{{program_homepage}, @emph{{program}}}."
+msgstr ""
+"Detta dokument genererades @emph{@today{}} av @uref{{program_homepage}, "
+"@emph{{program}}}."
+
+#: tp/Texinfo/Convert/HTML.pm:6197
+msgid "This document was generated on @emph{@today{}}."
+msgstr "Detta dokument genererades @emph{@today{}}."
+
+#: tp/Texinfo/Convert/HTML.pm:6248
+#, perl-brace-format
+msgid "{element_text} ({title})"
+msgstr "{element_text} ({title})"
+
+#: tp/Texinfo/Convert/HTML.pm:6392
+#, perl-brace-format
+msgid "The node you are looking for is at {href}."
+msgstr "Noden du letar efter finns vid {href}."
+
+#: tp/Texinfo/Convert/HTML.pm:6461
+msgid " The buttons in the navigation panels have the following meaning:"
+msgstr " Knapparna i navigationspanelerna har följande innebörd:"
+
+#: tp/Texinfo/Convert/HTML.pm:6467
+msgid "Button"
+msgstr "Knapp"
+
+#: tp/Texinfo/Convert/HTML.pm:6468
+msgid "Name"
+msgstr "Namn"
+
+#: tp/Texinfo/Convert/HTML.pm:6469
+msgid "Go to"
+msgstr "GÃ¥ till"
+
+#: tp/Texinfo/Convert/HTML.pm:6470
+msgid "From 1.2.3 go to"
+msgstr "Från 1.2.3 gå till"
+
+#: tp/Texinfo/Convert/HTML.pm:6496
+msgid ""
+" where the @strong{ Example } assumes that the current position is at "
+"@strong{ Subsubsection One-Two-Three } of a document of the following "
+"structure:"
+msgstr ""
+" Där @strong{ Exempel } förutsätter att den aktuella positionen är vid "
+"@strong{ Underunderavsnitt Ett-Två-Tree } för ett dokument med följande "
+"struktur:"
+
+#: tp/Texinfo/Convert/HTML.pm:6506
+msgid "Section One"
+msgstr "Avsnitt ett"
+
+#: tp/Texinfo/Convert/HTML.pm:6508
+msgid "Subsection One-One"
+msgstr "Underavsnitt Ett-Ett"
+
+#: tp/Texinfo/Convert/HTML.pm:6515
+msgid "Subsection One-Two"
+msgstr "Underavsnitt Ett-Två"
+
+#: tp/Texinfo/Convert/HTML.pm:6517
+msgid "Subsubsection One-Two-One"
+msgstr "Underunderavsnitt Ett-Två-Ett"
+
+#: tp/Texinfo/Convert/HTML.pm:6518
+msgid "Subsubsection One-Two-Two"
+msgstr "Underunderavsnitt Ett-Två-Två"
+
+#: tp/Texinfo/Convert/HTML.pm:6519
+msgid "Subsubsection One-Two-Three"
+msgstr "Underunderavsnitt Ett-Två-Tre"
+
+#: tp/Texinfo/Convert/HTML.pm:6521
+msgid "Current Position"
+msgstr "Aktuell position"
+
+#: tp/Texinfo/Convert/HTML.pm:6522
+msgid "Subsubsection One-Two-Four"
+msgstr "Underunderavsnitt Ett-Två-Fyra"
+
+#: tp/Texinfo/Convert/HTML.pm:6525
+msgid "Subsection One-Three"
+msgstr "Underavsnitt Ett-Tre"
+
+#: tp/Texinfo/Convert/HTML.pm:6532
+msgid "Subsection One-Four"
+msgstr "Underavsnitt Ett-Fyra"
+
+#: tp/Texinfo/Convert/HTML.pm:6937
+msgid "Untitled Document"
+msgstr "Namnlöst dokument"
diff --git a/macros/texinfo/texinfo/po_document/texinfo_document.pot b/macros/texinfo/texinfo/po_document/texinfo_document.pot
index a14f123e69..2f92164158 100644
--- a/macros/texinfo/texinfo/po_document/texinfo_document.pot
+++ b/macros/texinfo/texinfo/po_document/texinfo_document.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: GNU texinfo 6.6\n"
+"Project-Id-Version: GNU texinfo 6.6dev\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,878 +17,878 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr ""
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr ""
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr ""
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr ""
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr ""
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr ""
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr ""
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr ""
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr ""
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr ""
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr ""
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr ""
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr ""
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
"@uref{{program_homepage}, @emph{{program}}}."
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
"structure:"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr ""
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr ""
diff --git a/macros/texinfo/texinfo/po_document/uk.gmo b/macros/texinfo/texinfo/po_document/uk.gmo
index a1d8a15299..13190f1c60 100644
--- a/macros/texinfo/texinfo/po_document/uk.gmo
+++ b/macros/texinfo/texinfo/po_document/uk.gmo
Binary files differ
diff --git a/macros/texinfo/texinfo/po_document/uk.po b/macros/texinfo/texinfo/po_document/uk.po
index 0fe09da693..0f50ec6b71 100644
--- a/macros/texinfo/texinfo/po_document/uk.po
+++ b/macros/texinfo/texinfo/po_document/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: texinfo_document 6.4.90\n"
"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2019-02-16 17:15+0000\n"
+"POT-Creation-Date: 2019-09-17 18:48+0100\n"
"PO-Revision-Date: 2017-07-11 11:09+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -20,794 +20,794 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 2.0\n"
-#: tp/Texinfo/Common.pm:727 tp/Texinfo/Common.pm:732
+#: tp/Texinfo/Common.pm:722 tp/Texinfo/Common.pm:727
msgid "Function"
msgstr "ФункціÑ"
-#: tp/Texinfo/Common.pm:728
+#: tp/Texinfo/Common.pm:723
msgid "Macro"
msgstr "МакроÑ"
-#: tp/Texinfo/Common.pm:729
+#: tp/Texinfo/Common.pm:724
msgid "Special Form"
msgstr "Спеціальна форма"
-#: tp/Texinfo/Common.pm:730 tp/Texinfo/Common.pm:733
+#: tp/Texinfo/Common.pm:725 tp/Texinfo/Common.pm:728
msgid "Variable"
msgstr "Змінна"
-#: tp/Texinfo/Common.pm:731
+#: tp/Texinfo/Common.pm:726
msgid "User Option"
msgstr "Вибір кориÑтувача"
-#: tp/Texinfo/Common.pm:734 tp/Texinfo/Common.pm:735
+#: tp/Texinfo/Common.pm:729 tp/Texinfo/Common.pm:730
msgid "Instance Variable"
msgstr "Змінна екземплÑра"
-#: tp/Texinfo/Common.pm:736 tp/Texinfo/Common.pm:737
+#: tp/Texinfo/Common.pm:731 tp/Texinfo/Common.pm:732
msgid "Method"
msgstr "Метод"
-#: tp/Texinfo/Common.pm:1245
+#: tp/Texinfo/Common.pm:1242
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} щодо {class}"
-#: tp/Texinfo/Common.pm:1252
+#: tp/Texinfo/Common.pm:1249
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} {class}"
-#: tp/Texinfo/Common.pm:1274
+#: tp/Texinfo/Common.pm:1271
#, perl-brace-format
msgid "{month} {day}, {year}"
msgstr "{day} {month} {year}"
-#: tp/Texinfo/Common.pm:1305 tp/Texinfo/Convert/Plaintext.pm:1046
-#: tp/Texinfo/Convert/HTML.pm:523
+#: tp/Texinfo/Common.pm:1302 tp/Texinfo/Convert/Plaintext.pm:1053
+#: tp/Texinfo/Convert/HTML.pm:560
#, perl-brace-format
msgid "Appendix {number} {section_title}"
msgstr "Додаток {number} {section_title}"
-#: tp/Texinfo/Common.pm:1309 tp/Texinfo/Convert/Plaintext.pm:1051
-#: tp/Texinfo/Convert/HTML.pm:529
+#: tp/Texinfo/Common.pm:1306 tp/Texinfo/Convert/Plaintext.pm:1058
+#: tp/Texinfo/Convert/HTML.pm:566
#, perl-brace-format
msgid "{number} {section_title}"
msgstr "{number} {section_title}"
-#: tp/Texinfo/Common.pm:1570
+#: tp/Texinfo/Common.pm:1567
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{float_type} {float_number}: "
-#: tp/Texinfo/Common.pm:1574
+#: tp/Texinfo/Common.pm:1571
#, perl-brace-format
msgid "{float_type}: "
msgstr "{float_type}: "
-#: tp/Texinfo/Common.pm:1579
+#: tp/Texinfo/Common.pm:1576
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{float_type} {float_number}\n"
-#: tp/Texinfo/Common.pm:1583
+#: tp/Texinfo/Common.pm:1580
#, perl-brace-format
msgid "{float_type}\n"
msgstr "{float_type}\n"
-#: tp/Texinfo/Common.pm:1589
+#: tp/Texinfo/Common.pm:1586
#, perl-brace-format
msgid "{float_number}: "
msgstr "{float_number}: "
-#: tp/Texinfo/Common.pm:1592
+#: tp/Texinfo/Common.pm:1589
#, perl-brace-format
msgid "{float_number}\n"
msgstr "{float_number}\n"
-#: tp/Texinfo/Common.pm:2578
+#: tp/Texinfo/Common.pm:2522
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} щодо {class}"
-#: tp/Texinfo/Common.pm:2588
+#: tp/Texinfo/Common.pm:2532
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} {class}"
-#: tp/Texinfo/Convert/Converter.pm:99
+#: tp/Texinfo/Convert/Converter.pm:97
msgid "error@arrow{}"
msgstr "error@arrow{}"
-#: tp/Texinfo/Convert/Converter.pm:934
+#: tp/Texinfo/Convert/Converter.pm:897
msgid "January"
msgstr "ÑічнÑ"
-#: tp/Texinfo/Convert/Converter.pm:935
+#: tp/Texinfo/Convert/Converter.pm:898
msgid "February"
msgstr "лютого"
-#: tp/Texinfo/Convert/Converter.pm:936
+#: tp/Texinfo/Convert/Converter.pm:899
msgid "March"
msgstr "березнÑ"
-#: tp/Texinfo/Convert/Converter.pm:937
+#: tp/Texinfo/Convert/Converter.pm:900
msgid "April"
msgstr "квітнÑ"
-#: tp/Texinfo/Convert/Converter.pm:938
+#: tp/Texinfo/Convert/Converter.pm:901
msgid "May"
msgstr "травнÑ"
-#: tp/Texinfo/Convert/Converter.pm:939
+#: tp/Texinfo/Convert/Converter.pm:902
msgid "June"
msgstr "червнÑ"
-#: tp/Texinfo/Convert/Converter.pm:940
+#: tp/Texinfo/Convert/Converter.pm:903
msgid "July"
msgstr "липнÑ"
-#: tp/Texinfo/Convert/Converter.pm:941
+#: tp/Texinfo/Convert/Converter.pm:904
msgid "August"
msgstr "ÑерпнÑ"
-#: tp/Texinfo/Convert/Converter.pm:942
+#: tp/Texinfo/Convert/Converter.pm:905
msgid "September"
msgstr "вереÑнÑ"
-#: tp/Texinfo/Convert/Converter.pm:943
+#: tp/Texinfo/Convert/Converter.pm:906
msgid "October"
msgstr "жовтнÑ"
-#: tp/Texinfo/Convert/Converter.pm:944
+#: tp/Texinfo/Convert/Converter.pm:907
msgid "November"
msgstr "лиÑтопада"
-#: tp/Texinfo/Convert/Converter.pm:945
+#: tp/Texinfo/Convert/Converter.pm:908
msgid "December"
msgstr "груднÑ"
-#: tp/Texinfo/Convert/Converter.pm:996
+#: tp/Texinfo/Convert/Converter.pm:959
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{float_type} {float_number}"
-#: tp/Texinfo/Convert/Converter.pm:1000
+#: tp/Texinfo/Convert/Converter.pm:963
#, perl-brace-format
msgid "{float_type}"
msgstr "{float_type}"
-#: tp/Texinfo/Convert/Converter.pm:1004
+#: tp/Texinfo/Convert/Converter.pm:967
#, perl-brace-format
msgid "{float_number}"
msgstr "{float_number}"
-#: tp/Texinfo/Convert/DocBook.pm:834
+#: tp/Texinfo/Convert/DocBook.pm:863
#, perl-brace-format
msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
msgstr "Див. файл Info @file{{myfile}}, вузол @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:839
+#: tp/Texinfo/Convert/DocBook.pm:868
#, perl-brace-format
msgid "See node @samp{{mynode}}"
msgstr "Див. вузол @samp{{mynode}}"
-#: tp/Texinfo/Convert/DocBook.pm:843
+#: tp/Texinfo/Convert/DocBook.pm:872
#, perl-brace-format
msgid "See Info file @file{{myfile}}"
msgstr "Див. файл Info @file{{myfile}}"
-#: tp/Texinfo/Convert/DocBook.pm:899
+#: tp/Texinfo/Convert/DocBook.pm:928
#, perl-brace-format
msgid "section ``{section_name}'' in @cite{{book}}"
msgstr "розділ «{section_name}» у @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:904
+#: tp/Texinfo/Convert/DocBook.pm:933
#, perl-brace-format
msgid "See section ``{section_name}'' in @cite{{book}}"
msgstr "Див. розділ «{section_name}» у @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:909
+#: tp/Texinfo/Convert/DocBook.pm:938
#, perl-brace-format
msgid "see section ``{section_name}'' in @cite{{book}}"
msgstr "див. розділ «{section_name}» у @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:916 tp/Texinfo/Convert/HTML.pm:3331
+#: tp/Texinfo/Convert/DocBook.pm:945 tp/Texinfo/Convert/HTML.pm:3348
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:920 tp/Texinfo/Convert/HTML.pm:3308
+#: tp/Texinfo/Convert/DocBook.pm:949 tp/Texinfo/Convert/HTML.pm:3325
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Див. @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:924 tp/Texinfo/Convert/HTML.pm:3285
+#: tp/Texinfo/Convert/DocBook.pm:953 tp/Texinfo/Convert/HTML.pm:3302
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "див. @cite{{book}}"
-#: tp/Texinfo/Convert/DocBook.pm:938
+#: tp/Texinfo/Convert/DocBook.pm:967
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:943
+#: tp/Texinfo/Convert/DocBook.pm:972
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Див. {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:948
+#: tp/Texinfo/Convert/DocBook.pm:977
#, perl-brace-format
msgid "see {title_ref}"
msgstr "див. {title_ref}"
-#: tp/Texinfo/Convert/DocBook.pm:1085 tp/Texinfo/Convert/Plaintext.pm:2197
+#: tp/Texinfo/Convert/DocBook.pm:1114 tp/Texinfo/Convert/Plaintext.pm:2214
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{abbr_or_acronym} ({explanation})"
-#: tp/Texinfo/Convert/DocBook.pm:1257 tp/Texinfo/Convert/Plaintext.pm:2387
-#: tp/Texinfo/Convert/HTML.pm:3637
+#: tp/Texinfo/Convert/DocBook.pm:1286 tp/Texinfo/Convert/Plaintext.pm:2405
+#: tp/Texinfo/Convert/HTML.pm:3655
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: tp/Texinfo/Convert/Plaintext.pm:1275
+#: tp/Texinfo/Convert/Plaintext.pm:1291
msgid "(outside of any node)"
msgstr "(поза вузлами)"
-#: tp/Texinfo/Convert/Plaintext.pm:1863
+#: tp/Texinfo/Convert/Plaintext.pm:1880
#, perl-brace-format
msgid "{name} @url{{email}}"
msgstr "{name} @url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1866
+#: tp/Texinfo/Convert/Plaintext.pm:1883
#, perl-brace-format
msgid "@url{{email}}"
msgstr "@url{{email}}"
-#: tp/Texinfo/Convert/Plaintext.pm:1890
+#: tp/Texinfo/Convert/Plaintext.pm:1907
#, perl-brace-format
msgid "{text} ({url})"
msgstr "{text} ({url})"
-#: tp/Texinfo/Convert/Plaintext.pm:1895
+#: tp/Texinfo/Convert/Plaintext.pm:1912
#, perl-brace-format
msgid "@t{<{url}>}"
msgstr "@t{<{url}>}"
-#: tp/Texinfo/Convert/Plaintext.pm:2312 tp/Texinfo/Convert/HTML.pm:1437
+#: tp/Texinfo/Convert/Plaintext.pm:2330 tp/Texinfo/Convert/HTML.pm:1470
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Ðемає Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ `{value}'@}"
-#: tp/Texinfo/Convert/Plaintext.pm:2787
+#: tp/Texinfo/Convert/Plaintext.pm:2808
#, perl-brace-format
msgid "@tie{}-- {category}: {name} {arguments}"
msgstr "@tie{}-- {category}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2792
+#: tp/Texinfo/Convert/Plaintext.pm:2813
#, perl-brace-format
msgid "@tie{}-- {category}: {name}"
msgstr "@tie{}-- {category}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2805
+#: tp/Texinfo/Convert/Plaintext.pm:2826
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2829
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name} {arguments}"
msgstr "@tie{}-- {category}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2817
+#: tp/Texinfo/Convert/Plaintext.pm:2838
#, perl-brace-format
msgid "@tie{}-- {category}:@*{type}@*{name}"
msgstr "@tie{}-- {category}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2820
+#: tp/Texinfo/Convert/Plaintext.pm:2841
#, perl-brace-format
msgid "@tie{}-- {category}: {type} {name}"
msgstr "@tie{}-- {category}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2849
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name} {arguments}"
msgstr "@tie{}-- {category} {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2834
+#: tp/Texinfo/Convert/Plaintext.pm:2855
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {name}"
msgstr "@tie{}-- {category} {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2843
+#: tp/Texinfo/Convert/Plaintext.pm:2864
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name} {arguments}"
msgstr "@tie{}-- {category} щодо {class}: {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2849
+#: tp/Texinfo/Convert/Plaintext.pm:2870
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {name}"
msgstr "@tie{}-- {category} щодо {class}: {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2864
+#: tp/Texinfo/Convert/Plaintext.pm:2885
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} щодо {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2868
+#: tp/Texinfo/Convert/Plaintext.pm:2889
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} щодо {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:2900
#, perl-brace-format
msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} щодо {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2883
+#: tp/Texinfo/Convert/Plaintext.pm:2904
#, perl-brace-format
msgid "@tie{}-- {category} on {class}: {type} {name}"
msgstr "@tie{}-- {category} щодо {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2897
+#: tp/Texinfo/Convert/Plaintext.pm:2918
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
msgstr "@tie{}-- {category} {class}:@*{type}@*{name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2901
+#: tp/Texinfo/Convert/Plaintext.pm:2922
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
msgstr "@tie{}-- {category} {class}: {type} {name} {arguments}"
-#: tp/Texinfo/Convert/Plaintext.pm:2912
+#: tp/Texinfo/Convert/Plaintext.pm:2933
#, perl-brace-format
msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
msgstr "@tie{}-- {category} {class}:@*{type}@*{name}"
-#: tp/Texinfo/Convert/Plaintext.pm:2916
+#: tp/Texinfo/Convert/Plaintext.pm:2937
#, perl-brace-format
msgid "@tie{}-- {category} of {class}: {type} {name}"
msgstr "@tie{}-- {category} {class}: {type} {name}"
-#: tp/Texinfo/Convert/Plaintext.pm:3234 tp/Texinfo/Convert/HTML.pm:2879
+#: tp/Texinfo/Convert/Plaintext.pm:3260 tp/Texinfo/Convert/HTML.pm:2896
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr "@center --- @emph{{author}}\n"
-#: tp/Texinfo/Convert/HTML.pm:740 tp/Texinfo/Convert/HTML.pm:796
+#: tp/Texinfo/Convert/HTML.pm:777 tp/Texinfo/Convert/HTML.pm:833
msgid "Top"
msgstr "Ðагору"
-#: tp/Texinfo/Convert/HTML.pm:741 tp/Texinfo/Convert/HTML.pm:797
+#: tp/Texinfo/Convert/HTML.pm:778 tp/Texinfo/Convert/HTML.pm:834
msgid "Contents"
msgstr "ЗміÑÑ‚"
-#: tp/Texinfo/Convert/HTML.pm:742 tp/Texinfo/Convert/HTML.pm:798
+#: tp/Texinfo/Convert/HTML.pm:779 tp/Texinfo/Convert/HTML.pm:835
msgid "Overview"
msgstr "ОглÑд"
-#: tp/Texinfo/Convert/HTML.pm:743 tp/Texinfo/Convert/HTML.pm:774
-#: tp/Texinfo/Convert/HTML.pm:799
+#: tp/Texinfo/Convert/HTML.pm:780 tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:836
msgid "Index"
msgstr "Покажчик"
-#: tp/Texinfo/Convert/HTML.pm:745
+#: tp/Texinfo/Convert/HTML.pm:782
msgid "current"
msgstr "поточний"
-#: tp/Texinfo/Convert/HTML.pm:748 tp/Texinfo/Convert/HTML.pm:804
+#: tp/Texinfo/Convert/HTML.pm:785 tp/Texinfo/Convert/HTML.pm:841
msgid "Prev"
msgstr "Ðазад"
-#: tp/Texinfo/Convert/HTML.pm:749
+#: tp/Texinfo/Convert/HTML.pm:786
msgid " Up "
msgstr "Вгору"
-#: tp/Texinfo/Convert/HTML.pm:750 tp/Texinfo/Convert/HTML.pm:754
-#: tp/Texinfo/Convert/HTML.pm:806
+#: tp/Texinfo/Convert/HTML.pm:787 tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:843
msgid "Next"
msgstr "Далі"
-#: tp/Texinfo/Convert/HTML.pm:752 tp/Texinfo/Convert/HTML.pm:805
+#: tp/Texinfo/Convert/HTML.pm:789 tp/Texinfo/Convert/HTML.pm:842
msgid "Up"
msgstr "Вгору"
-#: tp/Texinfo/Convert/HTML.pm:756
+#: tp/Texinfo/Convert/HTML.pm:793
msgid "Previous"
msgstr "Ðазад"
-#: tp/Texinfo/Convert/HTML.pm:757
+#: tp/Texinfo/Convert/HTML.pm:794
msgid "Forward node"
msgstr "Вперед на вузол"
-#: tp/Texinfo/Convert/HTML.pm:758
+#: tp/Texinfo/Convert/HTML.pm:795
msgid "Back node"
msgstr "Ðазад на вузол"
-#: tp/Texinfo/Convert/HTML.pm:764
+#: tp/Texinfo/Convert/HTML.pm:801
msgid "Next file"
msgstr "ÐаÑтупний файл"
-#: tp/Texinfo/Convert/HTML.pm:765
+#: tp/Texinfo/Convert/HTML.pm:802
msgid "Previous file"
msgstr "Попередній файл"
-#: tp/Texinfo/Convert/HTML.pm:771
+#: tp/Texinfo/Convert/HTML.pm:808
msgid "Cover (top) of document"
msgstr "Обкладинка (початок) документа"
-#: tp/Texinfo/Convert/HTML.pm:772
+#: tp/Texinfo/Convert/HTML.pm:809
msgid "Table of contents"
msgstr "ЗміÑÑ‚"
-#: tp/Texinfo/Convert/HTML.pm:773
+#: tp/Texinfo/Convert/HTML.pm:810
msgid "Short table of contents"
msgstr "Скорочений зміÑÑ‚"
-#: tp/Texinfo/Convert/HTML.pm:775
+#: tp/Texinfo/Convert/HTML.pm:812
msgid "Current section"
msgstr "Поточний розділ"
-#: tp/Texinfo/Convert/HTML.pm:776
+#: tp/Texinfo/Convert/HTML.pm:813
msgid "Previous section in reading order"
msgstr "Попередній розділ за порÑдком читаннÑ"
-#: tp/Texinfo/Convert/HTML.pm:777
+#: tp/Texinfo/Convert/HTML.pm:814
msgid "Beginning of this chapter or previous chapter"
msgstr "Початок цієї глави або Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ Ð³Ð»Ð°Ð²Ð°"
-#: tp/Texinfo/Convert/HTML.pm:778
+#: tp/Texinfo/Convert/HTML.pm:815
msgid "Previous section on same level"
msgstr "Попередній розділ на тому Ñамому рівні"
-#: tp/Texinfo/Convert/HTML.pm:779
+#: tp/Texinfo/Convert/HTML.pm:816
msgid "Up section"
msgstr "Вгору на розділ"
-#: tp/Texinfo/Convert/HTML.pm:780
+#: tp/Texinfo/Convert/HTML.pm:817
msgid "Next section on same level"
msgstr "ÐаÑтупний розділ на тому Ñамому рівні"
-#: tp/Texinfo/Convert/HTML.pm:781
+#: tp/Texinfo/Convert/HTML.pm:818
msgid "Up node"
msgstr "Вгору на вузол"
-#: tp/Texinfo/Convert/HTML.pm:782
+#: tp/Texinfo/Convert/HTML.pm:819
msgid "Next node"
msgstr "ÐаÑтупний вузол"
-#: tp/Texinfo/Convert/HTML.pm:783
+#: tp/Texinfo/Convert/HTML.pm:820
msgid "Previous node"
msgstr "Попередній вузол"
-#: tp/Texinfo/Convert/HTML.pm:784
+#: tp/Texinfo/Convert/HTML.pm:821
msgid "Next node in node reading order"
msgstr "ÐаÑтупний вузол за порÑдком Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð²ÑƒÐ·Ð»Ñ–Ð²"
-#: tp/Texinfo/Convert/HTML.pm:785
+#: tp/Texinfo/Convert/HTML.pm:822
msgid "Previous node in node reading order"
msgstr "Попередній вузол за порÑдком Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð²ÑƒÐ·Ð»Ñ–Ð²"
-#: tp/Texinfo/Convert/HTML.pm:786
+#: tp/Texinfo/Convert/HTML.pm:823
msgid "Next section in reading order"
msgstr "ÐаÑтупний розділ за порÑдком читаннÑ"
-#: tp/Texinfo/Convert/HTML.pm:787
+#: tp/Texinfo/Convert/HTML.pm:824
msgid "Next chapter"
msgstr "ÐаÑтупний розділ"
-#: tp/Texinfo/Convert/HTML.pm:788
+#: tp/Texinfo/Convert/HTML.pm:825
msgid "About (help)"
msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ (довідка)"
-#: tp/Texinfo/Convert/HTML.pm:789
+#: tp/Texinfo/Convert/HTML.pm:826
msgid "First section in reading order"
msgstr "Переший розділ за порÑдком читаннÑ"
-#: tp/Texinfo/Convert/HTML.pm:790
+#: tp/Texinfo/Convert/HTML.pm:827
msgid "Last section in reading order"
msgstr "ОÑтанній розділ за порÑдком читаннÑ"
-#: tp/Texinfo/Convert/HTML.pm:791
+#: tp/Texinfo/Convert/HTML.pm:828
msgid "Forward section in next file"
msgstr "Ðа розділ уперед у наÑтупному файлі"
-#: tp/Texinfo/Convert/HTML.pm:792
+#: tp/Texinfo/Convert/HTML.pm:829
msgid "Back section in previous file"
msgstr "Ðа розділ назад у попередньому файлі"
-#: tp/Texinfo/Convert/HTML.pm:801
+#: tp/Texinfo/Convert/HTML.pm:838
msgid "This"
msgstr "Цей"
-#: tp/Texinfo/Convert/HTML.pm:802
+#: tp/Texinfo/Convert/HTML.pm:839
msgid "Back"
msgstr "Ðазад"
-#: tp/Texinfo/Convert/HTML.pm:803
+#: tp/Texinfo/Convert/HTML.pm:840
msgid "FastBack"
msgstr "ШвидкÐазад"
-#: tp/Texinfo/Convert/HTML.pm:807
+#: tp/Texinfo/Convert/HTML.pm:844
msgid "NodeUp"
msgstr "ВузолВгору"
-#: tp/Texinfo/Convert/HTML.pm:808
+#: tp/Texinfo/Convert/HTML.pm:845
msgid "NodeNext"
msgstr "ÐаÑтВузол"
-#: tp/Texinfo/Convert/HTML.pm:809
+#: tp/Texinfo/Convert/HTML.pm:846
msgid "NodePrev"
msgstr "ПопВузол"
-#: tp/Texinfo/Convert/HTML.pm:810
+#: tp/Texinfo/Convert/HTML.pm:847
msgid "NodeForward"
msgstr "ВперВузол"
-#: tp/Texinfo/Convert/HTML.pm:811
+#: tp/Texinfo/Convert/HTML.pm:848
msgid "NodeBack"
msgstr "ÐазВузол"
-#: tp/Texinfo/Convert/HTML.pm:812
+#: tp/Texinfo/Convert/HTML.pm:849
msgid "Forward"
msgstr "Вперед"
-#: tp/Texinfo/Convert/HTML.pm:813
+#: tp/Texinfo/Convert/HTML.pm:850
msgid "FastForward"
msgstr "ШвидкВперед"
-#: tp/Texinfo/Convert/HTML.pm:814
+#: tp/Texinfo/Convert/HTML.pm:851
msgid "About"
msgstr "ІнформаціÑ"
-#: tp/Texinfo/Convert/HTML.pm:815
+#: tp/Texinfo/Convert/HTML.pm:852
msgid "First"
msgstr "Перший"
-#: tp/Texinfo/Convert/HTML.pm:816
+#: tp/Texinfo/Convert/HTML.pm:853
msgid "Last"
msgstr "ОÑтанній"
-#: tp/Texinfo/Convert/HTML.pm:817
+#: tp/Texinfo/Convert/HTML.pm:854
msgid "NextFile"
msgstr "ÐаÑтФайл"
-#: tp/Texinfo/Convert/HTML.pm:818
+#: tp/Texinfo/Convert/HTML.pm:855
msgid "PrevFile"
msgstr "ПопФайл"
-#: tp/Texinfo/Convert/HTML.pm:822
+#: tp/Texinfo/Convert/HTML.pm:859
msgid "About This Document"
msgstr "Про цей документ"
-#: tp/Texinfo/Convert/HTML.pm:823
+#: tp/Texinfo/Convert/HTML.pm:860
msgid "Table of Contents"
msgstr "ЗміÑÑ‚"
-#: tp/Texinfo/Convert/HTML.pm:824
+#: tp/Texinfo/Convert/HTML.pm:861
msgid "Short Table of Contents"
msgstr "Скорочений зміÑÑ‚"
-#: tp/Texinfo/Convert/HTML.pm:825
+#: tp/Texinfo/Convert/HTML.pm:862
msgid "Footnotes"
msgstr "ВиноÑки"
-#: tp/Texinfo/Convert/HTML.pm:1533
+#: tp/Texinfo/Convert/HTML.pm:1566
#, perl-brace-format
msgid "{explained_string} ({explanation})"
msgstr "{explained_string} ({explanation})"
-#: tp/Texinfo/Convert/HTML.pm:3196
+#: tp/Texinfo/Convert/HTML.pm:3213
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "див. розділ {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3199
+#: tp/Texinfo/Convert/HTML.pm:3216
#, perl-brace-format
msgid "see {reference_name}"
msgstr "див. {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3204
+#: tp/Texinfo/Convert/HTML.pm:3221
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Див. розділ {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3207
+#: tp/Texinfo/Convert/HTML.pm:3224
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Див. {reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3211
+#: tp/Texinfo/Convert/HTML.pm:3228
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: tp/Texinfo/Convert/HTML.pm:3273
+#: tp/Texinfo/Convert/HTML.pm:3290
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "див. {reference} у @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3277
+#: tp/Texinfo/Convert/HTML.pm:3294
#, perl-brace-format
msgid "see @cite{{book_reference}}"
msgstr "див. @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3281
+#: tp/Texinfo/Convert/HTML.pm:3298
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "див. «{section}» у @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3288
+#: tp/Texinfo/Convert/HTML.pm:3305
#, perl-brace-format
msgid "see {reference}"
msgstr "див. {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3291
+#: tp/Texinfo/Convert/HTML.pm:3308
#, perl-brace-format
msgid "see `{section}'"
msgstr "див. «{section}»"
-#: tp/Texinfo/Convert/HTML.pm:3296
+#: tp/Texinfo/Convert/HTML.pm:3313
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Див. {reference} у @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3300
+#: tp/Texinfo/Convert/HTML.pm:3317
#, perl-brace-format
msgid "See @cite{{book_reference}}"
msgstr "Див. @cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3304
+#: tp/Texinfo/Convert/HTML.pm:3321
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Див. «{section}» у @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3311
+#: tp/Texinfo/Convert/HTML.pm:3328
#, perl-brace-format
msgid "See {reference}"
msgstr "Див. {reference}"
-#: tp/Texinfo/Convert/HTML.pm:3314
+#: tp/Texinfo/Convert/HTML.pm:3331
#, perl-brace-format
msgid "See `{section}'"
msgstr "Див. «{section}»"
-#: tp/Texinfo/Convert/HTML.pm:3319
+#: tp/Texinfo/Convert/HTML.pm:3336
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{reference} у @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3323
+#: tp/Texinfo/Convert/HTML.pm:3340
#, perl-brace-format
msgid "@cite{{book_reference}}"
msgstr "@cite{{book_reference}}"
-#: tp/Texinfo/Convert/HTML.pm:3327
+#: tp/Texinfo/Convert/HTML.pm:3344
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "«{section}» у @cite{{book}}"
-#: tp/Texinfo/Convert/HTML.pm:3334
+#: tp/Texinfo/Convert/HTML.pm:3351
#, perl-brace-format
msgid "{reference}"
msgstr "{reference}"
-#: tp/Texinfo/Convert/HTML.pm:3337
+#: tp/Texinfo/Convert/HTML.pm:3354
#, perl-brace-format
msgid "`{section}'"
msgstr "«{section}»"
-#: tp/Texinfo/Convert/HTML.pm:3450
+#: tp/Texinfo/Convert/HTML.pm:3467
msgid "Jump to"
msgstr "Перейти до"
-#: tp/Texinfo/Convert/HTML.pm:3458
+#: tp/Texinfo/Convert/HTML.pm:3475
msgid "Index Entry"
msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð¿Ð¾ÐºÐ°Ð¶Ñ‡Ð¸ÐºÐ°"
-#: tp/Texinfo/Convert/HTML.pm:3460
+#: tp/Texinfo/Convert/HTML.pm:3477
msgid "Section"
msgstr "Розділ"
-#: tp/Texinfo/Convert/HTML.pm:4080
+#: tp/Texinfo/Convert/HTML.pm:4098
#, perl-brace-format
msgid "{category}: @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4085
+#: tp/Texinfo/Convert/HTML.pm:4103
#, perl-brace-format
msgid "{category}: @strong{{name}}"
msgstr "{category}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4102
+#: tp/Texinfo/Convert/HTML.pm:4120
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4106
+#: tp/Texinfo/Convert/HTML.pm:4124
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4115
+#: tp/Texinfo/Convert/HTML.pm:4133
#, perl-brace-format
msgid "{category}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4118
+#: tp/Texinfo/Convert/HTML.pm:4136
#, perl-brace-format
msgid "{category}: @emph{{type}} @strong{{name}}"
msgstr "{category}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4126
+#: tp/Texinfo/Convert/HTML.pm:4144
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4132
+#: tp/Texinfo/Convert/HTML.pm:4150
#, perl-brace-format
msgid "{category} of {class}: @strong{{name}}"
msgstr "{category} {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4141
+#: tp/Texinfo/Convert/HTML.pm:4159
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
msgstr "{category} щодо {class}: @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4147
+#: tp/Texinfo/Convert/HTML.pm:4165
#, perl-brace-format
msgid "{category} on {class}: @strong{{name}}"
msgstr "{category} щодо {class}: @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4162
+#: tp/Texinfo/Convert/HTML.pm:4180
#, perl-brace-format
msgid ""
"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} щодо {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4166
+#: tp/Texinfo/Convert/HTML.pm:4184
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} щодо {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4177
+#: tp/Texinfo/Convert/HTML.pm:4195
#, perl-brace-format
msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} щодо {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4181
+#: tp/Texinfo/Convert/HTML.pm:4199
#, perl-brace-format
msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} щодо {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4195
+#: tp/Texinfo/Convert/HTML.pm:4213
#, perl-brace-format
msgid ""
"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
msgstr ""
"{category} {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4199
+#: tp/Texinfo/Convert/HTML.pm:4217
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
msgstr "{category} {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-#: tp/Texinfo/Convert/HTML.pm:4210
+#: tp/Texinfo/Convert/HTML.pm:4228
#, perl-brace-format
msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
msgstr "{category} {class}:@* @emph{{type}}@* @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:4214
+#: tp/Texinfo/Convert/HTML.pm:4232
#, perl-brace-format
msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
msgstr "{category} {class}: @emph{{type}} @strong{{name}}"
-#: tp/Texinfo/Convert/HTML.pm:6181
+#: tp/Texinfo/Convert/HTML.pm:6192
#, perl-brace-format
msgid ""
"This document was generated on @emph{@today{}} using "
@@ -816,41 +816,41 @@ msgstr ""
"Цей документ Ñтворено @emph{@today{}} за допомогою @uref{{program_homepage}, "
"@emph{{program}}}."
-#: tp/Texinfo/Convert/HTML.pm:6186
+#: tp/Texinfo/Convert/HTML.pm:6197
msgid "This document was generated on @emph{@today{}}."
msgstr "Цей документ Ñтворено @emph{@today{}}."
-#: tp/Texinfo/Convert/HTML.pm:6237
+#: tp/Texinfo/Convert/HTML.pm:6248
#, perl-brace-format
msgid "{element_text} ({title})"
msgstr "{element_text} ({title})"
-#: tp/Texinfo/Convert/HTML.pm:6381
+#: tp/Texinfo/Convert/HTML.pm:6392
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Потрібний вам вузол тут: {href}."
-#: tp/Texinfo/Convert/HTML.pm:6450
+#: tp/Texinfo/Convert/HTML.pm:6461
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " Кнопки на панелÑÑ… навігації мають таке призначеннÑ:"
-#: tp/Texinfo/Convert/HTML.pm:6456
+#: tp/Texinfo/Convert/HTML.pm:6467
msgid "Button"
msgstr "Кнопка"
-#: tp/Texinfo/Convert/HTML.pm:6457
+#: tp/Texinfo/Convert/HTML.pm:6468
msgid "Name"
msgstr "Ðазва"
-#: tp/Texinfo/Convert/HTML.pm:6458
+#: tp/Texinfo/Convert/HTML.pm:6469
msgid "Go to"
msgstr "Перейти до"
-#: tp/Texinfo/Convert/HTML.pm:6459
+#: tp/Texinfo/Convert/HTML.pm:6470
msgid "From 1.2.3 go to"
msgstr "З 1.2.3 перейти до"
-#: tp/Texinfo/Convert/HTML.pm:6485
+#: tp/Texinfo/Convert/HTML.pm:6496
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -859,47 +859,47 @@ msgstr ""
" де у @strong{ прикладі } припуÑкаєтьÑÑ, що поточну позицію розташовано у "
"@strong{ підрозділі один-два-три } документа із такою Ñтруктурою:"
-#: tp/Texinfo/Convert/HTML.pm:6495
+#: tp/Texinfo/Convert/HTML.pm:6506
msgid "Section One"
msgstr "Перший розділ"
-#: tp/Texinfo/Convert/HTML.pm:6497
+#: tp/Texinfo/Convert/HTML.pm:6508
msgid "Subsection One-One"
msgstr "Підрозділ один-один"
-#: tp/Texinfo/Convert/HTML.pm:6504
+#: tp/Texinfo/Convert/HTML.pm:6515
msgid "Subsection One-Two"
msgstr "Підрозділ один-два"
-#: tp/Texinfo/Convert/HTML.pm:6506
+#: tp/Texinfo/Convert/HTML.pm:6517
msgid "Subsubsection One-Two-One"
msgstr "Підпідрозділ один-два-один"
-#: tp/Texinfo/Convert/HTML.pm:6507
+#: tp/Texinfo/Convert/HTML.pm:6518
msgid "Subsubsection One-Two-Two"
msgstr "Підпідрозділ один-два-два"
-#: tp/Texinfo/Convert/HTML.pm:6508
+#: tp/Texinfo/Convert/HTML.pm:6519
msgid "Subsubsection One-Two-Three"
msgstr "Підпідрозділ один-два-три"
-#: tp/Texinfo/Convert/HTML.pm:6510
+#: tp/Texinfo/Convert/HTML.pm:6521
msgid "Current Position"
msgstr "Поточна позиціÑ"
-#: tp/Texinfo/Convert/HTML.pm:6511
+#: tp/Texinfo/Convert/HTML.pm:6522
msgid "Subsubsection One-Two-Four"
msgstr "Підпідрозділ один-два-чотири"
-#: tp/Texinfo/Convert/HTML.pm:6514
+#: tp/Texinfo/Convert/HTML.pm:6525
msgid "Subsection One-Three"
msgstr "Підрозділ один-три"
-#: tp/Texinfo/Convert/HTML.pm:6521
+#: tp/Texinfo/Convert/HTML.pm:6532
msgid "Subsection One-Four"
msgstr "Підрозділ один-чотири"
-#: tp/Texinfo/Convert/HTML.pm:6929
+#: tp/Texinfo/Convert/HTML.pm:6937
msgid "Untitled Document"
msgstr "Документ без назви"
diff --git a/macros/texinfo/texinfo/system.h b/macros/texinfo/texinfo/system.h
index f3f90dc795..047d79446a 100644
--- a/macros/texinfo/texinfo/system.h
+++ b/macros/texinfo/texinfo/system.h
@@ -41,6 +41,8 @@
#include <getopt.h>
#include <unistd.h>
+#include <fcntl.h>
+
/* For gettext (NLS). */
#include "gettext.h"
@@ -67,9 +69,8 @@ extern int errno;
extern char *strerror ();
#endif
-#ifdef HAVE_LIMITS_H
#include <limits.h>
-#endif
+
#ifndef PATH_MAX
#ifndef _POSIX_PATH_MAX
# define _POSIX_PATH_MAX 255
@@ -77,10 +78,6 @@ extern char *strerror ();
#define PATH_MAX _POSIX_PATH_MAX
#endif
-#ifndef HAVE_DECL_STRCOLL
-extern int strcoll ();
-#endif
-
#include <sys/stat.h>
#if STAT_MACROS_BROKEN
# undef S_ISDIR
@@ -89,22 +86,6 @@ extern int strcoll ();
# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
#endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif /* HAVE_SYS_FILE_H */
-
-#ifndef O_RDONLY
-/* Since <fcntl.h> is POSIX, prefer that to <sys/fcntl.h>.
- This also avoids some useless warnings on (at least) Linux. */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#else /* not HAVE_FCNTL_H */
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif /* not HAVE_SYS_FCNTL_H */
-#endif /* not HAVE_FCNTL_H */
-#endif /* not O_RDONLY */
-
/* MS-DOS and similar non-Posix systems have some peculiarities:
- they distinguish between binary and text files;
- they use both `/' and `\\' as directory separator in file names;
diff --git a/macros/texinfo/texinfo/texindex/ChangeLog b/macros/texinfo/texinfo/texindex/ChangeLog
index a826dadc61..e36debd2c5 100644
--- a/macros/texinfo/texinfo/texindex/ChangeLog
+++ b/macros/texinfo/texinfo/texindex/ChangeLog
@@ -1,3 +1,108 @@
+2019-05-19 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Prose updates.
+
+2019-05-14 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Typo fixes in main menu.
+
+2019-05-12 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Add escape function and call, fixes things when
+ backslash is the command character. Remove @code around the
+ names of the nodes for the helper functions.
+ * jrweave: Merge with latest version in TexiWeb Jr. (This
+ version use @subentry.)
+
+2019-04-11 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Update about testing - works on 5 different awks!
+
+2019-04-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Simplify comparison algorithm.
+
+2019-04-09 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Final polish.
+
+2019-04-08 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Lots of polish.
+
+2019-04-07 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Improve commentary on sorting. Index TRUE and FALSE.
+ Make fatal() function more portable.
+
+2019-04-05 Arnold D. Robbins <arnold@skeeve.com>
+
+ * jrweave: Use @sortas for chunk index entries to avoid < and >.
+ Use @subentry also.
+ * ti.twjr: Print see also after page numbers. Adjust logic and
+ sorting.
+
+2019-04-03 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Revise sorting to use the subkeys.
+ Add `@set txiindexlessthanignore'.
+
+2019-04-01 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Finish adding indexing of program variables etc.
+ * jrweave: Fix 'do not edit' banner.
+ * ti.twjr: Bug fixes in page numbers, seealso mixed with multilevel
+ entries.
+
+2019-03-28 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Lots of polish to code and doc. Almost done.
+ * ti.twjr: Make sure all chunk names start with an upper case
+ letter.
+
+2019-03-27 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Finish up new code. Some initial testing.
+ * jrweave, jrtangle: Update to latest versions.
+
+2019-03-25 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Rearrange, start on line parsing.
+
+2019-03-18 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Finish up printing code.
+
+2019-03-17 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Reformat code.
+
+2019-03-15 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Outline algorithm for printing entries.
+
+2019-03-14 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Very initial start at printing entries.
+
+2019-03-13 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Pretty much finish off the requirements chapter.
+
+2019-03-12 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Started expansion of requirements chapter.
+
+2019-03-08 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Fix "the the", http --> https, remove unnecessary
+ semicolons, add History section. Remove references to unimplemented
+ -o option.
+
+2019-03-06 Arnold D. Robbins <arnold@skeeve.com>
+
+ * ti.twjr: Add Command_char to list of special characters.
+
2015-02-27 Arnold D. Robbins <arnold@skeeve.com>
* jrweave, jrtangle: Updated to current version. In particular,
diff --git a/macros/texinfo/texinfo/texindex/Makefile.in b/macros/texinfo/texinfo/texindex/Makefile.in
index b9c0be6e9f..5c6e728507 100644
--- a/macros/texinfo/texinfo/texindex/Makefile.in
+++ b/macros/texinfo/texinfo/texindex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -504,6 +504,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -659,6 +660,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -726,11 +728,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -796,6 +800,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -816,6 +821,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -850,6 +856,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -864,6 +871,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -942,8 +950,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -959,14 +965,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1056,6 +1061,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1089,6 +1095,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1101,6 +1108,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1119,6 +1127,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1222,6 +1231,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/texindex/jrtangle b/macros/texinfo/texinfo/texindex/jrtangle
index 93eb8e1127..3e5b025958 100644
--- a/macros/texinfo/texinfo/texindex/jrtangle
+++ b/macros/texinfo/texinfo/texindex/jrtangle
@@ -1,7 +1,6 @@
-#! /usr/local/bin/gawk -f
+#! /usr/bin/gawk -f
#
-# Copyright (C) 2013, 2014, 2015 Arnold David Robbins
-# Copyright (C) 2019 Free Software Foundation
+# Copyright (C) 2013, 2014, 2015, 2016, 2019 Arnold David Robbins
#
# This file is part of TexiWeb Jr., a literate programming system.
#
@@ -24,19 +23,17 @@
#
# git clone http://github.com/arnoldrobbins/texiwebjr
#
-
BEGIN {
- v[0] = 0
- if ("version" in PROCINFO) {
- match(PROCINFO["version"], /^[0-9]+\./, v);
- }
+ v[0] = 0
+ if ("version" in PROCINFO) {
+ match(PROCINFO["version"], /^[0-9]+\./, v);
+ }
- if (v[0] < 4) {
- print("gawk >= 4.0 required") > "/dev/stderr"
- exit 63 # for "missing" script
- }
+ if (v[0] < 4) {
+ print("gawk >= 4.0 required") > "/dev/stderr"
+ exit 63 # for "missing" script
+ }
}
-
BEGIN {
TRUE = 1
FALSE = 0
@@ -170,6 +167,7 @@ function join(array, start, end, sep, result, i)
# otherwise fall through into the rest of the code
}
+/^@ignore/, /^@end ignore/ { next }
$0 ~ Code_chunk_pattern {
Chunk_type = "code chunk"
Pattern = Code_chunk_pattern
diff --git a/macros/texinfo/texinfo/texindex/jrweave b/macros/texinfo/texinfo/texindex/jrweave
index 8073aadc91..9709c94962 100644
--- a/macros/texinfo/texinfo/texindex/jrweave
+++ b/macros/texinfo/texinfo/texindex/jrweave
@@ -1,6 +1,6 @@
-#! /usr/local/bin/gawk -f
+#! /usr/bin/gawk -f
#
-# Copyright (C) 2013, 2014, 2015 Arnold David Robbins
+# Copyright (C) 2013, 2014, 2015, 2016, 2019 Arnold David Robbins
#
# This file is part of TexiWeb Jr., a literate programming system.
#
@@ -24,6 +24,17 @@
# git clone http://github.com/arnoldrobbins/texiwebjr
#
BEGIN {
+ v[0] = 0
+ if ("version" in PROCINFO) {
+ match(PROCINFO["version"], /^[0-9]+\./, v);
+ }
+
+ if (v[0] < 4) {
+ print("gawk >= 4.0 required") > "/dev/stderr"
+ exit 63 # for "missing" script
+ }
+}
+BEGIN {
TRUE = 1
FALSE = 0
File_chunk_pattern = "^@\\(([^)]+)@\\)[[:space:]]*=[[:space:]]*$"
@@ -74,9 +85,9 @@ function print_do_not_edit(filename, i, pl, pr, l, s, t)
s = sprintf(_"It was created by jrweave from `%s'.", filename)
l = length(s)
- pl = (l - length(t)) / 2 # padding on left side
- pr = l - (pl + length(t)) # padding on right side
- if (pl * 2 < l) # account for odd lengths
+ pl = int((l - length(t)) / 2) # padding on left side, integer division!
+ pr = l - (pl + length(t)) # padding on right side
+ if ((pl + pr + length(t)) < l) # account for odd lengths
pr++
for (i = 1; i <= l + 4; i++)
printf("%%")
@@ -165,6 +176,7 @@ function join(array, start, end, sep, result, i)
result = result sep array[i]
return result
}
+/^@ignore/, /^@end ignore/ { next }
# iftangle lines should be removed
/^@iftangle[[:space:]]*$/, /^@end iftangle[[:space:]]*$/ {
@@ -512,7 +524,7 @@ function print_out_chunk( x, y, n, i, parts, names,
chunk_being_used = \
format_chunk_name(name, Chunk_info[name]["chunk number"],
Chunk_info[name]["type"])
- printf("@crindex %s, use\n", chunk_being_used)
+ printf("@crindex %s @sortas{%s} @subentry use\n", chunk_being_used, remove_markup(name))
y = y chunk_being_used
y = y parts[i+1]
}
@@ -521,7 +533,8 @@ function print_out_chunk( x, y, n, i, parts, names,
format_chunk_name(Current_chunk,
Chunk_info[Current_chunk]["chunk number"],
Chunk_type)
- printf("@cdindex %s, definition\n", chunk_being_defined)
+ printf("@cdindex %s @sortas{%s} @subentry definition\n",
+ chunk_being_defined, remove_markup(Current_chunk))
printf("@noindent\n%s %s@equiv{}\n",
chunk_being_defined,
Chunk_info[Current_chunk]["redefn"] == 1 ? "" : "+")
@@ -836,6 +849,13 @@ function sanitize_name(name)
return name
}
+function remove_markup(text, result)
+{
+ result = gensub(/([^@])(@[[:alpha:]]+[{]([^}]+)[}])/, "\\1\\3", "g", text)
+ result = gensub(/@TeX[{][}]/, "TeX", "g", result)
+
+ return result
+}
function format_anchor_or_ref(type, name, defn,
clean_name, result) # locals
{
diff --git a/macros/texinfo/texinfo/texindex/texindex.awk b/macros/texinfo/texinfo/texindex/texindex.awk
index 1229f69f4b..6cde5d0440 100644
--- a/macros/texinfo/texinfo/texindex/texindex.awk
+++ b/macros/texinfo/texinfo/texindex/texindex.awk
@@ -16,7 +16,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
# ftrans.awk --- handle data file transitions
#
# user supplies beginfile() and endfile() functions
@@ -25,13 +25,13 @@
# November 1992
FNR == 1 {
- if (_filename_ != "")
- endfile(_filename_)
- _filename_ = FILENAME
- beginfile(FILENAME)
+ if (_filename_ != "")
+ endfile(_filename_)
+ _filename_ = FILENAME
+ beginfile(FILENAME)
}
-END { endfile(_filename_) }
+END { endfile(_filename_) }
# join.awk --- join an array into a string
#
# Arnold Robbins, arnold@skeeve.com, Public Domain
@@ -39,394 +39,610 @@ END { endfile(_filename_) }
function join(array, start, end, sep, result, i)
{
- if (sep == "")
- sep = " "
- else if (sep == SUBSEP) # magic value
- sep = ""
- result = array[start]
- for (i = start + 1; i <= end; i++)
- result = result sep array[i]
- return result
+ if (sep == "")
+ sep = " "
+ else if (sep == SUBSEP) # magic value
+ sep = ""
+ result = array[start]
+ for (i = start + 1; i <= end; i++)
+ result = result sep array[i]
+ return result
}
# quicksort --- C.A.R. Hoare's quick sort algorithm. See Wikipedia
# or almost any algorithms or computer science text
# Adapted from K&R-II, page 110
#
-function quicksort(data, left, right, i, last)
+function quicksort(data, left, right, compare, # parameters
+ i, last, use_index, lt) # locals
{
- if (left >= right) # do nothing if array contains fewer
- return # than two elements
-
- quicksort_swap(data, left, int((left + right) / 2))
- last = left
- for (i = left + 1; i <= right; i++)
- if (less_than(data[i], data[left]))
- quicksort_swap(data, ++last, i)
- quicksort_swap(data, left, last)
- quicksort(data, left, last - 1)
- quicksort(data, last + 1, right)
+ if (left >= right) # do nothing if array contains fewer
+ return # than two elements
+
+ use_index = (compare == "index")
+
+ quicksort_swap(data, left, int((left + right) / 2))
+ last = left
+ for (i = left + 1; i <= right; i++) {
+ lt = (use_index \
+ ? less_than(data, i, left) \
+ : key_compare(data[i], data[left]) < 0)
+ if (lt)
+ quicksort_swap(data, ++last, i)
+ }
+ quicksort_swap(data, left, last)
+ quicksort(data, left, last - 1, compare)
+ quicksort(data, last + 1, right, compare)
}
# quicksort_swap --- quicksort helper function, could be inline
#
function quicksort_swap(data, i, j, temp)
{
- temp = data[i]
- data[i] = data[j]
- data[j] = temp
+ temp = data[i]
+ data[i] = data[j]
+ data[j] = temp
}
function del_array(a)
{
- # Portable and faster than
- # for (i in a)
- # delete a[i]
- split("", a)
+ # Portable and faster than
+ # for (i in a)
+ # delete a[i]
+ split("", a)
}
function check_split_null( n, a)
{
- n = split("abcde", a, "")
- return (n == 5)
+ n = split("abcde", a, "")
+ return (n == 5)
}
function char_split(string, array, n, i)
{
- if (Can_split_null)
- return split(string, array, "")
+ if (Can_split_null)
+ return split(string, array, "")
- # do it the hard way
- del_array(array)
- n = length(string)
- for (i = 1; i <= n; i++)
- array[i] = substr(string, i, 1)
+ # do it the hard way
+ del_array(array)
+ n = length(string)
+ for (i = 1; i <= n; i++)
+ array[i] = substr(string, i, 1)
- return n
+ return n
}
function fatal(format, arg1, arg2, arg3, arg4, arg5,
- arg6, arg7, arg8, arg9, arg10)
+ arg6, arg7, arg8, arg9, arg10, cat)
{
- printf(format, arg1, arg2, arg3, arg4, arg5,
- arg6, arg7, arg8, arg9, arg10) > "/dev/stderr"
- exit EXIT_FAILURE
+ cat = "cat 1>&2" # maximal portability
+ printf(format, arg1, arg2, arg3, arg4, arg5,
+ arg6, arg7, arg8, arg9, arg10) | cat
+ close(cat)
+
+ exit EXIT_FAILURE
}
function isupper(c)
{
- return index("ABCDEFGHIJKLMNOPQRSTUVWXYZ", c)
+ return index("ABCDEFGHIJKLMNOPQRSTUVWXYZ", c)
}
function islower(c)
{
- return index("abcdefghijklmnopqrstuvwxyz", c)
+ return index("abcdefghijklmnopqrstuvwxyz", c)
}
function isalpha(c)
{
- return islower(c) || isupper(c)
+ return islower(c) || isupper(c)
}
function isdigit(c)
{
- return index("0123456789", c)
+ return index("0123456789", c)
+}
+function make_regexp(regexp, a, sep, n)
+{
+ n = split(regexp, a, "%")
+ if (Command_char == "\\")
+ sep = Command_char Command_char
+ else
+ sep = Command_char
+
+ return join(a, 1, n, sep)
+}
+function escape(regexp, a, n)
+{
+ if (Command_char != "\\")
+ return regexp
+
+ n = split(regexp, a, "\\")
+ if (n == 1)
+ return regexp
+
+ return join(a, 1, n, "\\\\")
+}
+function min(a, b)
+{
+ return (a < b ? a : b)
}
function usage(exit_val)
{
- printf(_"Usage: %s [OPTION]... FILE...\n", Invocation_name)
- print _"Generate a sorted index for each TeX output FILE."
- print _"Usually FILE... is specified as `foo.??' for a document `foo.texi'."
- print ""
- print _"Options:"
- print _" -h, --help display this help and exit"
- print _" --version display version information and exit"
- print _" -- end option processing"
- print ""
- print _"Email bug reports to bug-texinfo@gnu.org,\n\
+ printf(_"Usage: %s [OPTION]... FILE...\n", Invocation_name)
+ print _"Generate a sorted index for each TeX output FILE."
+ print _"Usually FILE... is specified as `foo.??' for a document `foo.texi'."
+ print ""
+ print _"Options:"
+ print _" -h, --help display this help and exit"
+ print _" --version display version information and exit"
+ print _" -- end option processing"
+ print ""
+ print _"Email bug reports to bug-texinfo@gnu.org,\n\
general questions and discussion to help-texinfo@gnu.org.\n\
-Texinfo home page: http://www.gnu.org/software/texinfo/";
+Texinfo home page: https://www.gnu.org/software/texinfo/"
- exit exit_val
+ exit exit_val
}
function version()
{
- print "texindex (GNU texinfo)", Texindex_version
- print ""
- printf _"Copyright (C) %s Free Software Foundation, Inc.\n\
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+ print "texindex (GNU texinfo)", Texindex_version
+ print ""
+ printf _"Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n\
This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n", "2019";
+There is NO WARRANTY, to the extent permitted by law.\n", "2019"
- exit EXIT_SUCCESS
+ exit EXIT_SUCCESS
}
BEGIN {
- TRUE = 1
- FALSE = 0
- EXIT_SUCCESS = 0
- EXIT_FAILURE = 1
-
- Texindex_version = "6.6"
- if (! Invocation_name) {
- # provide fallback in case it's not passed in.
- Invocation_name = "texindex"
- }
-
- Can_split_null = check_split_null()
- TEXTDOMAIN = "texinfo"
- for (i = 1; i < ARGC; i++) {
- if (ARGV[i] == "-h" || ARGV[i] == "--help") {
- usage(EXIT_SUCCESS)
- } else if (ARGV[i] == "--version") {
- version()
- } else if (ARGV[i] == "-k" || ARGV[i] == "--keep") {
- # do nothing, backwards compatibility
- delete ARGV[i]
- } else if (ARGV[i] == "--") {
- delete ARGV[i]
- break
- } else if (ARGV[i] ~ /^--?.+/) {
- fatal(_"%s: unrecognized option `%s'\n" \
- "Try `%s --help' for more information.\n",
- Invocation_name, ARGV[i], Invocation_name)
- exit EXIT_FAILURE
- } else {
- break
- }
- }
+ TRUE = 1
+ FALSE = 0
+ EXIT_SUCCESS = 0
+ EXIT_FAILURE = 1
+
+ Texindex_version = "6.7"
+ if (! Invocation_name) {
+ # provide fallback in case it's not passed in.
+ Invocation_name = "texindex"
+ }
+
+ Can_split_null = check_split_null()
+ TEXTDOMAIN = "texinfo"
+ for (i = 1; i < ARGC; i++) {
+ if (ARGV[i] == "-h" || ARGV[i] == "--help") {
+ usage(EXIT_SUCCESS)
+ } else if (ARGV[i] == "--version") {
+ version()
+ } else if (ARGV[i] == "-k" || ARGV[i] == "--keep") {
+ # do nothing, backwards compatibility
+ delete ARGV[i]
+ } else if (ARGV[i] == "--") {
+ delete ARGV[i]
+ break
+ } else if (ARGV[i] ~ /^--?.+/) {
+ fatal(_"%s: unrecognized option `%s'\n" \
+ "Try `%s --help' for more information.\n",
+ Invocation_name, ARGV[i], Invocation_name)
+ # fatal() will do `exit EXIT_FAILURE'
+ } else {
+ break
+ }
+ }
}
function beginfile(filename)
{
- Output_file = filename "s"
-
- # Reinitialize these for each input file
- del_array(Data)
- del_array(Keys)
- del_array(Seen)
- Entries = 0
- Do_initials = FALSE
- Prev_initial = ""
-
- Command_char = substr($0, 1, 1)
- if ( (Command_char != "\\" && Command_char != "@") \
- || substr($0, 2, 5) != "entry")
- fatal(_"%s is not a Texinfo index file\n", filename)
-
- Special_chars = "{}"
+ Output_file = filename "s"
+
+ # Reinitialize these for each input file
+ del_array(Seen)
+ del_array(Keys)
+ del_array(Allkeys)
+ del_array(Subkeys)
+ del_array(Initials)
+ del_array(Numfields)
+ del_array(Primary)
+ del_array(Secondary)
+ del_array(Tertiary)
+ del_array(See)
+ del_array(See_count)
+ del_array(Seealso)
+ del_array(Seealso_count)
+ del_array(Pagedata)
+ del_array(Printed)
+ Entries = 0
+ Do_initials = FALSE
+ Prev_initial = ""
+
+ Command_char = substr($0, 1, 1)
+ if ((Command_char != "\\" && Command_char != "@") \
+ || substr($0, 2, 5) != "entry")
+ fatal(_"%s is not a Texinfo index file\n", filename)
+
+ Special_chars = "{}" Command_char
+
+ Seeentry_re = make_regexp("%seeentry")
+ Seealso_re = make_regexp("%seealso")
+ Subentry_re = make_regexp(" *%subentry +")
}
-function endfile(filename, i, prev_initial, initial)
+function endfile(filename, i, prev_initial, initial)
{
- # sort the entries
- quicksort(Keys, 1, Entries)
-
- for (i = 1; i <= Entries; i++) {
- # deal with initial
- initial = Data[Keys[i], "initial"]
- if (initial != prev_initial) {
- prev_initial = initial
- print_initial(initial)
- }
-
- # write the actual line \entry {...}{...}
- printf("%centry {%s}{%s}\n",
- Command_char,
- Data[Keys[i], "text"],
- Data[Keys[i], "pagenum"]) > Output_file
- }
- close(Output_file)
+ # sort the entries
+ quicksort(Keys, 1, Entries, "index")
+
+ prev_initial = ""
+ for (i = 1; i <= Entries; i++) {
+ # deal with initial
+ initial = Initials[Keys[i]]
+ if (initial != prev_initial) {
+ prev_initial = initial
+ print_initial(initial)
+ }
+
+ write_index_entry(i)
+ }
+ close(Output_file)
}
{
- # Remove duplicates, which can happen
- if ($0 in Seen)
- next
- Seen[$0] = TRUE
- $0 = substr($0, 7) # remove leading \entry
- initial = extract_initial($0)
- numfields = field_split($0, fields, "{", "}", Command_char)
- if (numfields != 3)
- fatal(_"%s:%d: Bad entry; expected three fields, not %d\n",
- FILENAME, FNR, numfields)
- key = fields[1]
- pagenum = fields[2]
- text = fields[3]
- if (! ((key, "text") in Data)) {
- # first time we've seen this full line
- Keys[++Entries] = key
- Data[key, "text"] = text
- Data[key, "pagenum"] = pagenum
- Data[key, "initial"] = initial
- } else
- # seen this key before; add the current pagenum
- # unless we've already seen that too.
- if ( Data[key, "pagenum"] != pagenum \
- && Data[key, "pagenum"] !~ (", " pagenum "$")) {
- Data[key, "pagenum"] = Data[key, "pagenum"] ", " pagenum
- }
- if (! Do_initials) {
- if (Prev_initial == "")
- Prev_initial = initial
- else if (initial != Prev_initial)
- Do_initials = TRUE
- }
+ # Remove duplicates, which can happen
+ if ($0 in Seen)
+ next
+ Seen[$0] = TRUE
+ $0 = substr($0, 7) # remove leading \entry or @entry
+ initial = extract_initial($0)
+ numfields = field_split($0, fields, "{", "}", Command_char)
+ if (numfields < 3 || numfields > 5)
+ fatal(_"%s:%d: Bad entry; expected 3 to 5 fields, not %d\n",
+ FILENAME, FNR, numfields)
+ key = fields[1]
+ pagenum = fields[2]
+ primary_text = fields[3]
+ secondary_text = (numfields > 3 ? fields[4] : "")
+ tertiary_text = (numfields > 4 ? fields[5] : "")
+ if (! (key in Allkeys)) {
+ # first time we've seen this full line
+ Keys[++Entries] = key
+ Allkeys[key] = key
+ Initials[key] = initial
+ Numfields[key] = numfields - 2 # don't count sortkey, page number
+ Primary[key] = primary_text
+ if (secondary_text)
+ Secondary[key] = secondary_text
+ if (tertiary_text)
+ Tertiary[key] = tertiary_text
+ n = split(key, subparts, Subentry_re)
+ for (i = 1; i <= n; i++)
+ Subkeys[key, i] = subparts[i]
+
+ if (pagenum ~ Seeentry_re) {
+ See_count[key]++
+ See[key, See_count[key]] = pagenum
+ } else if (pagenum ~ Seealso_re) {
+ Seealso_count[key]++
+ Seealso[key, Seealso_count[key]] = pagenum
+ } else
+ Pagedata[key] = pagenum
+ } else {
+ # We've seen this key before:
+ # Add to see or see also, or else add to list of pages.
+ # In the latter case, make sure we've not seen this
+ # page number before. (Shouldn't happen based on the
+ # earlier removal of exact duplicates, but we could have
+ # an identical key with different formatting of actual text.
+
+ if (pagenum ~ Seeentry_re) {
+ See_count[key]++
+ See[key, See_count[key]] = pagenum
+ } else if (pagenum ~ Seealso_re) {
+ Seealso_count[key]++
+ Seealso[key, Seealso_count[key]] = pagenum
+ } else if (! (key in Pagedata)) {
+ Pagedata[key] = pagenum
+ } else if (Pagedata[key] != pagenum \
+ && Pagedata[key] !~ escape(", " pagenum "$")) {
+ Pagedata[key] = Pagedata[key] ", " pagenum
+ }
+ }
+ if (! Do_initials) {
+ if (Prev_initial == "")
+ Prev_initial = initial
+ else if (initial != Prev_initial)
+ Do_initials = TRUE
+ }
}
function extract_initial(key, initial, nextchar, i, l, kchars)
{
- l = char_split(key, kchars)
- if (l >= 3 && kchars[2] == "{") {
- bracecount = 1
- i = 3
- while (bracecount > 0 && i <= l) {
- if (kchars[i] == "{")
- bracecount++
- else if (kchars[i] == "}")
- bracecount--
- i++
- }
- if (i > l)
- fatal(_"%s:%d: Bad key %s in record\n", FILENAME, FNR, key)
- initial = substr(key, 2, i - 2)
- } else if (kchars[2] == Command_char) {
- nextchar = kchars[3]
- if (initial == Command_char && (nextchar == "{" || nextchar == "}"))
- initial = substr(key, 2, 3)
- else {
- initial = toupper(nextchar)
- }
- } else {
- initial = toupper(kchars[2])
- }
-
- return initial
+ l = char_split(key, kchars)
+ if (l >= 3 && kchars[2] == "{") {
+ bracecount = 1
+ i = 3
+ while (bracecount > 0 && i <= l) {
+ if (kchars[i] == "{")
+ bracecount++
+ else if (kchars[i] == "}")
+ bracecount--
+ i++
+ }
+ if (i > l)
+ fatal(_"%s:%d: Bad key %s in record\n", FILENAME, FNR, key)
+ initial = substr(key, 2, i - 2)
+ } else if (kchars[2] == Command_char) {
+ nextchar = kchars[3]
+ if (initial == Command_char && index("{}", nextchar) > 0)
+ initial = substr(key, 2, 3)
+ else {
+ initial = toupper(nextchar)
+ }
+ } else {
+ initial = toupper(kchars[2])
+ }
+
+ return initial
}
function field_split( \
- record, fields, start, end, com_ch, # parameters
- chars, numchars, out, delim_count, i, j, k) # locals
+ record, fields, start, end, com_ch, # parameters
+ chars, numchars, out, delim_count, i, j, k) # locals
{
- del_array(fields)
-
- numchars = char_split(record, chars)
- j = 1 # index into fields
- k = 1 # index into out
- delim_count = 1
- for (i = 2; i <= numchars; i++) {
- if (chars[i] == com_ch) {
- if (index(Special_chars, chars[i+1]) != 0) {
- out[k++] = chars[i+1]
- i++
- } else
- out[k++] = chars[i]
- } else if (chars[i] == start) {
- delim_count++
- out[k++] = chars[i]
- } else if (chars[i] == end) {
- delim_count--
-
- if (delim_count == 0) {
- fields[j++] = join(out, 1, k-1, SUBSEP)
- del_array(out) # reset for next time through
- k = 1
-
- i++
- if (i <= numchars && chars[i] != start)
- fatal(_"%s:%d: Bad entry; expected %s at column %d\n",
- FILENAME, FNR, start, i)
- delim_count = 1
- } else
- out[k++] = chars[i]
- } else
- out[k++] = chars[i]
-
- if (j == 3) { # Per Karl, just grab the whole rest of the line
- # extract everything between the outer delimiters
- fields[3] = substr(record, i + 1, numchars - i - 1)
- break
- }
- }
-
- return j # num fields
+ del_array(fields)
+
+ numchars = char_split(record, chars)
+ j = 1 # index into fields
+ k = 1 # index into out
+ delim_count = 1
+ for (i = 2; i <= numchars; i++) {
+ if (chars[i] == com_ch) {
+ if (chars[i+1] == Command_char) { # input was @@
+ out[k++] = chars[i+1]
+ out[k++] = chars[i+1]
+ i++
+ } else if (index(Special_chars, chars[i+1]) != 0) {
+ out[k++] = chars[i+1]
+ i++
+ } else
+ out[k++] = chars[i]
+ } else if (chars[i] == start) {
+ delim_count++
+ out[k++] = chars[i]
+ } else if (chars[i] == end) {
+ delim_count--
+
+ if (delim_count == 0) {
+ fields[j++] = join(out, 1, k-1, SUBSEP)
+ del_array(out) # reset for next time through
+ k = 1
+
+ i++
+ if (i <= numchars && chars[i] != start)
+ fatal(_"%s:%d: Bad entry; expected %s at column %d\n",
+ FILENAME, FNR, start, i)
+ delim_count = 1
+ } else
+ out[k++] = chars[i]
+ } else
+ out[k++] = chars[i]
+ }
+
+ return j - 1 # num fields
}
function print_initial(initial)
{
- if (Do_initials) {
- if (index(Special_chars, initial) != 0)
- initial = Command_char initial
- printf("%cinitial {%s}\n",
- Command_char, initial) > Output_file
- }
+ if (! Do_initials)
+ return
+
+ if (index(Special_chars, initial) != 0)
+ initial = Command_char initial
+ printf("%cinitial {%s}\n",
+ Command_char, initial) > Output_file
+}
+function less_than(data, l, r, left, right, nfields, cmp1, cmp2)
+{
+ left = data[l]
+ right = data[r]
+
+ left_fields = Numfields[left]
+ right_fields = Numfields[right]
+
+ nfields = min(left_fields, right_fields)
+
+ # At least one field, always check the first subkey
+ cmp1 = key_compare(Subkeys[left, 1], Subkeys[right, 1])
+ if (cmp1 != 0)
+ return cmp1 < 0
+
+ # cmp1 == 0: one side has 1 field, other side has 1 to 3 fields
+ if (nfields == 1)
+ return left_fields < right_fields
+
+ # At least two fields, check second subkey
+ cmp2 = key_compare(Subkeys[left, 2], Subkeys[right, 2])
+ if (cmp2 != 0)
+ return cmp2 < 0
+
+ # cmp1 == 0, cmp2 == 0, one side has 2 fields,
+ # other has 2 to 3 fields
+ if (nfields == 2)
+ return left_fields < right_fields
+
+ # Three fields
+ return key_compare(Subkeys[left, 3], Subkeys[right, 3]) < 0
}
BEGIN {
- for (i = 0; i < 256; i++) {
- c = sprintf("%c", i)
- Ordval[c] = i # map character to value
-
- if ((n = isdigit(c)) > 0) {
- Ordval[c] += 512
- }
- }
-
- # Give both 'A' and 'a' the same code
- i = Ordval["A"]
- j = Ordval["Z"]
- for (; i <= j; i++) {
- c = sprintf("%c", i)
-
- # In ASCII, 'A' is before 'a', so this is
- # the right order to check
- #
- # Checking isupper() lets this work for EBCDIC, too.
- if (isupper(c)) {
- Ordval[c] += 512
- Ordval[tolower(c)] = Ordval[c]
- }
- }
+ for (i = 0; i < 256; i++) {
+ c = sprintf("%c", i)
+ Ordval[c] = i # map character to value
+
+ if (isdigit(c))
+ Ordval[c] += 512
+ }
+
+ # Set things up such that 'a' < 'A' < 'b' < 'B' < ...
+ i = Ordval["a"]
+ j = Ordval["z"]
+ newval = i + 512
+ for (; i <= j; i++) {
+ c = sprintf("%c", i)
+
+ if (islower(c)) {
+ Ordval[c] = newval++
+ Ordval[toupper(c)] = newval++
+ }
+ }
+}
+function key_compare(left, right, len_l, len_r, len, chars_l, chars_r)
+{
+ len_l = length(left)
+ len_r = length(right)
+ len = (len_l < len_r ? len_l : len_r)
+
+ char_split(left, chars_l)
+ char_split(right, chars_r)
+
+ for (i = 1; i <= len; i++) {
+ if (isalpha(chars_l[i]) && isalpha(chars_r[i])) {
+ # same char different case
+ # upper case comes out last
+ if (chars_l[i] != chars_r[i] &&
+ tolower(chars_l[i]) == tolower(chars_r[i])) {
+ if (i != len \
+ && (isalpha(chars_l[i+1]) || isalpha(chars_r[i+1])))
+ continue
+
+ # negative, zero, or positive
+ return Ordval[chars_l[i]] - Ordval[chars_r[i]]
+ }
+ # same case, different char,
+ # or different case, different char:
+ # letter order wins
+ if (Ordval[chars_l[i]] < Ordval[chars_r[i]])
+ return -1
+
+ if (Ordval[chars_l[i]] > Ordval[chars_r[i]])
+ return 1
+
+ # equal, keep going
+ continue
+ }
+
+ # letter and something else, or two non-letters
+ # letter order wins
+ if (Ordval[chars_l[i]] < Ordval[chars_r[i]])
+ return -1
+
+ if (Ordval[chars_l[i]] > Ordval[chars_r[i]])
+ return 1
+
+ # equal, keep going
+ }
+
+ # equal so far, shorter one wins
+ if (len_l < len_r)
+ return -1
+
+ if (len_l > len_r)
+ return 1
+
+ return 0
+}
+function print_entry(key, entry_command, entry_text,
+ count, see_entries, i)
+{
+ if ((key, 1) in See) # at least one ``see''
+ print_see_entry(key, entry_command, entry_text,
+ See_count, See)
+
+ if (key in Pagedata) { # at least one page number
+ if ((key, 1) in Seealso) {
+ count = Seealso_count[key]
+
+ # Copy the entries to a separate array
+ for (i = 1; i <= count; i++)
+ see_entries[i] = Seealso[key, i]
+
+ # sort them
+ quicksort(see_entries, 1, count, "string")
+
+ # now add them to the page data
+ for (i = 1; i <= count; i++)
+ Pagedata[key] = Pagedata[key] ", " see_entries[i]
+ }
+
+ printf("%c%s{%s}{%s}\n",
+ Command_char, entry_command,
+ entry_text[key], Pagedata[key]) > Output_file
+
+ Printed[key] = True # mark this key as printed
+ } else if ((key, 1) in Seealso) { # at least one ``see also''
+ # Only ``see also'' entry, print it
+ count = Seealso_count[key]
+
+ # Copy the entries to a separate array
+ for (i = 1; i <= count; i++)
+ see_entries[i] = Seealso[key, i]
+
+ # sort them
+ quicksort(see_entries, 1, count, "string")
+
+ printf("%c%s{%s}{",
+ Command_char, entry_command,
+ entry_text[key]) > Output_file
+
+ # now add them to the page data
+ for (i = 1; i <= count; i++) {
+ printf("%s", see_entries[i]) > Output_file
+ if (i != count)
+ printf(", ") > Output_file
+ }
+ printf("}\n") > Output_file
+ }
+}
+function print_see_entry(key, entry_command, entry_text, # parameters
+ count_array, see_text_array, # parameters
+ i, count, see_entries) # locals
+{
+ count = count_array[key]
+ if (count == 1) { # the easy case
+ printf("%c%s{%s, %s}{}\n",
+ Command_char, entry_command,
+ entry_text[key], see_text_array[key, 1]) > Output_file
+
+ return
+ }
+
+ # Otherwise, we need to sort the entries and then print them
+ # Copy the entries to a separate array
+ for (i = 1; i <= count; i++)
+ see_entries[i] = see_text_array[key, i]
+
+ # sort them
+ quicksort(see_entries, 1, count, "string")
+
+ # now print them
+ for (i = 1; i <= count; i++)
+ printf("%c%s{%s, %s}{}\n",
+ Command_char, entry_command,
+ entry_text[key], see_entries[i]) > Output_file
}
-function less_than(left, right, len_l, len_r, len, chars_l, chars_r)
+function write_index_entry(current, key)
{
- len_l = length(left)
- len_r = length(right)
- len = (len_l < len_r ? len_l : len_r)
-
- char_split(left, chars_l)
- char_split(right, chars_r)
-
- for (i = 1; i <= len; i++) {
- if (isalpha(chars_l[i]) && isalpha(chars_r[i])) {
- # same char different case
- # upper case comes out last
- if (chars_l[i] != chars_r[i] &&
- tolower(chars_l[i]) == tolower(chars_r[i])) {
- if ( i != len \
- && (isalpha(chars_l[i+1]) \
- || isalpha(chars_r[i+1])))
- continue
- if (chars_l[i] > chars_r[i])
- return 1
- return 0
- }
- # same case, different char,
- # or different case, different char:
- # letter order wins
- if (Ordval[chars_l[i]] < Ordval[chars_r[i]])
- return 1
-
- if (Ordval[chars_l[i]] > Ordval[chars_r[i]])
- return 0
-
- # equal, keep going
- continue
- }
-
- # letter and something else, or two non-letters
- # letter order wins
- if (Ordval[chars_l[i]] < Ordval[chars_r[i]])
- return 1
-
- if (Ordval[chars_l[i]] > Ordval[chars_r[i]])
- return 0
-
- # equal, keep going
- }
-
- # equal so far, shorter one wins
- if (len_l < len_r)
- return 1
-
- return 0
+ key = Keys[current] # current sort key
+ if (Numfields[key] == 1) {
+ print_entry(key, "entry", Primary)
+ } else if (Numfields[key] == 2) {
+ if (! (Subkeys[key, 1] in Printed)) {
+ printf("%centry{%s,}{}\n",
+ Command_char, Primary[key]) > Output_file
+ Printed[Subkeys[key, 1]] = True
+ }
+ print_entry(key, "secondary", Secondary)
+ } else if (Numfields[key] == 3) {
+ if (! (Subkeys[key, 1] in Printed)) {
+ printf("%centry{%s,}{}\n",
+ Command_char, Primary[key]) > Output_file
+ Printed[Subkeys[key, 1]] = True
+ }
+ subkey = (Subkeys[key, 1] Command_char "subentry " Subkeys[key, 2])
+ if (! (subkey in Printed)) {
+ printf("%csecondary{%s,}{}\n",
+ Command_char, Secondary[key]) > Output_file
+ Printed[subkey] = True
+ }
+ print_entry(key, "tertiary", Tertiary)
+ }
}
diff --git a/macros/texinfo/texinfo/texindex/ti.twjr b/macros/texinfo/texinfo/texindex/ti.twjr
index ec59f68a5d..eb2e0ca77b 100644
--- a/macros/texinfo/texinfo/texindex/ti.twjr
+++ b/macros/texinfo/texinfo/texindex/ti.twjr
@@ -1,13 +1,10 @@
\input texinfo @c -*-texinfo-*-
-@c vim: filetype=texinfo tabstop=2 expandtab
+@c vim: filetype=texinfo tabstop=4 shiftwidth=4
@c %**start of header (This is for running Texinfo on a region.)
@setfilename texindex.info
@settitle Texindex @VERSION@: A program for sorting indices
@c %**end of header (This is for running Texinfo on a region.)
-@c Better brace handling, this texindex is needed to process!
-@allowindexbraces
-
@c Merge the function and variable indexes into the concept index,
@c but without the code font; in the index entries we'll do the
@c font management ourselves. Also merge in the chunk definition
@@ -19,6 +16,20 @@
@synindex cd cp
@synindex cr cp
+@ifnottex
+@ifnotdocbook
+@macro ii{text}
+@i{\text\}
+@end macro
+@end ifnotdocbook
+@end ifnottex
+
+@ifdocbook
+@macro ii{text}
+@inlineraw{docbook,<lineannotation>\text\</lineannotation>}
+@end macro
+@end ifdocbook
+
@copying
This @command{texindex} program (version @VERSION@, @UPDATED@) sorts the
raw index files created by @file{texinfo.tex}. (This Texinfo source is
@@ -39,7 +50,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program. If not, see @url{http://www.gnu.org/licenses/}.
+along with this program. If not, see @url{https://www.gnu.org/licenses/}.
@end quotation
@end copying
@@ -72,6 +83,56 @@ files produced by the @file{texinfo.tex} file.
* Processing records:: Processing each record.
* Necessary stuff:: Copyright, helper functions, i18n.
* Index:: Combined index.
+
+@detailmenu
+* Intended audience:: Who should read this document.
+* History:: @file{texindex.awk} development history.
+* Desired printed output:: What a printed index should look like.
+* Texinfo indexing commands:: How to write indexing commands.
+* Input form:: The input to @file{texindex.awk}.
+* Output form:: The output from @file{texindex.awk}.
+* Processing:: Processing the data.
+* Assumptions:: Additional assumptions.
+* Portability:: Using portable @command{awk}.
+* First line:: The first line in the file.
+* Initial setup:: Set up variables and constants used
+ throughout.
+* Argument processing:: Processing command line arguments.
+* Setup for each input file:: What happens at the start of each file.
+* Processing each record:: Pulling apart the fields and storing data.
+* Remove duplicates:: Removing duplicating entries.
+* Remove leading @code{\entry}:: Remove the leading @code{\entry} command.
+* Get the initial:: Get the initial for this entry.
+* Set up and name fields:: Pull apart the line.
+* Store the data for this line:: Store the data for later access.
+* Check for more than one initial:: See if there are multiple initials.
+* Splitting the record:: Split the record apart.
+* End-of-file sorting and printing:: Sorting the entries for each index.
+* Quicksort:: Sorting our input.
+* Multilevel comparisons:: Handling multilevel entries.
+* Comparing index entries:: The heart of the sorting algorithm.
+* Printing the data:: Printing the final results.
+* printing top level:: Top level logic.
+* printing a single entry:: Handling a single entry.
+* Copyright statement:: Copyright info.
+* Library functions:: From the @code{gawk} library:
+ @file{ftrans.awk}, @code{join()}.
+* Helper functions:: @code{del_array()},
+ @code{check_split_null()}, @code{fatal()},
+ @dots{}
+* del_array:: Clearing out an array.
+* check_split_null:: Checking if @command{awk} splits on the
+ null string.
+* char_split:: Splitting a line into individual
+ characters.
+* fatal:: Printing fatal errors.
+* is@dots{} functions:: Checking character types.
+* make_regexp:: Make a regexp to match @TeX{ control
+ sequences.
+* escape:: Escaping backslashes for strings.
+* min:: Get the minimum of two numbers.
+* I18N:: Internationalization.
+@end detailmenu
@end menu
@node Preface
@@ -80,7 +141,8 @@ files produced by the @file{texinfo.tex} file.
This file defines @file{texindex.awk}, a reimplementation of the C
program @file{texindex.c}. The purpose is to make the program more
maintainable. As a practical benefit, it also supports correct sorting
-and initials for the @samp{@{} and @samp{@}} characters in an index.
+and initials for the @samp{@{} and @samp{@}} characters in an index,
+and multi-level index entries.
@cindex @{ (left brace), example index entry for
@cindex @} (right brace), example index entry for
@@ -89,16 +151,17 @@ and initials for the @samp{@{} and @samp{@}} characters in an index.
This is a @dfn{literate program}, written using the
@uref{https://github.com/arnoldrobbins/texiwebjr, @sc{TexiWeb Jr.@:}
literate programming system}. The underlying documentation system is
-@uref{http://www.gnu.org/software/texinfo, Texinfo} the GNU
+@uref{https://www.gnu.org/software/texinfo, Texinfo}, the GNU
documentation formatting language. A single source file produces the
runnable program, a printable document, and an online document.
@menu
-* Intended audience::
+* Intended audience:: Who should read this document.
+* History:: @file{texindex.awk} development history.
@end menu
@node Intended audience
-@section Intended audience
+@section Intended Audience
You should read this if you want to understand how @file{texindex.awk}
works. You should be familiar with the @command{awk} programming
@@ -110,87 +173,269 @@ the wrong place. @xref{knuth}.
@c Scale figure to 4.5 inches which is good for both smallbook
@c and regular. TeX will scale height also automatically.
@float Figure,knuth
-@caption{Indexing (@url{http://xkcd.com/163/})}
+@caption{Indexing (@url{https://xkcd.com/163/})}
@center @image{dek_idx, 5in, , Indexing}
@end float
+@node History
+@section Development History
+
+This program was originally written in 2014 in order to enable
+using left and right braces in index entries, and to provide a program
+that would be more easily maintainable going forward than the C version.
+
+In 2019, discussions on the Texinfo bug mailing list around adding
+multi-level indexing and ``see'' and ``see also'' entries motivated
+reworking the program.
+
@node Requirements
@chapter Requirements
The input to this program is the list of unsorted index entries produced
-by @file{texinfo.tex} when a Texinfo document is processed. For
-example, two lines resulting from the @command{gawk} manual might look
-like this:
+by @file{texinfo.tex} when a Texinfo document is processed.
+This chapter presents the input to the program, the Texinfo
+commands that produce that input, and the expected output from
+this program. It also presents some additional notes concerning
+the requirements.
+
+@menu
+* Desired printed output:: What a printed index should look like.
+* Texinfo indexing commands:: How to write indexing commands.
+* Input form:: The input to @file{texindex.awk}.
+* Output form:: The output from @file{texindex.awk}.
+* Processing:: Processing the data.
+* Assumptions:: Additional assumptions.
+* Portability:: Using portable @command{awk}.
+@end menu
+
+@node Desired printed output
+@section Where We're Going
+
+Let's first look at the kind of output desired.
+A high-quality index has
+several types of entries:
+
+@table @asis
+@item Single level entries
+These are the most common; each entry has text and a list of one
+or more page numbers.
+
+@item Double level entries
+These entries have subtopics; the top level entry may also have a
+page number, or it may not.
+
+@item Triple level entries
+These entries have subtopics for the subtopics; the top level
+and secondary entries may also have
+page numbers, or they may not.
+
+@item ``See @dots{}'' entries
+Entries that point at other entries in the index, generally without
+any subtopics. ``See'' entries do not have a page number of their own.
+
+@item ``See also @dots{}'' entries
+Entries that point at other entries, but often do have
+subsequent direct page references of their own.
+``See also'' entries are merged with regular entries,
+their text coming after the page numbers.
+@end table
+
+Here's what they might look like when printed
+(apologies in advance
+for the use of a constant-width font):
@example
-\entry@{POSIX awk@}@{5@}@{POSIX \command @{awk@}@}
-@dots{}
-\entry@{POSIX awk@}@{106@}@{POSIX \command @{awk@}@}
+coffee makers . . . . . . . . . . 15 @ii{Single level entry}
+ electric . . . . . . . 17, 22 @ii{Double level entry}
+ blue . . . . . . . . 42 @ii{Triple level entry}
+ pink . . . . . . . . 35 @ii{Another triple level entry}
@end example
-As shown, there are three ``fields'' enclosed in braces:
+The same hierarchy might appear without page numbers:
-@itemize @bullet
-@item
-The sort key. This is the text of the entry with all markup removed.
-It should contain only ASCII characters.
+@example
+coffee makers, @ii{Single level entry}
+ electric, @ii{Double level entry}
+ blue . . . . . . . . . . 42 @ii{Triple level entry}
+ pink . . . . . . . . . . 35 @ii{Another triple level entry}
+@end example
-@item
-The page number for this entry.
+A ``See'' entry doesn't have page numbers:
-@item
-The display text to be shown in the printed index, which can include markup.
-@end itemize
+@example
+espresso makers, @ii{See} coffee makers
+toasters, . . . . . . . . 42, @ii{See also} coffee makers
+@end example
+
+@node Texinfo indexing commands
+@section Texinfo Indexing Commands
+
+Texinfo provides a number of different commands for putting entries
+into different indices. For discussion we use the @code{@@cindex}
+command in the following examples. Of interest to @file{texindex.awk}
+is the text of the one-to-three parts of an entry, and how the index
+should be sorted. Some examples:
+
+@example
+@@cindex coffee makers @ii{One level}
+@@cindex coffee makers @@subentry electric @ii{Tow levels}
+@@cindex coffee makers @@subentry electric @@subentry blue @ii{Three levels}
+@end example
+
+Here, the @code{@@subentry} separates the secondary and tertiary parts of
+the entry from the primary part.
+
+Additionally, each part may have an @code{@@sortas} clause:
+
+@example
+@@cindex coffee makers @@sortas@{Coffee Makers@}
+@end example
+
+``See'' and ``See also'' entries look like this:
+
+@example
+@@cindex espresso makers @@seeentry@{coffee makers@}
+@@cindex toasters @@seealso@{coffee makers@}
+@end example
+
+@noindent
+Note that there is (or should be) no comma between the primary text and the @code{@@seeentry}
+or @code{@@seealso}: @file{texindex.awk} supplies a comma in the final
+printed entry.
+
+@node Input form
+@section Input To The Program
+
+The output from @file{texinfo.tex} contains the data for the
+different kinds of index entries described in the previous
+section. Each line is an @dfn{entry}. Each entry has from three
+to five fields, where the first three fields represent the same
+data for all entries. Entries look as follows:
+
+@example
+@@entry@{@var{sortkey}@}@{@var{page or see}@}@{@var{primary}@}
+@@entry@{@var{sortkey}@}@{@var{page or see}@}@{@var{primary}@}@{@var{secondary}@}
+@@entry@{@var{sortkey}@}@{@var{page or see}@}@{@var{primary}@}@{@var{secondary}@}@{@var{tertiary}@}
+@end example
The braces are balanced in all cases, although for use by this program,
literal braces (not necessarily balanced) can be included in the sort
-key by escaping them with the @dfn{command character}. This is the
-first character on the line. It is either the backslash used by @TeX{}
-(@samp{\}) or the at sign used by Texinfo (@samp{@@}).
+key by escaping them with the @dfn{command character}.
@cindex backslash vs.@: at
@cindex command character, @samp{\} vs.@: @samp{@@}
-Historically, @file{texinfo.tex} has used @samp{\} as the command
-character in index files. This causes complications with index entries
-containing backslashes and braces; C @command{texindex} has never output
-the correct initial (a left brace) for an index entry like
-@samp{@@cindex @@@{@}}, or done technically-correct sorting with such
-entries. @xref{Details of @t{texindex},,, texinfo, GNU Texinfo}.
-
-The present @code{awk} implementation handles these cases better. It
-also supports @samp{@@} as the command character, which allows
-@file{texinfo.tex} to output cleaner raw index files. (For
-compatibility, for now this is only done if a ``secret'' @TeX{} variable
-is set: @code{\global\usebracesinindexestrue}.) The first character of
-the raw input file is taken as the command character.
-
-@subheading Processing
+In the example above, the command character is @samp{@@} (as in Texinfo
+itself). Historically, however, the command character was backslash
+(@samp{\}), and @file{texindex.awk} can handle either one.
+
+Because older versions of @command{texi2dvi} only understand backslash as
+the command character, it remains set to backslash, so that newer versions
+of @file{texinfo.tex} will work with older versions of @command{texi2dvi}.
+Once the newer version of @command{texi2dvi} that also understands
+@samp{@@} has had a chance to spread, (we can hope that) the command
+character will change to @samp{@@}.
+
+The command character is determined at run time by looking at the first
+character on the first line of each input file.
+
+The fields are as follows:
+
+@table @var
+@item sortkey
+The text to use for sorting index entries.
+Generally, this is the text of the line with all markup removed.
+When an @code{@@sortas} clause is provided, its contents are used instead.
+This field should contain only ASCII characters.
+
+When there are subentries, the sort key is the concatenation of three
+fields (or their sort @code{@@sortas} clauses), separated by
+@code{@@subentry} and a space. @file{texindex.awk} needs to recognize
+where there are multiple sort keys in order to print entries appropriately.
+
+@item page or see
+Either a page number (as a roman numeral or an integer, possibly
+with additional markup), or an indication that that this is a ``See''
+or ``See also'' entry.
+
+@item primary
+The primary text of the index entry.
+
+@item secondary
+The (optional) secondary text of the index entry.
+
+@item tertiary
+The (optional) tertiary text of the index entry.
+@end table
-The job is to sort the entries, and merge those which are identical
-except for the page numbers. Thus, for the above two entries, the
-output should be:
+Our mission (which we choose to accept) is to read the above input,
+sort it appropriately, and produce the correct output.
+
+@node Output form
+@section What The Output Should Look Like
+
+Output consists four different commands, derived from the indexing input.
+The middle two can have a variant where there is no page number.
@example
-\entry @{POSIX \command @{awk@}@}@{5, 106@}
+@@initial @{A@} @ii{For the initial over each group}
+
+@@entry@{@var{indexing text}@}@{@var{pagenum}@} @ii{Primary entry}
+@@entry@{@var{indexing text}@}@{@} @ii{Primary entry without page number}
+
+@@secondary@{@var{indexing text}@}@{@var{pagenum}@} @ii{Secondary entry}
+@@secondary@{@var{indexing text}@}@{@} @ii{Secondary entry without page number}
+
+@@tertiary@{@var{indexing text}@}@{@var{pagenum}@} @ii{Tertiary entry}
@end example
+The commands are:
+
+@table @code
+@item @@initial
+Besides the index entries,
+@file{texindex.awk} must output special lines indicating the
+first character (the @dfn{initial}) of keys grouped together, but only
+if there is more than one initial used throughout the input file.
+
+@item @@entry
+This is for a plain index entry, or for the primary term in a multi-level
+index entry. When the primary appears only with a secondary entry,
+there won't be a page number.
+
+No page number is printed when there
+is an @code{@@seeentry} in the entry. In that case,
+the output from @file{texindex.awk} should be a combination of
+the original input fields three and two.
+
+@item @@secondary
+This is for a secondary index entry in a multi-level
+index entry. When the secondary appears only with a tertiary entry,
+there won't be a page number.
+
+@item @@tertiary
+This is for a tertiary index entry in a multi-level
+index entry. This one always has a page number, unless it is
+a ``see'' entry.
+@end table
+
+
+@node Processing
+@section Processing Index Entries
+
+The job is to sort the entries, and merge those which are identical
+except for the page numbers.
The sorting should be in the order of: all symbols first, then all
digits, then all letters, with uppercase letters following lowercase
ones, so we will need some smarts.
+Once sorted, the lines must be output in the correct form, depending
+upon how many entries and subentries they have.
+
Input lines might be duplicated (same entry, same page, more than once),
so we will have to deal with that.
-In addition, @command{texindex} must output special lines indicating the
-first character (the @dfn{initial}) of keys grouped together, but only
-if there is more than one initial used throughout the input file. This
-output looks like:
-
-@example
-\initial @{A@}
-@end example
-
-@subheading Assumptions
+@node Assumptions
+@section Assumptions About Our Data
In the rest of the program we make two fundamental assumptions:
@@ -210,18 +455,19 @@ first. As an example, consider these two Texinfo commands:
@noindent
They produce the following output via @file{texinfo.tex},
-which in turn is the input to @command{texindex}:
+which in turn is the input to @file{texindex.awk}:
@example
-\entry@{field_split() function@}@{2@}@{\file @{field_split()@} function@}
-\entry@{field_split() function@}@{7@}@{\code @{field_split()@} function@}
+@@entry@{field_split() function@}@{2@}@{@@file @{field_split()@} function@}
+@@entry@{field_split() function@}@{7@}@{@@code @{field_split()@} function@}
@end example
-@noindent The result will be a single entry, using @code{\file},
-accumulating the page numbers.
+@noindent
+The result will be a single entry, using @code{@@file},
+accumulating the page numbers:
@example
-\entry @{\file @{field_split()@} function@}@{2, 7@}
+@@entry@{@@file @{field_split()@} function@}@{2, 7@}
@end example
@item
@@ -229,11 +475,14 @@ accumulating the page numbers.
For the same sort key and text, page numbers will be monotonically
increasing. This means we can just use a new page number when it comes
in, and not have to sort entries based on both sort key and page number.
-(Which, in turn, means that we don't need to worry about page numbers
-that are roman numerals.)
+In turn, this means that we don't need to worry about page numbers
+that are roman numerals (which can occur).
@end enumerate
+@node Portability
+@section Using Portable @command{awk}
+
An additional requirement, for ease of deployment, is that the program
be written in portable @command{awk}, and not use features found only in
GNU @command{awk} (@command{gawk}). For our purposes, ``portable''
@@ -242,15 +491,20 @@ Weinberger and Kernighan. This gives us functions, multidimensional
arrays and a number of other important features over the original
@command{awk} shipped with V7 Unix.
+In practice, we can also rely on basic features added in POSIX
+@command{awk} should we need to (such as @code{CONVFMT}), although
+at the moment there are no such features used by @file{texindex.awk}.
+
+We tested the program with five versions of @command{awk} (@command{gawk},
+@command{mawk}, Brian Kernighan's @command{awk}, @command{goawk},
+and Busybox @command{awk}) on a large index and got byte-identical
+results from all five.
+
@node High-level organization
-@chapter High-level organization
+@chapter High-level Organization
The general outline is as follows:
-@file_update_recipe
-@end file_update_recipe
-@file_update texindex.awk . ""
-
@(texindex.awk@) =
@<First line@>
@<GPL v3 copyright statement@>
@@ -258,24 +512,25 @@ The general outline is as follows:
@<Helper functions@>
BEGIN {
- @<Initial setup@>
- @<Argument processing@>
+ @<Initial setup@>
+ @<Argument processing@>
}
-@<@code{beginfile()} function@>
-@<@code{endfile()} function@>
+@<@code{beginfile()} work function@>
+@<@code{endfile()} work function@>
@<Process a record@>
@<Work functions@>
@
@menu
-* First line::
-* Initial setup::
-* Argument processing::
+* First line:: The first line in the file.
+* Initial setup:: Set up variables and constants used
+ throughout.
+* Argument processing:: Processing command line arguments.
@end menu
@node First line
-@section First line
+@section The Program's First Line
@cindex first line
@cindex @code{#!} header
@@ -286,18 +541,17 @@ output file name and how it got made. We do not use a @samp{#!} header
because, being a GNU program, we need to accept the @option{--help} and
@option{--version} options. This cannot be done with a standalone
@code{awk} script; we need a shell wrapper, and hence, the @code{awk}
-script itself need not be executable, and it's simpler not to worry
+script itself need not be executable. Also, it's simpler not to worry
about the location of the @code{awk} program.
-@<First line@> =
+@<First line@>=
# texindex.awk, generated by jrtangle from ti.twjr.
@
@node Initial setup
-@section Initial setup
+@section Initial Setup
@cindex initial setup
-
The initial setup sets up some constants, including the version of the
program. In the program itself, we follow a convenient convention:
global variable and array names start with a capital letter.
@@ -319,6 +573,8 @@ individual characters or if we have to do it manually.
@cindex @code{EXIT_FAILURE} constant
@cindex @code{Texindex_version} variable
@cindex @code{check_split_null()} function
+@cindex @code{Can_split_null} variable
+@cindex @code{Invocation_name} variable
@<Initial setup@>=
TRUE = 1
FALSE = 0
@@ -327,15 +583,15 @@ EXIT_FAILURE = 1
Texindex_version = "@VERSION@"
if (! Invocation_name) {
- # provide fallback in case it's not passed in.
- Invocation_name = "texindex"
+ # provide fallback in case it's not passed in.
+ Invocation_name = "texindex"
}
Can_split_null = check_split_null()
@
@node Argument processing
-@section Argument processing
+@section Command-line Argument Processing
@cindex argument processing
@@ -347,62 +603,58 @@ they're not treated as filenames. The options that print version or
help information automatically exit, so there's no need to mess with
@code{ARGV} in those cases.
-@cindex @code{-o} (@code{--output}) option, unimplemented
-The C implementation of @command{texindex} provided an option @code{-o}
-(@code{--output}) @var{file} to write the output to @var{file}. We've
-chosen to omit it from this incarnation of the program unless and until
-we receive information that it was ever useful.
-
@cindex @code{-h} (@code{--help}) option
@cindex @code{-k} (@code{--keep}), no-op option
@cindex @code{--} option
@cindex @code{--version} option
+@cindex @code{EXIT_SUCCESS} constant
+@cindex @code{EXIT_FAILURE} constant
+@cindex @code{fatal()} function
@<Argument processing@>=
for (i = 1; i < ARGC; i++) {
- if (ARGV[i] == "-h" || ARGV[i] == "--help") {
- usage(EXIT_SUCCESS)
- } else if (ARGV[i] == "--version") {
- version()
- } else if (ARGV[i] == "-k" || ARGV[i] == "--keep") {
- # do nothing, backwards compatibility
- delete ARGV[i]
- } else if (ARGV[i] == "--") {
- delete ARGV[i]
- break
- } else if (ARGV[i] ~ /^--?.+/) {
- fatal(_"%s: unrecognized option `%s'\n" \
- "Try `%s --help' for more information.\n",
- Invocation_name, ARGV[i], Invocation_name)
- exit EXIT_FAILURE
- } else {
- break
- }
+ if (ARGV[i] == "-h" || ARGV[i] == "--help") {
+ usage(EXIT_SUCCESS)
+ } else if (ARGV[i] == "--version") {
+ version()
+ } else if (ARGV[i] == "-k" || ARGV[i] == "--keep") {
+ # do nothing, backwards compatibility
+ delete ARGV[i]
+ } else if (ARGV[i] == "--") {
+ delete ARGV[i]
+ break
+ } else if (ARGV[i] ~ /^--?.+/) {
+ fatal(_"%s: unrecognized option `%s'\n" \
+ "Try `%s --help' for more information.\n",
+ Invocation_name, ARGV[i], Invocation_name)
+ # fatal() will do `exit EXIT_FAILURE'
+ } else {
+ break
+ }
}
@
@node Processing records
-@chapter Processing records
+@chapter Processing Records
Processing records includes setting things up for each input file,
pulling apart each record, sorting the data at the end, and writing out
the data properly.
@menu
-* Setup for each input file:: What happens at the start of each file.
-* Processing each record::
-* End-of-file sorting and printing::
+* Setup for each input file:: What happens at the start of each file.
+* Processing each record:: Pulling apart the fields and storing
+ data.
+* End-of-file sorting and printing:: Sorting the entries for each index.
+* Printing the data:: Printing the final results.
@end menu
@node Setup for each input file
-@section Setup for each input file
+@section Setup For Each Input File
At the beginning of each input file, the @code{beginfile()} function
-clears our variables from any previous processing (@code{Data},
-@code{Keys}, etc.)@: and sets up the output file name. We always append
-an @samp{s} to the name of the input file, which has become the standard
-convention. (As mentioned above, the @option{-o} option in the C
-implementation of @command{texindex} has been omitted here, until the
-need is seen.)
+clears our variables from any previous processing and sets up the
+output file name. We always append an @samp{s} to the name of the input
+file. This is the standard convention.
When @code{beginfile()} is called, the first record has already been
read, so it's possible to perform the checks for a Texinfo index file:
@@ -411,72 +663,73 @@ The first character must be either @samp{\} or @samp{@@}
@samp{entry}.
@cindex @code{Special_chars} variable
-@code{Special_chars} are the two characters that must be preceded by
-the command character inside the first key.
+@code{Special_chars} are the characters that must be preceded by
+the command character inside the first key. This includes the command
+character itself.
+
+Finally, several variables are set to regular expressions that
+match control sequences of interest.
+@cindex @code{fatal()} function
+@cindex @code{FALSE} constant
@cindex @code{beginfile()} function
@cindex @code{Output_file} variable
-@cindex @code{Data} array
-@cindex @code{Keys} array
-@cindex @code{Seen} array
-@cindex @code{Entries} variable
@cindex @code{Do_initials} variable
@cindex @code{Prev_initial} variable
-@cindex @code{del_array()} function
@cindex @code{Command_char} variable
@cindex @code{Special_chars} variable
-@<@code{beginfile()} function@>=
+@cindex @code{Entries} variable
+@<@code{beginfile()} work function@>=
function beginfile(filename)
{
- Output_file = filename "s"
-
- # Reinitialize these for each input file
- del_array(Data)
- del_array(Keys)
- del_array(Seen)
- Entries = 0
- Do_initials = FALSE
- Prev_initial = ""
-
- Command_char = substr($0, 1, 1)
- if ( (Command_char != "\\" && Command_char != "@") \
- || substr($0, 2, 5) != "entry")
- fatal(_"%s is not a Texinfo index file\n", filename)
-
- Special_chars = "{}"
+ Output_file = filename "s"
+
+ @<Clear out all data arrays@>
+ Entries = 0
+ Do_initials = FALSE
+ Prev_initial = ""
+
+ Command_char = substr($0, 1, 1)
+ if ((Command_char != "\\" && Command_char != "@") \
+ || substr($0, 2, 5) != "entry")
+ fatal(_"%s is not a Texinfo index file\n", filename)
+
+ Special_chars = "{}" Command_char
+
+ @<Set up control sequence regexps@>
}
@
@node Processing each record
-@section Processing each record
+@section Processing Each Record
Record processing consists of building the data structures for use in
sorting and printing once the whole file has been processed.
-@<Process a record@> =
+@<Process a record@>=
{
- @<Remove duplicates@>
- @<Remove leading @code{\entry}@>
- @<Get the initial@>
- @<Set up @code{fields} array with the data@>
- @<Name the fields@>
- @<Store the data for this line in the @code{Data} array@>
- @<Check for more than one initial@>
+ @<Remove duplicates@>
+ @<Remove leading @code{\entry} or @code{@@entry}@>
+ @<Get the initial@>
+ @<Set up @code{fields} array with the data@>
+ @<Name the fields@>
+ @<Store the data for this line in the various arrays@>
+ @<Check for more than one initial@>
}
@
@menu
-* Remove duplicates::
-* Remove leading @code{\entry}::
-* Get the initial::
-* Set up and name fields::
-* Store the data for this line::
-* Check for more than one initial::
-* Splitting the record::
+* Remove duplicates:: Removing duplicating entries.
+* Remove leading @code{\entry}:: Remove the leading @code{\entry} command.
+* Get the initial:: Get the initial for this entry.
+* Set up and name fields:: Pull apart the line.
+* Store the data for this line:: Store the data for later access.
+* Check for more than one initial:: See if there are multiple initials.
+* Splitting the record:: Split the record apart.
@end menu
@node Remove duplicates
-@subsection Remove duplicates
+@subsection Removing Duplicate Lines
@cindex removing duplicates
@cindex duplicates, removing
@@ -487,37 +740,47 @@ each incoming line as the index of an array named @code{Seen}. If a
line is not there, it has not been seen. Otherwise it has, and we move
on to the next record.
+@cindex @code{TRUE} constant
+@cindex @code{Seen} array
@<Remove duplicates@>=
# Remove duplicates, which can happen
if ($0 in Seen)
- next
+ next
Seen[$0] = TRUE
@
+We have to clear out the @code{Seen} array at the start of each input file.
+
+@cindex @code{del_array()} function
+@<Clear out all data arrays@>=
+# Reinitialize these for each input file
+del_array(Seen)
+@
+
@node Remove leading @code{\entry}
-@subsection Remove leading @code{\entry}
+@subsection Remove The Leading @code{\entry} Or @code{@@entry}
We use @code{substr()} here to avoid possible hassles with leading
backslashes in @code{sub()}.
-@<Remove leading @code{\entry}@>=
-$0 = substr($0, 7) # remove leading \entry
+@<Remove leading @code{\entry} or @code{@@entry}@>=
+$0 = substr($0, 7) # remove leading \entry or @entry
@
@node Get the initial
-@subsection Get the initial
+@subsection Get The Initial
@cindex @code{extract_initial()} function
@<Get the initial@>=
initial = extract_initial($0)
@
-The key argument here is the rest of the line after @samp{\entry},
-starting with an open brace.
+The sort key is the first part of the line after @samp{@@entry},
+starting with an open brace, and continuing to a matching close brace.
-The very first field character of the sort key can be an open brace.
+The very first character of the sort key can be an open brace.
If so, we extract the component of the sort key surrounded by balanced
-braces. We don't account for \@{ or \@} inside this component, as
+braces. We don't account for @samp{\@{} or @samp{\@}} inside this component, as
@file{texinfo.tex} isn't expected to produce such output.
An example can be seen in what older versions of @file{texinfo.tex}
@@ -525,62 +788,64 @@ generated if you needed to index a real backslash, namely an input line
something like the following:
@example
-\entry@{@{\tt \indexbackslash @} (backslash)@}@{14@}@{\code @{@{\tt @dots{}
+\entry@{@{\tt \indexbackslash @} (backslash)@}@{14@}@{\code @{@{\tt @dots{}@}@}
@end example
-Earlier versions of @command{texindex} took the the first non-brace
+Earlier versions of @command{texindex} took the first non-brace
character as the initial, in this example @samp{\}, and output it as
@samp{\\}; this was not, however, a control sequence recognized by the
older versions of @file{texinfo.tex}.
@cindex @code{extract_initial()} function
@cindex @code{char_split()} function
+@cindex @code{fatal()} function
@<Work functions@>=
function extract_initial(key, initial, nextchar, i, l, kchars)
{
- l = char_split(key, kchars)
- if (l >= 3 && kchars[2] == "{") {
- bracecount = 1
- i = 3
- while (bracecount > 0 && i <= l) {
- if (kchars[i] == "{")
- bracecount++
- else if (kchars[i] == "}")
- bracecount--
- i++
- }
- if (i > l)
- fatal(_"%s:%d: Bad key %s in record\n", FILENAME, FNR, key)
- initial = substr(key, 2, i - 2)
- } else if (kchars[2] == Command_char) {
- nextchar = kchars[3]
- if (initial == Command_char && (nextchar == "{" || nextchar == "}"))
- initial = substr(key, 2, 3)
- else {
- initial = toupper(nextchar)
- }
- } else {
- initial = toupper(kchars[2])
- }
-
- return initial
+ l = char_split(key, kchars)
+ if (l >= 3 && kchars[2] == "{") {
+ bracecount = 1
+ i = 3
+ while (bracecount > 0 && i <= l) {
+ if (kchars[i] == "{")
+ bracecount++
+ else if (kchars[i] == "}")
+ bracecount--
+ i++
+ }
+ if (i > l)
+ fatal(_"%s:%d: Bad key %s in record\n", FILENAME, FNR, key)
+ initial = substr(key, 2, i - 2)
+ } else if (kchars[2] == Command_char) {
+ nextchar = kchars[3]
+ if (initial == Command_char && index("{}", nextchar) > 0)
+ initial = substr(key, 2, 3)
+ else {
+ initial = toupper(nextchar)
+ }
+ } else {
+ initial = toupper(kchars[2])
+ }
+
+ return initial
}
@
@node Set up and name fields
-@subsection Set up and name fields
+@subsection Set Up And Name The Fields
-The next part is to pull out the data of interest from the three sets of
+The next step is to pull out the data of interest from the multiple sets of
braces. This is delegated to a function named @code{field_split()}.
-There must be exactly three fields.
+There must be at least three fields, and there can be up to five.
+@cindex @code{fatal()} function
@cindex @code{field_split()} function
@cindex @code{fields} array, setting up
@<Set up @code{fields} array with the data@>=
numfields = field_split($0, fields, "{", "}", Command_char)
-if (numfields != 3)
- fatal(_"%s:%d: Bad entry; expected three fields, not %d\n",
- FILENAME, FNR, numfields)
+if (numfields < 3 || numfields > 5)
+ fatal(_"%s:%d: Bad entry; expected 3 to 5 fields, not %d\n",
+ FILENAME, FNR, numfields)
@
We give the fields names for later use.
@@ -588,56 +853,207 @@ We give the fields names for later use.
@<Name the fields@>=
key = fields[1]
pagenum = fields[2]
-text = fields[3]
+primary_text = fields[3]
+secondary_text = (numfields > 3 ? fields[4] : "")
+tertiary_text = (numfields > 4 ? fields[5] : "")
@
@node Store the data for this line
-@subsection Store the data for this line
+@subsection Store The Data For This Line
@cindex storing data
-@cindex @code{Data} array
-We use a traditional @command{awk} multidimensional array, @code{Data}.
+We use multiple arrays to store different parts of the data.
The sort key from the input is invariant across entries, so we use that
-as the basis for the keys in the @code{Data} array.
-The @code{Data} values are the the output @code{"text"}, the
-@code{"pagenum"} list, and the @code{"initial"}.
+as the index in the various arrays.
+We need the following arrays:
+
+@table @code
+@item Numfields
+How many fields (entries) in this line: one, two, or three.
+
+@item Initials
+The initial for this line.
+
+@item Primary
+The primary index text. This is the real text, not the stripped
+value appearing in the sort key.
+
+@item Secondary
+The secondary index text, if present.
+
+@item Tertiary
+The tertiary index text, if present.
+
+@item Pagedata
+The page numbers on which identical entries occur.
+
+@item See_count
+The number of ``see'' entries for a given
+index line. Nothing prevents there being multiple such:
+
+@cindex toast @seeentry{toaster}
+@cindex toast @seeentry{jam}
+@example
+@@cindex toast @@seeentry@{toaster@}
+@@cindex toast @@seeentry@{jam@}
+@end example
+
+@noindent
+So we have to be prepared to handle such input.
+The @code{See_count} array counts the number of such
+texts as there may be.
+
+@item See
+The actual texts of the @samp{@@seeentry} value for
+the line's sort key. Each entry goes into
+@code{See[key, 1]}, @code{See[key, 2]}, etc., up to
+@code{See_count[key]}.
+
+@item Seealso_count
+@itemx Seealso
+These serve the same purpose as @code{See_count} and @code{See},
+but for @code{@@seealso} entries.
+@end table
In the event that a particular key has more than one associated output
text, we'll keep the first and ignore the remainder (this is the same
-behavior as the C implementation). @xref{Requirements}.
+behavior as the C implementation). @xref{Assumptions}.
For page numbers, we merely append the page number field from the input,
preceded by a comma and space, unless that page number was already the
last that's been stored. (We're assuming the page numbers don't jump
around, which, in fact, they don't, so we don't need a more complex
-approach.)
+approach.) This also handles any page numbers that appear as roman
+numerals (from the so-called front matter), should there be such.
+
+In addition to all the previously described arrays, the key is stored in
+the @code{Keys} array the first time it is seen; this array is sorted
+later on. Its indices are just incremented integers, stored in the
+global @code{Entries} variable. The @code{Allkeys} associative array
+lets us easily track if we have seen a key before.
@cindex @code{Keys} array
+@cindex @code{Allkeys} array
@cindex @code{Entries} variable
-In addition to all this updating of the @code{Data} array, the key is
-stored in the @code{Keys} array the first time it is seen; this array
-is sorted later on. For now, its indices are just incremented integers,
-stored in the global @code{Entries} variable.
-
-@<Store the data for this line in the @code{Data} array@>=
-if (! ((key, "text") in Data)) {
- # first time we've seen this full line
- Keys[++Entries] = key
- Data[key, "text"] = text
- Data[key, "pagenum"] = pagenum
- Data[key, "initial"] = initial
-} else
- # seen this key before; add the current pagenum
- # unless we've already seen that too.
- if ( Data[key, "pagenum"] != pagenum \
- && Data[key, "pagenum"] !~ (", " pagenum "$")) {
- Data[key, "pagenum"] = Data[key, "pagenum"] ", " pagenum
- }
+@cindex @code{Seeentry_re} variable
+@cindex @code{Seealso_re} variable
+@cindex @code{Primary} array
+@cindex @code{Secondary} array
+@cindex @code{Tertiary} array
+@cindex @code{Numfields} array
+@cindex @code{See} array
+@cindex @code{See_count} array
+@cindex @code{Seealso} array
+@cindex @code{Seealso_count} array
+@cindex @code{Pagedata} array
+@cindex @code{escape()} function
+@<Store the data for this line in the various arrays@>=
+if (! (key in Allkeys)) {
+ # first time we've seen this full line
+ Keys[++Entries] = key
+ Allkeys[key] = key
+ Initials[key] = initial
+ Numfields[key] = numfields - 2 # don't count sortkey, page number
+ Primary[key] = primary_text
+ if (secondary_text)
+ Secondary[key] = secondary_text
+ if (tertiary_text)
+ Tertiary[key] = tertiary_text
+ @<Split out and store the subparts of the sort key@>
+
+ if (pagenum ~ Seeentry_re) {
+ See_count[key]++
+ See[key, See_count[key]] = pagenum
+ } else if (pagenum ~ Seealso_re) {
+ Seealso_count[key]++
+ Seealso[key, Seealso_count[key]] = pagenum
+ } else
+ Pagedata[key] = pagenum
+} else {
+ # We've seen this key before:
+ # Add to see or see also, or else add to list of pages.
+ # In the latter case, make sure we've not seen this
+ # page number before. (Shouldn't happen based on the
+ # earlier removal of exact duplicates, but we could have
+ # an identical key with different formatting of actual text.
+
+ if (pagenum ~ Seeentry_re) {
+ See_count[key]++
+ See[key, See_count[key]] = pagenum
+ } else if (pagenum ~ Seealso_re) {
+ Seealso_count[key]++
+ Seealso[key, Seealso_count[key]] = pagenum
+ } else if (! (key in Pagedata)) {
+ Pagedata[key] = pagenum
+ } else if (Pagedata[key] != pagenum \
+ && Pagedata[key] !~ escape(", " pagenum "$")) {
+ Pagedata[key] = Pagedata[key] ", " pagenum
+ }
+}
+@
+
+We split the key into subparts, using the @samp{@@subentry} as
+the separator. The subparts are stored in the @code{Subkeys} array.
+
+@cindex @code{Subkeys} array
+@<Split out and store the subparts of the sort key@>=
+n = split(key, subparts, Subentry_re)
+for (i = 1; i <= n; i++)
+ Subkeys[key, i] = subparts[i]
+@
+
+The @code{Seeentry_re}, @code{Seealso_re} and @code{Subentry_re}
+variables are regular expressions that match the corresponding @TeX{}
+control sequences. They're initialized once for each input file, since
+the command character might be different between files.
+The @code{make_regexp()} function is described in @ref{make_regexp}.
+
+@cindex @code{Seeentry_re} variable
+@cindex @code{Seealso_re} variable
+@cindex @code{Subentry_re} variable
+@cindex @code{make_regexp()} function
+@<Set up control sequence regexps@>=
+Seeentry_re = make_regexp("%seeentry")
+Seealso_re = make_regexp("%seealso")
+Subentry_re = make_regexp(" *%subentry +")
+@
+
+Here too, we have to clear out the arrays we've used at the start of
+each input file.
+
+@cindex @code{Keys} array
+@cindex @code{Subkeys} array
+@cindex @code{Allkeys} array
+@cindex @code{Initials} array
+@cindex @code{Numfields} array
+@cindex @code{Primary} array
+@cindex @code{Secondary} array
+@cindex @code{Tertiary} array
+@cindex @code{See} array
+@cindex @code{See_count} array
+@cindex @code{Seealso} array
+@cindex @code{Seealso_count} array
+@cindex @code{Pagedata} array
+@cindex @code{del_array()} function
+@<Clear out all data arrays@>=
+del_array(Keys)
+del_array(Allkeys)
+del_array(Subkeys)
+del_array(Initials)
+del_array(Numfields)
+del_array(Primary)
+del_array(Secondary)
+del_array(Tertiary)
+del_array(See)
+del_array(See_count)
+del_array(Seealso)
+del_array(Seealso_count)
+del_array(Pagedata)
@
@node Check for more than one initial
-@subsection Check for more than one initial
+@subsection Check For More Than One Initial
@cindex initial, checking for more than one
@@ -645,25 +1061,26 @@ Finally, we need to determine if more than one initial occurs in the
input. If so, we set @code{Do_initials} to true. As soon as it's true,
we don't need to do further checking on subsequent lines.
+@cindex @code{TRUE} constant
@cindex @code{Do_initials} variable
@cindex @code{Prev_initial} variable
-@<Check for more than one initial@> =
+@<Check for more than one initial@>=
if (! Do_initials) {
- if (Prev_initial == "")
- Prev_initial = initial
- else if (initial != Prev_initial)
- Do_initials = TRUE
+ if (Prev_initial == "")
+ Prev_initial = initial
+ else if (initial != Prev_initial)
+ Do_initials = TRUE
}
@
@node Splitting the record
-@subsection Splitting the record: @code{field_split}
+@subsection Splitting The Record: @code{field_split()}
Let's take a look at the function that breaks apart the record. Upon
entry to the function, the value of @code{record} looks something like:
@example
-@{POSIX awk@}@{5@}@{POSIX \command @{awk@}@}
+@{POSIX awk@}@{5@}@{POSIX @@command @{awk@}@}
@end example
The first field may have instances of @samp{@@@{} and/or @samp{@@@}} (or
@@ -671,57 +1088,62 @@ The first field may have instances of @samp{@@@{} and/or @samp{@@@}} (or
balanced.
The @code{field_split()} function uses fairly straightforward ``count
-the delimiters'' code. The loop starts at 2, since we know the first
+the delimiters'' code. The loop starts at two, since we know the first
character is an open brace. The main things to handle are the command
-character and the final closing brace. The third field is taken as a
-whole; this is described shortly.
+character and the final closing brace.
@cindex @code{field_split()} function
@cindex @code{char_split()} function
@<Work functions@>=
function field_split( \
- record, fields, start, end, com_ch, # parameters
- chars, numchars, out, delim_count, i, j, k) # locals
+ record, fields, start, end, com_ch, # parameters
+ chars, numchars, out, delim_count, i, j, k) # locals
{
- del_array(fields)
-
- numchars = char_split(record, chars)
- j = 1 # index into fields
- k = 1 # index into out
- delim_count = 1
- for (i = 2; i <= numchars; i++) {
- if (chars[i] == com_ch) {
- @<Handle the character after the command character@>
- } else if (chars[i] == start) {
- delim_count++
- out[k++] = chars[i]
- } else if (chars[i] == end) {
- delim_count--
-
- if (delim_count == 0) {
- @<Finish off the field, set up for next field@>
- } else
- out[k++] = chars[i]
- } else
- out[k++] = chars[i]
-
- @<Take the third field as a whole@>
- }
-
- return j # num fields
+ del_array(fields)
+
+ numchars = char_split(record, chars)
+ j = 1 # index into fields
+ k = 1 # index into out
+ delim_count = 1
+ for (i = 2; i <= numchars; i++) {
+ if (chars[i] == com_ch) {
+ @<Handle the character after the command character@>
+ } else if (chars[i] == start) {
+ delim_count++
+ out[k++] = chars[i]
+ } else if (chars[i] == end) {
+ delim_count--
+
+ if (delim_count == 0) {
+ @<Finish off the field, set up for next field@>
+ } else
+ out[k++] = chars[i]
+ } else
+ out[k++] = chars[i]
+ }
+
+ return j - 1 # num fields
}
@
-If the character following the command character is an open brace, close
-brace, or the command character itself, we pull it in. Otherwise, the
+If the command character is doubled, we pass that on through, so that
+@TeX{} will process it correctly.
+If the character following the command character is an open brace or close
+brace, we pull it in. Otherwise, the
command character is left alone as part of the field.
+@cindex @code{Command_char} variable
+@cindex @code{Special_chars} variable
@<Handle the character after the command character@>=
-if (index(Special_chars, chars[i+1]) != 0) {
- out[k++] = chars[i+1]
- i++
+if (chars[i+1] == Command_char) { # input was @@
+ out[k++] = chars[i+1]
+ out[k++] = chars[i+1]
+ i++
+} else if (index(Special_chars, chars[i+1]) != 0) {
+ out[k++] = chars[i+1]
+ i++
} else
- out[k++] = chars[i]
+ out[k++] = chars[i]
@
Upon seeing the final closing brace, we put all the characters back
@@ -731,6 +1153,8 @@ an open brace, then the line is bad and we print a fatal error.
Otherwise, we reset @code{delim_count} to one.
@cindex @code{join()} function
+@cindex @code{del_array()} function
+@cindex @code{fatal()} function
@<Finish off the field, set up for next field@>=
fields[j++] = join(out, 1, k-1, SUBSEP)
del_array(out) # reset for next time through
@@ -738,27 +1162,14 @@ k = 1
i++
if (i <= numchars && chars[i] != start)
- fatal(_"%s:%d: Bad entry; expected %s at column %d\n",
- FILENAME, FNR, start, i)
+ fatal(_"%s:%d: Bad entry; expected %s at column %d\n",
+ FILENAME, FNR, start, i)
delim_count = 1
@
-The third field is the printable version, and may have unbalanced braces
-or other oddities. We just take the whole thing as is. This is done by
-stripping off the outermost braces, using @code{substr()}. We then
-break out of the loop, since we're done.
-
-@<Take the third field as a whole@>=
-if (j == 3) { # Per Karl, just grab the whole rest of the line
- # extract everything between the outer delimiters
- fields[3] = substr(record, i + 1, numchars - i - 1)
- break
-}
-@
-
@node End-of-file sorting and printing
-@section End-of-file sorting and printing
+@section End-of-file Sorting And Printing
Upon end of input, the processing is straightforward: sort the entries
and write them out. Additionally, if we are printing the initial,
@@ -766,69 +1177,71 @@ handle that. (That printing task is delegated to a small function.)
@cindex @code{endfile()} function
@cindex @code{quicksort()} function
+@cindex @code{write_index_entry()} function
@cindex @code{Entries} variable
@cindex @code{Keys} array
-@cindex @code{Data} array
+@cindex @code{Initials} array
@cindex @code{print_initial()} function
@cindex @code{Output_file} variable
-@<@code{endfile()} function@>=
-function endfile(filename, i, prev_initial, initial)
+@<@code{endfile()} work function@>=
+function endfile(filename, i, prev_initial, initial)
{
- # sort the entries
- quicksort(Keys, 1, Entries)
-
- for (i = 1; i <= Entries; i++) {
- # deal with initial
- initial = Data[Keys[i], "initial"]
- if (initial != prev_initial) {
- prev_initial = initial
- print_initial(initial)
- }
-
- # write the actual line \entry {...}{...}
- printf("%centry {%s}{%s}\n",
- Command_char,
- Data[Keys[i], "text"],
- Data[Keys[i], "pagenum"]) > Output_file
- }
- close(Output_file)
+ # sort the entries
+ quicksort(Keys, 1, Entries, "index")
+
+ prev_initial = ""
+ for (i = 1; i <= Entries; i++) {
+ # deal with initial
+ initial = Initials[Keys[i]]
+ if (initial != prev_initial) {
+ prev_initial = initial
+ print_initial(initial)
+ }
+
+ write_index_entry(i)
+ }
+ close(Output_file)
}
@
-Printing the initial is not complicated. The main thing is to precede
+Printing an initial is not complicated. The main thing is to precede
special characters with the command character.
@cindex @code{Command_char} variable
@cindex @code{Special_chars} variable
@cindex @code{Do_initials} variable
@cindex @code{print_initial()} function
+@cindex @code{Output_file} variable
@<Work functions@>=
function print_initial(initial)
{
- if (Do_initials) {
- if (index(Special_chars, initial) != 0)
- initial = Command_char initial
- printf("%cinitial {%s}\n",
- Command_char, initial) > Output_file
- }
+ if (! Do_initials)
+ return
+
+ if (index(Special_chars, initial) != 0)
+ initial = Command_char initial
+ printf("%cinitial {%s}\n",
+ Command_char, initial) > Output_file
}
@
@menu
* Quicksort:: Sorting our input.
+* Multilevel comparisons:: Handling multilevel entries.
* Comparing index entries:: The heart of the sorting algorithm.
@end menu
@node Quicksort
@subsection Quicksort
-@cindex quicksort
+@cindex quicksort algorithm
@cindex Hoare, C.A.R.
-Sorting uses a standard quicksort algorithm, with a @code{less_than()}
-function (defined in the next function) supplying the comparison.
+Sorting uses a standard quicksort algorithm. It turns out we need to
+sort both multilevel index entries, and regular text. To that end
+the @code{compare} variable indicates which way to do the ``less
+than'' comparison.
-@cindex @code{less_than()} function
@cindex @code{quicksort()} function
@cindex @code{quicksort_swap()} function
@<Helper functions@>=
@@ -836,35 +1249,126 @@ function (defined in the next function) supplying the comparison.
# or almost any algorithms or computer science text
# Adapted from K&R-II, page 110
#
-function quicksort(data, left, right, i, last)
+function quicksort(data, left, right, compare, # parameters
+ i, last, use_index, lt) # locals
{
- if (left >= right) # do nothing if array contains fewer
- return # than two elements
-
- quicksort_swap(data, left, int((left + right) / 2))
- last = left
- for (i = left + 1; i <= right; i++)
- if (less_than(data[i], data[left]))
- quicksort_swap(data, ++last, i)
- quicksort_swap(data, left, last)
- quicksort(data, left, last - 1)
- quicksort(data, last + 1, right)
+ if (left >= right) # do nothing if array contains fewer
+ return # than two elements
+
+ @<Set compare mechanism@>
+
+ quicksort_swap(data, left, int((left + right) / 2))
+ last = left
+ for (i = left + 1; i <= right; i++) {
+ @<Do ``less than'' comparison@>
+ if (lt)
+ quicksort_swap(data, ++last, i)
+ }
+ quicksort_swap(data, left, last)
+ quicksort(data, left, last - 1, compare)
+ quicksort(data, last + 1, right, compare)
}
# quicksort_swap --- quicksort helper function, could be inline
#
function quicksort_swap(data, i, j, temp)
{
- temp = data[i]
- data[i] = data[j]
- data[j] = temp
+ temp = data[i]
+ data[i] = data[j]
+ data[j] = temp
+}
+@
+
+We set a Boolean (numeric) variable to indicate what kind of
+comparison to do, avoiding repeating the string
+comparison whose result won't change upon each iteration.
+
+@<Set compare mechanism@>=
+use_index = (compare == "index")
+@
+
+The @code{less_than()} function supplies the comparison for index entries
+(@pxref{Multilevel comparisons}, and @pxref{Comparing index entries}).
+The @code{key_compare()} function is used for string comparisons.
+
+@cindex @code{less_than()} function
+@cindex @code{key_compare()} function
+@<Do ``less than'' comparison@>=
+lt = (use_index \
+ ? less_than(data, i, left) \
+ : key_compare(data[i], data[left]) < 0)
+@
+
+@node Multilevel comparisons
+@subsection Handling Multilevel Entries
+
+The @code{less_than()} function has to take into account
+that we are comparing multilevel index entries. We can't just
+compare the full sort key, since the @samp{@@subentry} throws off
+the comparison; we want to compare based only on the key texts
+themselves.
+
+To that end, the comparison happens on two levels. At the higher
+level, we compare the subkeys; if the first subkeys are equal
+then we differentiate between them based on the second subkey.
+If, in turn, the second ones are equal, we differentiate based
+on the third one.
+
+By definition, an index entry with only one subkey sorts to be before
+an entry with two, and one with two comes before one with three.
+
+The underlying @code{key_compare()} function, which does the hard
+work of comparison, returns a three-way value a la the C @code{strcmp()}
+function: less than zero if the first string is less than the second,
+zero if they're equal, or greater than zero if the first string is
+greater than the second one.
+
+We make an effort here to call the comparison function only as
+much as necessary, since it's a relatively expensive operation.
+
+@cindex @code{less_than()} function
+@cindex @code{key_compare()} function
+@cindex @code{Numfields} array
+@cindex @code{Subkeys} array
+@<Work functions@>=
+function less_than(data, l, r, left, right, nfields, cmp1, cmp2)
+{
+ left = data[l]
+ right = data[r]
+
+ left_fields = Numfields[left]
+ right_fields = Numfields[right]
+
+ nfields = min(left_fields, right_fields)
+
+ # At least one field, always check the first subkey
+ cmp1 = key_compare(Subkeys[left, 1], Subkeys[right, 1])
+ if (cmp1 != 0)
+ return cmp1 < 0
+
+ # cmp1 == 0: one side has 1 field, other side has 1 to 3 fields
+ if (nfields == 1)
+ return left_fields < right_fields
+
+ # At least two fields, check second subkey
+ cmp2 = key_compare(Subkeys[left, 2], Subkeys[right, 2])
+ if (cmp2 != 0)
+ return cmp2 < 0
+
+ # cmp1 == 0, cmp2 == 0, one side has 2 fields,
+ # other has 2 to 3 fields
+ if (nfields == 2)
+ return left_fields < right_fields
+
+ # Three fields
+ return key_compare(Subkeys[left, 3], Subkeys[right, 3]) < 0
}
@
@node Comparing index entries
-@subsection Comparing index entries
+@subsection Comparing Index Entries
-The comparison function is the heart of the sorting algorithm. The
+The sort key comparison function is the heart of the sorting algorithm. The
comparison is based on the indexing rules, which are:
@itemize @bullet
@@ -885,49 +1389,54 @@ following code is based on the original C @command{texindex}, although
the actual comparison algorithm is more sophisticated.
We set up an @code{Ordval} array to map characters to numeric values.
-Most characters map to their ASCII code. We add 512 to the value of
-each of the digits. Both uppercase and lowercase letters map to the
-same numeric value, which is the ASCII code for the uppercase letter
-plus 512. (This code should also work for EBCDIC systems,
-although @TeX{} does everything in ASCII, so it's not likely to make a
-difference.)
+Most characters map to their ASCII code. We add 512 to the value of each
+of the digits; this causes them to come after all symbols.
+
+The letters are handled a little differently. We set things up so that
+lowercase letters come before uppercase ones, but both ``a'' and
+``A'' come before ``b'', and so on. This then lets us use
+a simple subtraction in the comparison to determine if two letters are
+less than, equal to, or greater than each other. In any case, the mapping
+also ensures that letters come after digits.
+(This code should also work for EBCDIC systems, although @TeX{} does
+everything in ASCII, so it's not likely to make a difference.)
The table must be built completely before changing the mapping of the
letters, because all of the uppercase and lowercase letters must be in
the table before we can change their values.
@cindex @code{Ordval} array
+@cindex @code{isdigit()} function
+@cindex @code{isupper()} function
@<Work functions@>=
BEGIN {
- for (i = 0; i < 256; i++) {
- c = sprintf("%c", i)
- Ordval[c] = i # map character to value
-
- if ((n = isdigit(c)) > 0) {
- Ordval[c] += 512
- }
- }
-
- # Give both 'A' and 'a' the same code
- i = Ordval["A"]
- j = Ordval["Z"]
- for (; i <= j; i++) {
- c = sprintf("%c", i)
-
- # In ASCII, 'A' is before 'a', so this is
- # the right order to check
- #
- # Checking isupper() lets this work for EBCDIC, too.
- if (isupper(c)) {
- Ordval[c] += 512
- Ordval[tolower(c)] = Ordval[c]
- }
- }
+ for (i = 0; i < 256; i++) {
+ c = sprintf("%c", i)
+ Ordval[c] = i # map character to value
+
+ if (isdigit(c))
+ Ordval[c] += 512
+ }
+
+ # Set things up such that 'a' < 'A' < 'b' < 'B' < ...
+ i = Ordval["a"]
+ j = Ordval["z"]
+ newval = i + 512
+ for (; i <= j; i++) {
+ c = sprintf("%c", i)
+
+ if (islower(c)) {
+ Ordval[c] = newval++
+ Ordval[toupper(c)] = newval++
+ }
+ }
}
@
-Here is the @code{less_than()} function. It returns true if the
-@code{left} string is ``less than'' the @code{right} string.
+Here is the @code{key_compare()} function. It returns less than zero if the
+@code{left} string is ``less than'' the @code{right} string, zero if they are
+equal, and greater than zero if the @code{left} string is ``greater than'' the
+@code{right} string.
The comparison algorithm is not too complicated, once we define how
things should work. We loop over each pair of characters in the
@@ -941,12 +1450,8 @@ three subcases, as follows:
@c nested table
@table @i
@item Same letter, but different case
-This is the complicated case. First, we want lowercase letters to be
-ordered before uppercase ones, even though this is the opposite of the
-natural ASCII ordering. To make this happen, we use a @samp{>}
-comparison instead of a @samp{<} comparison.
-
-Second, when two characters are equal, we have to look ahead at the next
+This is the slightly complicated case.
+When two characters are equal, we have to look ahead at the next
characters to decide whether to continue the loop or quit. As long as
we are not at the end of the string, and at least one of the following
characters in either string is a letter, we continue the loop.
@@ -964,7 +1469,8 @@ Use the comparison of the respective @code{Ordval} values.
@end table
-@noindent When the values are equal, continue around the loop. And, as
+@noindent
+When the values are equal, continue around the loop. And, as
usual, if one string is an initial substring of the other, that one is
considered to be ``less than'' the other one.
@@ -975,78 +1481,394 @@ opposite order.
@cindex @code{Ordval} array
@cindex @code{char_split()} function
-@cindex @code{less_than()} function
+@cindex @code{key_compare()} function
@cindex @code{isalpha()} function
@<Work functions@>=
-function less_than(left, right, len_l, len_r, len, chars_l, chars_r)
+function key_compare(left, right, len_l, len_r, len, chars_l, chars_r)
{
- len_l = length(left)
- len_r = length(right)
- len = (len_l < len_r ? len_l : len_r)
-
- char_split(left, chars_l)
- char_split(right, chars_r)
-
- for (i = 1; i <= len; i++) {
- if (isalpha(chars_l[i]) && isalpha(chars_r[i])) {
- # same char different case
- # upper case comes out last
- if (chars_l[i] != chars_r[i] &&
- tolower(chars_l[i]) == tolower(chars_r[i])) {
- if ( i != len \
- && (isalpha(chars_l[i+1]) \
- || isalpha(chars_r[i+1])))
- continue
- if (chars_l[i] > chars_r[i])
- return 1
- return 0
- }
- # same case, different char,
- # or different case, different char:
- # letter order wins
- if (Ordval[chars_l[i]] < Ordval[chars_r[i]])
- return 1
-
- if (Ordval[chars_l[i]] > Ordval[chars_r[i]])
- return 0
-
- # equal, keep going
- continue
- }
-
- # letter and something else, or two non-letters
- # letter order wins
- if (Ordval[chars_l[i]] < Ordval[chars_r[i]])
- return 1
-
- if (Ordval[chars_l[i]] > Ordval[chars_r[i]])
- return 0
-
- # equal, keep going
- }
-
- # equal so far, shorter one wins
- if (len_l < len_r)
- return 1
-
- return 0
+ len_l = length(left)
+ len_r = length(right)
+ len = (len_l < len_r ? len_l : len_r)
+
+ char_split(left, chars_l)
+ char_split(right, chars_r)
+
+ for (i = 1; i <= len; i++) {
+ if (isalpha(chars_l[i]) && isalpha(chars_r[i])) {
+ # same char different case
+ # upper case comes out last
+ if (chars_l[i] != chars_r[i] &&
+ tolower(chars_l[i]) == tolower(chars_r[i])) {
+ if (i != len \
+ && (isalpha(chars_l[i+1]) || isalpha(chars_r[i+1])))
+ continue
+
+ # negative, zero, or positive
+ return Ordval[chars_l[i]] - Ordval[chars_r[i]]
+ }
+ # same case, different char,
+ # or different case, different char:
+ # letter order wins
+ if (Ordval[chars_l[i]] < Ordval[chars_r[i]])
+ return -1
+
+ if (Ordval[chars_l[i]] > Ordval[chars_r[i]])
+ return 1
+
+ # equal, keep going
+ continue
+ }
+
+ # letter and something else, or two non-letters
+ # letter order wins
+ if (Ordval[chars_l[i]] < Ordval[chars_r[i]])
+ return -1
+
+ if (Ordval[chars_l[i]] > Ordval[chars_r[i]])
+ return 1
+
+ # equal, keep going
+ }
+
+ # equal so far, shorter one wins
+ if (len_l < len_r)
+ return -1
+
+ if (len_l > len_r)
+ return 1
+
+ return 0
}
@
+@node Printing the data
+@section Printing The Final Results
+
+Printing an index entry is where all the data we collected
+gets used. Much of the complexity is here, since we have to
+output up to three lines per entry.
+
+@menu
+* printing top level:: Top level logic.
+* printing a single entry:: Handling a single entry.
+@end menu
+
+@node printing top level
+@subsection Top Level Logic For Printing An Entry
+
+So, let's start. The logic is going to be a little complicated:
+
+@cindex @code{write_index_entry()} function
+@cindex @code{Keys} array
+@cindex @code{Numfields} array
+@<Print index entry@>=
+function write_index_entry(current, key)
+{
+ key = Keys[current] # current sort key
+ if (Numfields[key] == 1) {
+ @<Print primary entry@>
+ } else if (Numfields[key] == 2) {
+ @<Print primary entry if necessary@>
+ @<Print secondary entry@>
+ } else if (Numfields[key] == 3) {
+ @<Print primary entry if necessary@>
+ @<Print secondary entry if necessary@>
+ @<Print tertiary entry@>
+ }
+}
+@
+
+Consider the three-level case, for an entry like:
+
+@example
+@@cindex coffee makers @@subentry electric @@subentry blue
+@end example
+
+@noindent
+There may not have been separate preceding entries like @samp{@@cindex
+coffee makers} or @samp{@@cindex coffee makers @@subentry electric}. Thus,
+we have to generate the preceding @code{@@entry} and @code{@@secondary}
+lines before generating the final @code{@@tertiary} line.
+
+Printing the entries is similar no matter what kind of entry; there's
+a lot of work to be done so it's isolated in the @code{print_entry()}
+function described in the next section.
+
+@cindex @code{print_entry()} function
+@<Print primary entry@>=
+print_entry(key, "entry", Primary)
+@
+
+@cindex @code{print_entry()} function
+@<Print secondary entry@>=
+print_entry(key, "secondary", Secondary)
+@
+
+@cindex @code{print_entry()} function
+@<Print tertiary entry@>=
+print_entry(key, "tertiary", Tertiary)
+@
+
+@node printing a single entry
+@subsection Printing A Single Entry
+
+Printing a single entry is quite involved:
+
+@cindex @code{print_entry()} function
+@cindex @code{print_see_entry()} function
+@cindex @code{See} array
+@cindex @code{See_count} array
+@cindex @code{Seealso} array
+@cindex @code{Seealso_count} array
+@cindex @code{Pagedata} array
+@cindex @code{Printed} array
+@cindex @code{Output_file} variable
+@<Print an entry@>=
+function print_entry(key, entry_command, entry_text,
+ @<Local variables for ``see also'' printing@>)
+{
+ if ((key, 1) in See) # at least one ``see''
+ print_see_entry(key, entry_command, entry_text,
+ See_count, See)
+
+ if (key in Pagedata) { # at least one page number
+ @<Check for ``see also'', add to @code{Pagedata}@>
+
+ printf("%c%s{%s}{%s}\n",
+ Command_char, entry_command,
+ entry_text[key], Pagedata[key]) > Output_file
+
+ Printed[key] = True # mark this key as printed
+ } else if ((key, 1) in Seealso) { # at least one ``see also''
+ # Only ``see also'' entry, print it
+ @<Prepare and sort ``see also'' entries into @code{see_entries}@>
+
+ printf("%c%s{%s}{",
+ Command_char, entry_command,
+ entry_text[key]) > Output_file
+
+ # now add them to the page data
+ for (i = 1; i <= count; i++) {
+ printf("%s", see_entries[i]) > Output_file
+ if (i != count)
+ printf(", ") > Output_file
+ }
+ printf("}\n") > Output_file
+ }
+}
+@
+
+Note that we only take note of having printed the key
+for lines with page numbers. Otherwise, a ``see'' entry followed
+by a regular multilevel entry is not handled correctly.
+
+When there exist both regular index entries for a topic and
+also a ``see also'' entry, we place the ``see also'' text
+after all the page numbers, so that there is only one printed
+index entry for the topic.
+
+This ends up being involved, since potentially there could be
+multiple ``see also'' entries (even though this is bad form).
+
+@<Check for ``see also'', add to @code{Pagedata}@>=
+if ((key, 1) in Seealso) {
+ @<Prepare and sort ``see also'' entries into @code{see_entries}@>
+
+ # now add them to the page data
+ for (i = 1; i <= count; i++)
+ Pagedata[key] = Pagedata[key] ", " see_entries[i]
+}
+@
+
+@<Local variables for ``see also'' printing@>=
+count, see_entries, i
+@
+
+Although it's bad practice, there could be multiple
+``see also'' entries for a given key. In that case, we
+must sort them before using them.
+
+@<Prepare and sort ``see also'' entries into @code{see_entries}@>=
+count = Seealso_count[key]
+
+# Copy the entries to a separate array
+for (i = 1; i <= count; i++)
+ see_entries[i] = Seealso[key, i]
+
+# sort them
+quicksort(see_entries, 1, count, "string")
+@
+
+Be sure to empty out @code{Printed} at the start of each file.
+
+@cindex @code{Printed} array
+@cindex @code{del_array()} function
+@<Clear out all data arrays@>=
+del_array(Printed)
+@
+
+And add our function to the group of work functions.
+
+@<Work functions@>=
+@<Print an entry@>
+@
+
+Printing ``see'' entries is potentially messy if there
+are more than one. (A good index won't have more than one, but nothing
+prevents there being multiple such entries, so we have to handle them.)
+
+@cindex @code{print_see_entry()} function
+@cindex @code{quicksort()} function
+@cindex @code{Output_file} variable
+@<Print a ``see'' entry@>=
+function print_see_entry(key, entry_command, entry_text, # parameters
+ count_array, see_text_array, # parameters
+ i, count, see_entries) # locals
+{
+ count = count_array[key]
+ if (count == 1) { # the easy case
+ printf("%c%s{%s, %s}{}\n",
+ Command_char, entry_command,
+ entry_text[key], see_text_array[key, 1]) > Output_file
+
+ return
+ }
+
+ # Otherwise, we need to sort the entries and then print them
+ # Copy the entries to a separate array
+ for (i = 1; i <= count; i++)
+ see_entries[i] = see_text_array[key, i]
+
+ # sort them
+ quicksort(see_entries, 1, count, "string")
+
+ # now print them
+ for (i = 1; i <= count; i++)
+ printf("%c%s{%s, %s}{}\n",
+ Command_char, entry_command,
+ entry_text[key], see_entries[i]) > Output_file
+}
+@
+@cindex test case @seeentry{testing}
+@cindex test case @seeentry{brief case}
+@cindex coffee
+@cindex coffee @seealso{tea}
+@cindex coffee @seealso{coca-cola}
+@cindex whisky @seealso{soda}
+@cindex whisky @seealso{scotch}
+
+
+@<Work functions@>=
+@<Print a ``see'' entry@>
+@
+
+When checking if we need to print the primary and secondary entry,
+we need to use the subparts of the key.
+The subparts represent the key for those entries;
+each will have an index in @code{Printed} if
+we already printed such an entry.
+The subparts are already available in the @code{Subkeys} array.
+
+@cindex @code{Subkeys} array
+@cindex @code{Printed} array
+@cindex @code{Output_file} variable
+@<Print primary entry if necessary@>=
+if (! (Subkeys[key, 1] in Printed)) {
+ printf("%centry{%s,}{}\n",
+ Command_char, Primary[key]) > Output_file
+ Printed[Subkeys[key, 1]] = True
+}
+@
+
+Printing the secondary entry is a little subtle; we have to check
+that the combination of primary and secondary subkeys have been
+printed and use that combination as the index into @code{Printed}.
+
+@cindex @code{Subkeys} array
+@cindex @code{Printed} array
+@cindex @code{Output_file} variable
+@<Print secondary entry if necessary@>=
+subkey = (Subkeys[key, 1] Command_char "subentry " Subkeys[key, 2])
+if (! (subkey in Printed)) {
+ printf("%csecondary{%s,}{}\n",
+ Command_char, Secondary[key]) > Output_file
+ Printed[subkey] = True
+}
+@
+
+
+Here are some test cases:
+
+@c These should make a nice test case!
+@cindex coffee makers
+
+@cindex toasters @subentry british
+@cindex toasters @subentry american
+
+@cindex microwaves @subentry electric @subentry 110 volt
+@cindex microwaves @subentry electric @subentry 220 volt
+
+@cindex children
+@cindex children @subentry small
+@cindex children @subentry small @subentry toddlers
+@cindex children @subentry small @subentry infants
+@cindex children @subentry teenagers
+@cindex children @subentry adult
+@example
+@@c Top level entry, with page
+@@cindex coffee makers
+
+@@c Double level, no separate top level
+@@cindex toasters @@subentry british
+@@cindex toasters @@subentry american
+
+@@c Triple level, no separate 1st or 2nd level
+@@cindex microwaves @@subentry electric @@subentry 110 volt
+@@cindex microwaves @@subentry electric @@subentry 220 volt
+
+@@c All 3 levels, with pages
+@@cindex children
+@@cindex children @@subentry small
+@@cindex children @@subentry small @@subentry toddlers
+@@cindex children @@subentry small @@subentry infants
+@@cindex children @@subentry teenagers
+@@cindex children @@subentry adult
+
+@@c More examples
+@@cindex test case @@seeentry@{testing@}
+@@cindex test case @@seeentry@{brief case@}
+@@cindex coffee
+@@cindex coffee @@seealso@{tea@}
+@@cindex coffee @@seealso@{coca-cola@}
+@@cindex whisky @@seealso@{soda@}
+@@cindex whisky @@seealso@{scotch@}
+@end example
+
+@noindent
+@xref{Index}, to see if the above test cases are handled properly.
+
+Finally, we add the above code into the set of work functions:
+
+@<Work functions@>=
+@<Print index entry@>
+@
+
@node Necessary stuff
-@chapter Necessary stuff that isn't thrilling
+@chapter Necessary Stuff That Isn't Thrilling
This chapter provides some necessary but unexciting elements.
@menu
-* Copyright statement:: Copyright info.
-* Library functions:: From the @code{gawk} library: @file{ftrans.awk}, @code{join}.
-* Helper functions:: @code{del_array}, @code{check_split}, @code{fatal}, @dots{}
-* I18N:: Internationalization.
+* Copyright statement:: Copyright info.
+* Library functions:: From the @code{gawk} library:
+ @file{ftrans.awk}, @code{join()}.
+* Helper functions:: @code{del_array()}, @code{check_split_null()},
+ @code{fatal()}, @dots{}
+* I18N:: Internationalization.
@end menu
@node Copyright statement
-@section Copyright statement
+@section Copyright Statement
@cindex copyright statement
@cindex GNU General Public License
@@ -1072,11 +1894,11 @@ Every program needs a copyright statement.
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
@
@node Library functions
-@section Library functions: @file{ftrans.awk}, @code{join}
+@section Library Functions: @file{ftrans.awk} and @code{join()}
The program uses several library routines discussed in detail
in the @command{gawk} documentation. The first sets up the
@@ -1085,6 +1907,8 @@ infrastructure for the @code{beginfile()} and @code{endfile()} functions.
for an explanation of how this function works.
@cindex @file{ftrans.awk} library file
+@cindex @code{beginfile()} function
+@cindex @code{endfile()} function
@<Library functions@>=
# ftrans.awk --- handle data file transitions
#
@@ -1094,13 +1918,13 @@ for an explanation of how this function works.
# November 1992
FNR == 1 {
- if (_filename_ != "")
- endfile(_filename_)
- _filename_ = FILENAME
- beginfile(FILENAME)
+ if (_filename_ != "")
+ endfile(_filename_)
+ _filename_ = FILENAME
+ beginfile(FILENAME)
}
-END { endfile(_filename_) }
+END { endfile(_filename_) }
@
The next function is @code{join()}, which joins an array of characters
@@ -1117,32 +1941,35 @@ for an explanation of how this function works.
function join(array, start, end, sep, result, i)
{
- if (sep == "")
- sep = " "
- else if (sep == SUBSEP) # magic value
- sep = ""
- result = array[start]
- for (i = start + 1; i <= end; i++)
- result = result sep array[i]
- return result
+ if (sep == "")
+ sep = " "
+ else if (sep == SUBSEP) # magic value
+ sep = ""
+ result = array[start]
+ for (i = start + 1; i <= end; i++)
+ result = result sep array[i]
+ return result
}
@
@node Helper functions
-@section Helper functions
+@section Helper Functions
These helper functions make the main code easier to follow.
@menu
-* @code{del_array}::
-* @code{check_split_null}::
-* @code{char_split}::
-* @code{fatal}::
-* @code{is@dots{}} functions::
+* del_array:: Clearing out an array.
+* check_split_null:: Checking if @command{awk} splits on the null string.
+* char_split:: Splitting a line into individual characters.
+* fatal:: Printing fatal errors.
+* is@dots{} functions:: Checking character types.
+* make_regexp:: Make a regexp to match @TeX{} control sequences.
+* escape:: Escaping backslashes for strings.
+* min:: Get the minimum of two numbers.
@end menu
-@node @code{del_array}
-@subsection @code{del_array}
+@node del_array
+@subsection @code{del_array()}: Deleting An Array
@code{del_array()} clears out an array.
@@ -1150,19 +1977,19 @@ These helper functions make the main code easier to follow.
@<Helper functions@>=
function del_array(a)
{
- # Portable and faster than
- # for (i in a)
- # delete a[i]
- split("", a)
+ # Portable and faster than
+ # for (i in a)
+ # delete a[i]
+ split("", a)
}
@
-@node @code{check_split_null}
-@subsection @code{check_split_null}
+@node check_split_null
+@subsection @code{check_split_null()}: Checking If @command{awk} Splits On The Null String
@code{check_split_null()} determines whether the @command{awk} running
this program supports using the null string for the separator, splitting
-each character off into a separate element. If so, the return value
+each character off into a separate element. If so, the return value from @code{split()}
will be the number of elements in the array, and it will be more than
one. It is called at program startup.
@@ -1170,13 +1997,13 @@ one. It is called at program startup.
@<Helper functions@>=
function check_split_null( n, a)
{
- n = split("abcde", a, "")
- return (n == 5)
+ n = split("abcde", a, "")
+ return (n == 5)
}
@
-@node @code{char_split}
-@subsection @code{char_split}
+@node char_split
+@subsection @code{char_split()}: Splitting A String Into Characters
@code{char_split()} splits a string into separate characters, letting
@command{awk} do the work if possible. If not, each character is
@@ -1188,39 +2015,48 @@ extracted manually using a loop and @code{substr()}.
@<Helper functions@>=
function char_split(string, array, n, i)
{
- if (Can_split_null)
- return split(string, array, "")
+ if (Can_split_null)
+ return split(string, array, "")
- # do it the hard way
- del_array(array)
- n = length(string)
- for (i = 1; i <= n; i++)
- array[i] = substr(string, i, 1)
+ # do it the hard way
+ del_array(array)
+ n = length(string)
+ for (i = 1; i <= n; i++)
+ array[i] = substr(string, i, 1)
- return n
+ return n
}
@
-@node @code{fatal}
-@subsection @code{fatal}
+@node fatal
+@subsection @code{fatal()}: Printing Fatal Error Messages
+@cindex @command{cat} command
@cindex stderr
The @code{fatal()} function prints a @code{printf}-formatted message to
standard error and then exits badly.
+For maximal portability, it opens a pipeline to @command{cat},
+redirected to standard error; not all systems have a @file{/dev/stderr}
+file, and not all versions of @command{awk} recognize that name
+internally. (Thus, we can't use @samp{print @dots{} > "/dev/stderr"}.)
+@cindex @code{EXIT_FAILURE} constant
@cindex @code{fatal()} function
@<Helper functions@>=
function fatal(format, arg1, arg2, arg3, arg4, arg5,
- arg6, arg7, arg8, arg9, arg10)
+ arg6, arg7, arg8, arg9, arg10, cat)
{
- printf(format, arg1, arg2, arg3, arg4, arg5,
- arg6, arg7, arg8, arg9, arg10) > "/dev/stderr"
- exit EXIT_FAILURE
+ cat = "cat 1>&2" # maximal portability
+ printf(format, arg1, arg2, arg3, arg4, arg5,
+ arg6, arg7, arg8, arg9, arg10) | cat
+ close(cat)
+
+ exit EXIT_FAILURE
}
@
-@node @code{is@dots{}} functions
-@subsection @code{is@dots{}} functions
+@node is@dots{} functions
+@subsection @code{is@dots{}} Functions: Checking Character Types
@cindex @code{isupper()} function
@cindex @code{islower()} function
@@ -1228,29 +2064,91 @@ function fatal(format, arg1, arg2, arg3, arg4, arg5,
@cindex @code{isdigit()} function
The following functions help identify what a character is; they are
similar in nature to the various macros in the C @code{<ctype.h>} header
-file. Since each one returns a count, the return value could be used to
+file. Since most of them return a count, the return value could be used to
compute which character from the set was seen; this turned out not to be
necessary in this program but might be useful in some other context.
+By using @code{index()} with lists of letters, these functions will
+also work on EBCDIC systems, should that ever be necessary.
@<Helper functions@>=
function isupper(c)
{
- return index("ABCDEFGHIJKLMNOPQRSTUVWXYZ", c)
+ return index("ABCDEFGHIJKLMNOPQRSTUVWXYZ", c)
}
function islower(c)
{
- return index("abcdefghijklmnopqrstuvwxyz", c)
+ return index("abcdefghijklmnopqrstuvwxyz", c)
}
function isalpha(c)
{
- return islower(c) || isupper(c)
+ return islower(c) || isupper(c)
}
function isdigit(c)
{
- return index("0123456789", c)
+ return index("0123456789", c)
+}
+@
+
+@node make_regexp
+@subsection @code{make_regexp()}: Matching @TeX{} Control Sequences
+
+@file{texindex.awk} has to handle input where the command
+character may be an @samp{@@} or a @samp{\}. When matching
+command strings in regular expressions, if the command character
+is a backslash, it must be doubled in order to be treated
+literally. The @code{make_regexp()} function handles this
+for us; a @samp{%} in the text of the regexp stands for
+the command character and is replaced appropriately.
+
+@cindex @code{make_regexp()} function
+@<Helper functions@>=
+function make_regexp(regexp, a, sep, n)
+{
+ n = split(regexp, a, "%")
+ if (Command_char == "\\")
+ sep = Command_char Command_char
+ else
+ sep = Command_char
+
+ return join(a, 1, n, sep)
+}
+@
+
+@node escape
+@subsection @code{escape()}: Escaping Backslashes for Strings
+
+If the command character is a backslash, occurrences of backslash need to be
+doubled before the containing string can be used as a regexp. This
+function does that job; it's very similar to @code{make_regexp()}
+(@pxref{make_regexp}).
+
+@cindex @code{escape()} function
+@<Helper functions@>=
+function escape(regexp, a, n)
+{
+ if (Command_char != "\\")
+ return regexp
+
+ n = split(regexp, a, "\\")
+ if (n == 1)
+ return regexp
+
+ return join(a, 1, n, "\\\\")
+}
+@
+
+@node min
+@subsection @code{min()}: Getting The Minimum of Two Numbers
+
+It'd be nice if @command{awk} had this built-in@enddots{}
+
+@<Helper functions@>=
+function min(a, b)
+{
+ return (a < b ? a : b)
}
@
@@ -1261,16 +2159,18 @@ For @command{gawk}, we can arrange for the various messages, e.g., in
the @code{usage()} and @code{version()} functions, to be translated. We
do this by setting the text domain at startup. For more information on
internationalization in @command{gawk},
-@pxref{Internationalization.html,,, gawk, GNU Awk User's Guide}.
+@pxref{Internationalization,,, gawk, GNU Awk User's Guide}.
+@cindex @code{TEXTDOMAIN} variable
@<Initial setup@>=
TEXTDOMAIN = "texinfo"
@
-@noindent On non-GNU versions of @command{awk}, this is a harmless
+@noindent
+On non-GNU versions of @command{awk}, this is a harmless
assignment, and the @code{_"..."} construct below is a harmless
concatenation of an unassigned variable @code{_}, i.e., the empty
-string.
+string, with the following string constant.
The @code{usage()} and @code{version()} functions print the necessary
information and then exit. The strings that can and should be
@@ -1279,42 +2179,40 @@ translated are prefixed with an underscore.
@cindex @code{Texindex_version} variable
@cindex @code{usage()} function
@cindex @code{version()} function
-@tex
-% avoid useless warnings/overfull boxes in these long strings
-\global\hfuzz=\maxdimen
-@end tex
-
+@cindex @code{EXIT_SUCCESS} constant
+@use_smallexample
@<Helper functions@>=
function usage(exit_val)
{
- printf(_"Usage: %s [OPTION]... FILE...\n", Invocation_name)
- print _"Generate a sorted index for each TeX output FILE."
- print _"Usually FILE... is specified as `foo.??' for a document `foo.texi'."
- print ""
- print _"Options:"
- print _" -h, --help display this help and exit"
- print _" --version display version information and exit"
- print _" -- end option processing"
- print ""
- print _"Email bug reports to bug-texinfo@gnu.org,\n\
+ printf(_"Usage: %s [OPTION]... FILE...\n", Invocation_name)
+ print _"Generate a sorted index for each TeX output FILE."
+ print _"Usually FILE... is specified as `foo.??' for a document `foo.texi'."
+ print ""
+ print _"Options:"
+ print _" -h, --help display this help and exit"
+ print _" --version display version information and exit"
+ print _" -- end option processing"
+ print ""
+ print _"Email bug reports to bug-texinfo@gnu.org,\n\
general questions and discussion to help-texinfo@gnu.org.\n\
-Texinfo home page: http://www.gnu.org/software/texinfo/";
+Texinfo home page: https://www.gnu.org/software/texinfo/"
- exit exit_val
+ exit exit_val
}
function version()
{
- print "texindex (GNU texinfo)", Texindex_version
- print ""
- printf _"Copyright (C) %s Free Software Foundation, Inc.\n\
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+ print "texindex (GNU texinfo)", Texindex_version
+ print ""
+ printf _"Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n\
This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n", "2019";
+There is NO WARRANTY, to the extent permitted by law.\n", "2019"
- exit EXIT_SUCCESS
+ exit EXIT_SUCCESS
}
@
+@use_example
@node Index
@unnumbered Index
diff --git a/macros/texinfo/texinfo/tp/Makefile.am b/macros/texinfo/texinfo/tp/Makefile.am
index d8378505f6..ee1fcadd6f 100644
--- a/macros/texinfo/texinfo/tp/Makefile.am
+++ b/macros/texinfo/texinfo/tp/Makefile.am
@@ -279,6 +279,12 @@ maintain/catalog.xml: maintain/catalog.xml.in Makefile
-e 's|[@]TEXINFO_DTD_VERSION[@]|$(TEXINFO_DTD_VERSION)|' \
$(srcdir)/maintain/catalog.xml.in >$@
+Texinfo/ModulePath.pm: Texinfo/ModulePath.pm.in Makefile
+ $(MKDIR_P) Texinfo
+ sed -e 's|[@]USE_EXTERNAL_LIBINTL[@]|$(USE_EXTERNAL_LIBINTL)|' \
+ -e 's|[@]USE_EXTERNAL_EASTASIANWIDTH[@]|$(USE_EXTERNAL_EASTASIANWIDTH)|' \
+ -e 's|[@]USE_EXTERNAL_UNIDECODE[@]|$(USE_EXTERNAL_UNIDECODE)|' \
+ $(srcdir)/Texinfo/ModulePath.pm.in >$@
libsrcdir = $(srcdir)/maintain/lib
@@ -323,5 +329,5 @@ distclean-local:
rm -rf t/include_dir
rm -rf blib po po_document
-CLEANFILES = texi2any makeinfo texi2any-perl
+CLEANFILES = texi2any makeinfo texi2any-perl Texinfo/ModulePath.pm
DISTCLEANFILES = maintain/catalog.xml pm_to_blib Makefile.old
diff --git a/macros/texinfo/texinfo/tp/Makefile.docstr b/macros/texinfo/texinfo/tp/Makefile.docstr
index fd23208e8b..18f64b042c 100644
--- a/macros/texinfo/texinfo/tp/Makefile.docstr
+++ b/macros/texinfo/texinfo/tp/Makefile.docstr
@@ -38,15 +38,6 @@ LocaleData/cs/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/cs.gmo
-$(srcdir)/../po_document/da.gmo: $(srcdir)/../po_document/da.po
- cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) da.gmo
-
-LocaleData/da/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/da.gmo
- $(MKDIR_P) `dirname $@`
- $(INSTALL_DATA) $(srcdir)/../po_document/da.gmo $@
-
-
-
$(srcdir)/../po_document/de.gmo: $(srcdir)/../po_document/de.po
cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) de.gmo
@@ -65,15 +56,6 @@ LocaleData/de.us-ascii/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_docume
-$(srcdir)/../po_document/el.gmo: $(srcdir)/../po_document/el.po
- cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) el.gmo
-
-LocaleData/el/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/el.gmo
- $(MKDIR_P) `dirname $@`
- $(INSTALL_DATA) $(srcdir)/../po_document/el.gmo $@
-
-
-
$(srcdir)/../po_document/eo.gmo: $(srcdir)/../po_document/eo.po
cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) eo.gmo
@@ -191,6 +173,15 @@ LocaleData/pt_BR.us-ascii/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_doc
+$(srcdir)/../po_document/sv.gmo: $(srcdir)/../po_document/sv.po
+ cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) sv.gmo
+
+LocaleData/sv/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/sv.gmo
+ $(MKDIR_P) `dirname $@`
+ $(INSTALL_DATA) $(srcdir)/../po_document/sv.gmo $@
+
+
+
$(srcdir)/../po_document/uk.gmo: $(srcdir)/../po_document/uk.po
cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) uk.gmo
@@ -199,4 +190,4 @@ LocaleData/uk/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/uk.gmo
$(INSTALL_DATA) $(srcdir)/../po_document/uk.gmo $@
-document_strings_mo_files = LocaleData/ca/LC_MESSAGES/$(document_domain).mo LocaleData/ca.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/cs/LC_MESSAGES/$(document_domain).mo LocaleData/da/LC_MESSAGES/$(document_domain).mo LocaleData/de/LC_MESSAGES/$(document_domain).mo LocaleData/de.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/el/LC_MESSAGES/$(document_domain).mo LocaleData/eo/LC_MESSAGES/$(document_domain).mo LocaleData/es/LC_MESSAGES/$(document_domain).mo LocaleData/fr/LC_MESSAGES/$(document_domain).mo LocaleData/hr/LC_MESSAGES/$(document_domain).mo LocaleData/hu/LC_MESSAGES/$(document_domain).mo LocaleData/it/LC_MESSAGES/$(document_domain).mo LocaleData/nl/LC_MESSAGES/$(document_domain).mo LocaleData/no.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/pl/LC_MESSAGES/$(document_domain).mo LocaleData/pt/LC_MESSAGES/$(document_domain).mo LocaleData/pt.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/pt_BR/LC_MESSAGES/$(document_domain).mo LocaleData/pt_BR.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/uk/LC_MESSAGES/$(document_domain).mo
+document_strings_mo_files = LocaleData/ca/LC_MESSAGES/$(document_domain).mo LocaleData/ca.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/cs/LC_MESSAGES/$(document_domain).mo LocaleData/de/LC_MESSAGES/$(document_domain).mo LocaleData/de.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/eo/LC_MESSAGES/$(document_domain).mo LocaleData/es/LC_MESSAGES/$(document_domain).mo LocaleData/fr/LC_MESSAGES/$(document_domain).mo LocaleData/hr/LC_MESSAGES/$(document_domain).mo LocaleData/hu/LC_MESSAGES/$(document_domain).mo LocaleData/it/LC_MESSAGES/$(document_domain).mo LocaleData/nl/LC_MESSAGES/$(document_domain).mo LocaleData/no.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/pl/LC_MESSAGES/$(document_domain).mo LocaleData/pt/LC_MESSAGES/$(document_domain).mo LocaleData/pt.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/pt_BR/LC_MESSAGES/$(document_domain).mo LocaleData/pt_BR.us-ascii/LC_MESSAGES/$(document_domain).mo LocaleData/sv/LC_MESSAGES/$(document_domain).mo LocaleData/uk/LC_MESSAGES/$(document_domain).mo
diff --git a/macros/texinfo/texinfo/tp/Makefile.in b/macros/texinfo/texinfo/tp/Makefile.in
index c03ae1ae79..5c46870481 100644
--- a/macros/texinfo/texinfo/tp/Makefile.in
+++ b/macros/texinfo/texinfo/tp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -570,6 +570,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -725,6 +726,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -792,11 +794,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -862,6 +866,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -882,6 +887,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -916,6 +922,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -930,6 +937,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -1008,8 +1016,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -1025,14 +1031,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1122,6 +1127,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1155,6 +1161,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1167,6 +1174,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1185,6 +1193,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1288,6 +1297,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1297,7 +1307,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-# Makefile.tres generated by ./maintain/regenerate_file_lists.pl.
+# Makefile.tres generated by ./tp/maintain/regenerate_file_lists.pl.
#
test_tap_files_generated_list = \
t/01use.t \
@@ -1747,9 +1757,7 @@ test_files_generated_list = $(test_tap_files_generated_list) \
t/results/formatting/simplest_test_date_in_header.pl \
t/results/formatting/simplest_test_date_in_header/res_html/simplest.html \
t/results/formatting/simplest_test_prefix.pl \
- t/results/formatting/simplest_test_prefix/res_html/truc.html \
t/results/formatting/simplest_test_prefix_info.pl \
- t/results/formatting/simplest_test_prefix_info/res_info/truc.info \
t/results/formatting/split_for_format_not_split.pl \
t/results/formatting/split_for_format_not_split/res_xml/simplest.xml \
t/results/formatting/split_nocopying.pl \
@@ -1761,8 +1769,6 @@ test_files_generated_list = $(test_tap_files_generated_list) \
t/results/formatting/texi_bib_example.pl \
t/results/formatting/texi_cond.pl \
t/results/formatting/texi_glossary.pl \
- t/results/formatting/unknown_nodes_renamed.pl \
- t/results/formatting/unknown_nodes_renamed/res_html/unknown_nodes_renamed.html \
t/results/heading/heading_in_copying.pl \
t/results/heading/heading_in_example.pl \
t/results/heading/heading_in_quotation.pl \
@@ -1896,6 +1902,9 @@ test_files_generated_list = $(test_tap_files_generated_list) \
t/results/indices/printindex_with_space_before.pl \
t/results/indices/recursive_synindex.pl \
t/results/indices/same_index_entry_merged_indices.pl \
+ t/results/indices/seeentry.pl \
+ t/results/indices/subentries.pl \
+ t/results/indices/subentry_and_sortas.pl \
t/results/indices/syncode_index_print_both.pl \
t/results/indices/syncodeindex_to_plain.pl \
t/results/indices/unknown_index_entry.pl \
@@ -2044,6 +2053,7 @@ test_files_generated_list = $(test_tap_files_generated_list) \
t/results/itemize/lone_end_itemize.pl \
t/results/itemize/not_closed_item.pl \
t/results/itemize/not_closed_itemize.pl \
+ t/results/itemize/table_in_itemize.pl \
t/results/itemize/w_argument.pl \
t/results/languages/appendix_translated.pl \
t/results/languages/command_translated.pl \
@@ -2808,10 +2818,8 @@ document_strings_mo_files = \
LocaleData/ca/LC_MESSAGES/$(document_domain).mo \
LocaleData/ca.us-ascii/LC_MESSAGES/$(document_domain).mo \
LocaleData/cs/LC_MESSAGES/$(document_domain).mo \
- LocaleData/da/LC_MESSAGES/$(document_domain).mo \
LocaleData/de/LC_MESSAGES/$(document_domain).mo \
LocaleData/de.us-ascii/LC_MESSAGES/$(document_domain).mo \
- LocaleData/el/LC_MESSAGES/$(document_domain).mo \
LocaleData/eo/LC_MESSAGES/$(document_domain).mo \
LocaleData/es/LC_MESSAGES/$(document_domain).mo \
LocaleData/fr/LC_MESSAGES/$(document_domain).mo \
@@ -2825,6 +2833,7 @@ document_strings_mo_files = \
LocaleData/pt.us-ascii/LC_MESSAGES/$(document_domain).mo \
LocaleData/pt_BR/LC_MESSAGES/$(document_domain).mo \
LocaleData/pt_BR.us-ascii/LC_MESSAGES/$(document_domain).mo \
+ LocaleData/sv/LC_MESSAGES/$(document_domain).mo \
LocaleData/uk/LC_MESSAGES/$(document_domain).mo
SUBDIRS = $(am__append_1) . tests
DIST_SUBDIRS = Texinfo/XS tests
@@ -3041,7 +3050,7 @@ EXTRA_DIST = \
maintain/lib
libsrcdir = $(srcdir)/maintain/lib
-CLEANFILES = texi2any makeinfo texi2any-perl
+CLEANFILES = texi2any makeinfo texi2any-perl Texinfo/ModulePath.pm
DISTCLEANFILES = maintain/catalog.xml pm_to_blib Makefile.old
all: all-recursive
@@ -3700,13 +3709,6 @@ LocaleData/cs/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/cs.gmo
$(MKDIR_P) `dirname $@`
$(INSTALL_DATA) $(srcdir)/../po_document/cs.gmo $@
-$(srcdir)/../po_document/da.gmo: $(srcdir)/../po_document/da.po
- cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) da.gmo
-
-LocaleData/da/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/da.gmo
- $(MKDIR_P) `dirname $@`
- $(INSTALL_DATA) $(srcdir)/../po_document/da.gmo $@
-
$(srcdir)/../po_document/de.gmo: $(srcdir)/../po_document/de.po
cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) de.gmo
@@ -3721,13 +3723,6 @@ LocaleData/de.us-ascii/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_docume
$(MKDIR_P) `dirname $@`
$(INSTALL_DATA) $(srcdir)/../po_document/de.us-ascii.gmo $@
-$(srcdir)/../po_document/el.gmo: $(srcdir)/../po_document/el.po
- cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) el.gmo
-
-LocaleData/el/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/el.gmo
- $(MKDIR_P) `dirname $@`
- $(INSTALL_DATA) $(srcdir)/../po_document/el.gmo $@
-
$(srcdir)/../po_document/eo.gmo: $(srcdir)/../po_document/eo.po
cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) eo.gmo
@@ -3819,6 +3814,13 @@ LocaleData/pt_BR.us-ascii/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_doc
$(MKDIR_P) `dirname $@`
$(INSTALL_DATA) $(srcdir)/../po_document/pt_BR.us-ascii.gmo $@
+$(srcdir)/../po_document/sv.gmo: $(srcdir)/../po_document/sv.po
+ cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) sv.gmo
+
+LocaleData/sv/LC_MESSAGES/$(document_domain).mo: $(srcdir)/../po_document/sv.gmo
+ $(MKDIR_P) `dirname $@`
+ $(INSTALL_DATA) $(srcdir)/../po_document/sv.gmo $@
+
$(srcdir)/../po_document/uk.gmo: $(srcdir)/../po_document/uk.po
cd ../po_document/ && $(MAKE) $(AM_MAKEFLAGS) uk.gmo
@@ -3863,6 +3865,13 @@ maintain/catalog.xml: maintain/catalog.xml.in Makefile
-e 's|[@]TEXINFO_DTD_VERSION[@]|$(TEXINFO_DTD_VERSION)|' \
$(srcdir)/maintain/catalog.xml.in >$@
+Texinfo/ModulePath.pm: Texinfo/ModulePath.pm.in Makefile
+ $(MKDIR_P) Texinfo
+ sed -e 's|[@]USE_EXTERNAL_LIBINTL[@]|$(USE_EXTERNAL_LIBINTL)|' \
+ -e 's|[@]USE_EXTERNAL_EASTASIANWIDTH[@]|$(USE_EXTERNAL_EASTASIANWIDTH)|' \
+ -e 's|[@]USE_EXTERNAL_UNIDECODE[@]|$(USE_EXTERNAL_UNIDECODE)|' \
+ $(srcdir)/Texinfo/ModulePath.pm.in >$@
+
install-data-local:
if test $(USE_EXTERNAL_LIBINTL) != 'yes' ; then \
$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
diff --git a/macros/texinfo/texinfo/tp/Makefile.tres b/macros/texinfo/texinfo/tp/Makefile.tres
index 4ec22a87d8..418e869553 100644
--- a/macros/texinfo/texinfo/tp/Makefile.tres
+++ b/macros/texinfo/texinfo/tp/Makefile.tres
@@ -1,4 +1,4 @@
-# Makefile.tres generated by ./maintain/regenerate_file_lists.pl.
+# Makefile.tres generated by ./tp/maintain/regenerate_file_lists.pl.
#
test_tap_files_generated_list = \
t/01use.t \
@@ -448,9 +448,7 @@ test_files_generated_list = $(test_tap_files_generated_list) \
t/results/formatting/simplest_test_date_in_header.pl \
t/results/formatting/simplest_test_date_in_header/res_html/simplest.html \
t/results/formatting/simplest_test_prefix.pl \
- t/results/formatting/simplest_test_prefix/res_html/truc.html \
t/results/formatting/simplest_test_prefix_info.pl \
- t/results/formatting/simplest_test_prefix_info/res_info/truc.info \
t/results/formatting/split_for_format_not_split.pl \
t/results/formatting/split_for_format_not_split/res_xml/simplest.xml \
t/results/formatting/split_nocopying.pl \
@@ -462,8 +460,6 @@ test_files_generated_list = $(test_tap_files_generated_list) \
t/results/formatting/texi_bib_example.pl \
t/results/formatting/texi_cond.pl \
t/results/formatting/texi_glossary.pl \
- t/results/formatting/unknown_nodes_renamed.pl \
- t/results/formatting/unknown_nodes_renamed/res_html/unknown_nodes_renamed.html \
t/results/heading/heading_in_copying.pl \
t/results/heading/heading_in_example.pl \
t/results/heading/heading_in_quotation.pl \
@@ -597,6 +593,9 @@ test_files_generated_list = $(test_tap_files_generated_list) \
t/results/indices/printindex_with_space_before.pl \
t/results/indices/recursive_synindex.pl \
t/results/indices/same_index_entry_merged_indices.pl \
+ t/results/indices/seeentry.pl \
+ t/results/indices/subentries.pl \
+ t/results/indices/subentry_and_sortas.pl \
t/results/indices/syncode_index_print_both.pl \
t/results/indices/syncodeindex_to_plain.pl \
t/results/indices/unknown_index_entry.pl \
@@ -745,6 +744,7 @@ test_files_generated_list = $(test_tap_files_generated_list) \
t/results/itemize/lone_end_itemize.pl \
t/results/itemize/not_closed_item.pl \
t/results/itemize/not_closed_itemize.pl \
+ t/results/itemize/table_in_itemize.pl \
t/results/itemize/w_argument.pl \
t/results/languages/appendix_translated.pl \
t/results/languages/command_translated.pl \
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Common.pm b/macros/texinfo/texinfo/tp/Texinfo/Common.pm
index 5603d5abe8..3e9fa357f9 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Common.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Common.pm
@@ -64,7 +64,7 @@ valid_tree_transformation
__ __p print_tree
);
-$VERSION = '6.6';
+$VERSION = '6.7';
# i18n
sub N__($)
@@ -136,6 +136,8 @@ our %default_parser_state_configuration = (
# argument. A Texinfo tree may also be used.
'info' => {
'novalidate' => 0, # same as setting @novalidate.
+ 'input_encoding_name' => 'utf-8',
+ 'input_perl_encoding' => 'utf-8'
},
'in_gdt' => 0 # whether we are being called by gdt
);
@@ -150,11 +152,6 @@ our %default_customization_values = (
'SHOW_MENU' => 1, # if false no menu error related.
'IGNORE_BEFORE_SETFILENAME' => 1,
'IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME' => 1,
- 'INPUT_PERL_ENCODING' => undef, # input perl encoding name, set from
- # @documentencoding in the default case
- 'INPUT_ENCODING_NAME' => undef, # encoding name normalized as preferred
- # IANA, set from @documentencoding in the default
- # case
'CPP_LINE_DIRECTIVES' => 1, # handle cpp like synchronization lines
'MAX_MACRO_CALL_NESTING' => 100000, # max number of nested macro calls
# This is not used directly, but passed to Convert::Text through
@@ -162,7 +159,6 @@ our %default_customization_values = (
'ENABLE_ENCODING' => 1, # output accented and special characters
# based on @documentencoding
# following are used in Texinfo::Structuring
- 'TOP_NODE_UP' => '(dir)', # up node of Top node
'SIMPLE_MENU' => 0, # not used in the parser but in structuring
'USE_UP_NODE_FOR_ELEMENT_UP' => 0, # Use node up for Up if there is no
# section up.
@@ -224,7 +220,7 @@ my @command_line_settables = ('FILLCOLUMN', 'SPLIT', 'SPLIT_SIZE',
'NUMBER_FOOTNOTES', 'NODE_FILES',
'NO_WARN', 'VERBOSE',
'TRANSLITERATE_FILE_NAMES', 'ERROR_LIMIT', 'ENABLE_ENCODING',
- 'FORCE', 'INTERNAL_LINKS', 'OUTFILE', 'SUBDIR', 'OUT',
+ 'FORCE', 'INTERNAL_LINKS', 'OUTFILE', 'SUBDIR',
'SILENT', 'CASE_INSENSITIVE_FILENAMES',
);
@@ -249,7 +245,7 @@ my @variable_string_settables = (
'SIMPLE_MENU', 'EXTENSION', 'USE_NUMERIC_ENTITY',
'ENABLE_ENCODING_USE_ENTITY', 'ICONS',
'USE_UNIDECODE', 'DATE_IN_HEADER', 'OPEN_QUOTE_SYMBOL',
- 'CLOSE_QUOTE_SYMBOL', 'TOP_NODE_UP', 'TOP_NODE_UP_URL', 'TOP_NODE_FILE',
+ 'CLOSE_QUOTE_SYMBOL', 'TOP_NODE_UP', 'TOP_NODE_UP_URL',
'TOP_NODE_FILE_TARGET', 'SECTION_NAME_IN_TITLE',
'SHOW_TITLE', 'WORDS_IN_PAGE',
'HEADER_IN_TABLE', 'USE_ACCESSKEY', 'USE_REL_REV', 'USE_LINKS',
@@ -260,10 +256,8 @@ my @variable_string_settables = (
'USE_NODE_TARGET',
'PROGRAM_NAME_IN_FOOTER', 'NODE_FILENAMES',
'EXTERNAL_CROSSREF_SPLIT', 'BODYTEXT',
- 'CSS_LINES', 'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE',
- 'CPP_LINE_DIRECTIVES',
+ 'CSS_LINES', 'CPP_LINE_DIRECTIVES',
'TEXI2DVI', 'DUMP_TREE', 'MAX_MACRO_CALL_NESTING',
- 'INPUT_ENCODING_NAME', 'INPUT_PERL_ENCODING',
'OUTPUT_ENCODING_NAME', 'OUTPUT_PERL_ENCODING',
'PACKAGE_VERSION',
'PACKAGE_AND_VERSION', 'PACKAGE_URL', 'PACKAGE', 'PACKAGE_NAME', 'PROGRAM',
@@ -507,6 +501,7 @@ our %line_commands = (
# obsolete @-commands.
'setcontentsaftertitlepage' => 'skipline', # no arg
'setshortcontentsaftertitlepage' => 'skipline', # no arg
+ 'subentry' => 'line',
);
# commands that do not take the whole line as argument
@@ -536,7 +531,7 @@ foreach my $in_heading_command ('thischapter', 'thischaptername',
# only valid in index entries
our %in_index_commands;
-foreach my $in_index_command ('sortas') {
+foreach my $in_index_command ('sortas', 'seeentry', 'seealso') {
$in_index_commands{$in_index_command} = 1;
}
@@ -615,7 +610,7 @@ foreach my $command ('r', 'i', 'b', 'sansserif', 'slanted') {
}
foreach my $one_arg_command ('U', 'dmn', 'key',
- 'titlefont', 'anchor', 'errormsg', 'sortas') {
+ 'titlefont', 'anchor', 'errormsg', 'sortas', 'seeentry', 'seealso') {
$brace_commands{$one_arg_command} = 1;
}
@@ -1120,7 +1115,9 @@ sub open_out($$;$$)
# before setting the encoding filters with binmode.
binmode($filehandle) if $use_binmode;
if ($encoding) {
- if ($encoding eq 'utf8' or $encoding eq 'utf-8-strict') {
+ if ($encoding eq 'utf8'
+ or $encoding eq 'utf-8'
+ or $encoding eq 'utf-8-strict') {
binmode($filehandle, ':utf8');
} else { # FIXME also right for shiftijs or similar encodings?
binmode($filehandle, ':bytes');
@@ -1676,91 +1673,6 @@ sub is_content_empty($;$)
}
return 1;
}
-
-sub parse_renamed_nodes_file($$;$$)
-{
- my $self = shift;
- my $renamed_nodes_file = shift;
- # if not given they are automatically created
- my $renamed_nodes = shift;
- my $renamed_nodes_lines = shift;
-
- my $input_directory = $self->{'info'}->{'input_directory'};
-
- # check for noderename.cnf in directory of source, and in current
- # directory.
- if ($input_directory
- and open(RENAMEDFILE, "<$input_directory$renamed_nodes_file")
- or open(RENAMEDFILE, "<$renamed_nodes_file")) {
- if ($self->get_conf('INPUT_PERL_ENCODING')) {
- binmode(RENAMEDFILE, ":encoding(".
- $self->get_conf('INPUT_PERL_ENCODING').")");
- }
- my $renamed_nodes_line_nr = 0;
- my @old_names = ();
- while (<RENAMEDFILE>) {
- $renamed_nodes_line_nr++;
- next unless (/\S/);
- next if (/^\s*\@c\b/);
- if (s/^\s*\@\@\{\}\s+(\S)/$1/) {
- chomp;
- if (scalar(@old_names)) {
- foreach my $old_node_name (@old_names) {
- $renamed_nodes->{$old_node_name} = $_;
- }
- $renamed_nodes_lines->{$_} = $renamed_nodes_line_nr;
- @old_names = ();
- } else {
- $self->file_line_warn(__("no node to be renamed"),
- $renamed_nodes_file, $renamed_nodes_line_nr);
- }
- } else {
- chomp;
- s/^\s*//;
- $renamed_nodes_lines->{$_} = $renamed_nodes_line_nr;
- push @old_names, $_;
- }
- }
- if (scalar(@old_names)) {
- $self->file_line_warn(__("nodes without a new name at the end of file"),
- $renamed_nodes_file, $renamed_nodes_line_nr);
- }
- if (!close(RENAMEDFILE)) {
- $self->document_warn(sprintf(__p(
- "see HTML Xref Link Preservation in the Texinfo manual for context",
- "error on closing node-renaming configuration file %s: %s"),
- $renamed_nodes_file, $!));
- }
- } else {
- $self->document_warn(sprintf(__("could not open %s: %s"),
- $renamed_nodes_file, $!));
- }
- return ($renamed_nodes, $renamed_nodes_lines);
-}
-
-sub collect_renamed_nodes($$;$$)
-{
- my $self = shift;
- my $basename = shift;
- my $renamed_nodes = shift;
- my $renamed_nodes_lines = shift;
-
- my $renamed_nodes_file;
- if (defined($self->get_conf('RENAMED_NODES_FILE'))) {
- $renamed_nodes_file = $self->get_conf('RENAMED_NODES_FILE');
- } elsif (-f $basename . '-noderename.cnf') {
- $renamed_nodes_file = $basename . '-noderename.cnf';
- }
- if (defined($renamed_nodes_file)) {
- $self->document_warn(sprintf(__("using a renamed nodes file (`%s') is deprecated"), $renamed_nodes_file));
- my ($renamed_nodes, $renamed_nodes_lines)
- = parse_renamed_nodes_file($self, $renamed_nodes_file, $renamed_nodes,
- $renamed_nodes_lines);
- return ($renamed_nodes, $renamed_nodes_lines, $renamed_nodes_file);
- }
- return (undef, undef, undef);
-}
-
sub normalize_top_node_name($)
{
my $node = shift;
@@ -1777,8 +1689,6 @@ sub _convert_text_options($)
if ($self->get_conf('ENABLE_ENCODING')) {
if ($self->get_conf('OUTPUT_ENCODING_NAME')) {
$options{'enabled_encoding'} = $self->get_conf('OUTPUT_ENCODING_NAME');
- } elsif ($self->get_conf('INPUT_ENCODING_NAME')) {
- $options{'enabled_encoding'} = $self->get_conf('INPUT_ENCODING_NAME');
}
}
$options{'TEST'} = 1 if ($self->get_conf('TEST'));
@@ -1802,7 +1712,8 @@ sub count_bytes($$;$)
$encoding = $self->get_conf('OUTPUT_PERL_ENCODING');
}
- if ($encoding eq 'utf-8-strict') {
+ if ($encoding eq 'utf-8'
+ or $encoding eq 'utf-8-strict') {
if (Encode::is_utf8($string)) {
# Get the number of bytes in the underlying storage. This may
# be slightly faster than calling Encode::encode_utf8.
@@ -1914,6 +1825,39 @@ sub _copy_tree($$$)
return $new;
}
+# for user-defined code
+sub collect_commands_in_tree($$)
+{
+ my $root = shift;
+ my $commands_list = shift;
+
+ my $commands_hash = {};
+ foreach my $command_name (@$commands_list) {
+ $commands_hash->{$command_name} = [];
+ }
+ _collect_commands_in_tree($root, $commands_hash);
+ return $commands_hash;
+}
+
+sub _collect_commands_in_tree($$);
+sub _collect_commands_in_tree($$)
+{
+ my $current = shift;
+ my $commands_hash = shift;
+
+ if (defined($current->{'cmdname'})
+ and defined($commands_hash->{$current->{'cmdname'}})) {
+ push @{$commands_hash->{$current->{'cmdname'}}}, $current;
+ }
+ foreach my $key ('args', 'contents') {
+ if ($current->{$key}) {
+ foreach my $child (@{$current->{$key}}) {
+ _collect_commands_in_tree($child, $commands_hash);
+ }
+ }
+ }
+}
+
# Not used.
sub _collect_references($$);
sub _collect_references($$)
@@ -2974,6 +2918,13 @@ Return true if the I<$name> is a known tree transformation name
that may be passed with C<TREE_TRANSFORMATIONS> to modify a texinfo
tree.
+=item collect_commands_in_tree($tree, $commands_list)
+
+Returns a hash reference with keys @-commands names specified
+in the I<$commands_list> array reference and values arrays of
+tree elements corresponding to those @-command found in I<$tree>
+by traversing the tree.
+
=back
=head1 SEE ALSO
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm
index a58dc45341..b093a96c47 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm
@@ -28,10 +28,7 @@ use File::Basename;
use File::Spec;
use Encode;
-use Texinfo::Report;
use Texinfo::Common;
-use Texinfo::Convert::Text;
-use Texinfo::Convert::Texinfo;
use Texinfo::Structuring;
use Carp qw(cluck);
@@ -52,7 +49,7 @@ xml_accents
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
my %defaults = (
'ENABLE_ENCODING' => 1,
@@ -67,6 +64,7 @@ our %all_converters_defaults = (
'language_config_dirs' => undef,
'output_format' => undef,
'SPLIT_SIZE' => 300000,
+ 'TOP_NODE_UP' => '(dir)', # up node of Top node default value
'paragraphindent' => 3,
'fillcolumn' => 72,
'expanded_formats' => undef,
@@ -207,18 +205,6 @@ sub converter(;$)
$converter->{'extra'}
= $converter->{'parser'}->global_commands_information();
$converter->{'info'} = $converter->{'parser'}->global_informations();
- if ($converter->{'info'}
- and $converter->{'info'}->{'input_perl_encoding'}
- and !defined($conf->{'INPUT_PERL_ENCODING'})) {
- $conf->{'INPUT_PERL_ENCODING'}
- = $converter->{'info'}->{'input_perl_encoding'};
- }
- if ($converter->{'info'}
- and $converter->{'info'}->{'input_encoding_name'}
- and !defined($conf->{'INPUT_ENCODING_NAME'})) {
- $conf->{'INPUT_ENCODING_NAME'}
- = $converter->{'info'}->{'input_encoding_name'};
- }
my $floats = $converter->{'parser'}->floats_information();
my $labels = $converter->{'parser'}->labels_information();
$converter->{'structuring'} = $converter->{'parser'}->{'structuring'};
@@ -248,8 +234,8 @@ sub converter(;$)
}
}
$converter->set_conf('OUTPUT_ENCODING_NAME',
- $converter->get_conf('INPUT_ENCODING_NAME'))
- if ($converter->get_conf('INPUT_ENCODING_NAME'));
+ $converter->{'info'}->{'input_encoding_name'})
+ if ($converter->{'info'}->{'input_encoding_name'});
if (!$converter->get_conf('OUTPUT_PERL_ENCODING')
and $converter->get_conf('OUTPUT_ENCODING_NAME')) {
my $perl_encoding
@@ -279,6 +265,10 @@ sub converter(;$)
$converter->{'expanded_formats_hash'}->{$expanded_format} = 1;
}
+ require Texinfo::Report;
+ # 'require' here instead of 'use' at top of file to cut down run time of
+ # 'texi2any --help'
+
$converter->Texinfo::Report::new();
$converter->converter_initialize();
@@ -603,22 +593,14 @@ sub _top_node_filename($)
and $self->get_conf('TOP_FILE') ne '') {
$top_node_filename = $self->get_conf('TOP_FILE');
} else {
- if (defined($self->get_conf('TOP_NODE_FILE'))) {
- $top_node_filename = $self->get_conf('TOP_NODE_FILE');
- } else {
- # TOP_NODE_FILE is set in the default case.
- # If not the manual name is used.
- $top_node_filename = $self->{'document_name'};
- }
+ my $extension = '';
+ $extension = '.'.$self->get_conf('EXTENSION')
+ if (defined($self->get_conf('EXTENSION'))
+ and $self->get_conf('EXTENSION') ne '');
+
+ $top_node_filename = $self->{'document_name'};
if (defined($top_node_filename)) {
- my $top_node_extension;
- if ($self->get_conf('NODE_FILENAMES')) {
- $top_node_extension = $self->get_conf('NODE_FILE_EXTENSION');
- } else {
- $top_node_extension = $self->get_conf('EXTENSION');
- }
- $top_node_filename .= '.'.$top_node_extension
- if (defined($top_node_extension) and $top_node_extension ne '');
+ $top_node_filename .= $extension;
}
}
return $top_node_filename;
@@ -674,8 +656,7 @@ sub _set_pages_files($$)
my $top_node_filename = $self->_top_node_filename();
# first determine the top node file name.
- if ($self->get_conf('NODE_FILENAMES') and $node_top
- and defined($top_node_filename)) {
+ if ($node_top and defined($top_node_filename)) {
my ($node_top_element) = $self->_get_element($node_top);
die "BUG: No element for top node" if (!defined($node_top));
$self->_set_element_file($node_top_element, $top_node_filename);
@@ -690,57 +671,46 @@ sub _set_pages_files($$)
}
if (!defined($element->{'extra'}->{'first_in_page'}->{'filename'})) {
my $file_element = $element->{'extra'}->{'first_in_page'};
- if ($self->get_conf('NODE_FILENAMES')) {
- foreach my $root_command (@{$file_element->{'contents'}}) {
- if ($root_command->{'cmdname'}
- and $root_command->{'cmdname'} eq 'node') {
- my $node_filename;
- # double node are not normalized, they are handled here
- if (!defined($root_command->{'extra'}->{'normalized'})
- or !defined($self->{'labels'}->{$root_command->{'extra'}->{'normalized'}})) {
- $node_filename = 'unknown_node';
- } else {
- $node_filename = $self->_node_filename($root_command->{'extra'});
- }
- $node_filename .= '.'.$self->get_conf('NODE_FILE_EXTENSION')
- if (defined($self->get_conf('NODE_FILE_EXTENSION'))
- and $self->get_conf('NODE_FILE_EXTENSION') ne '');
- $self->_set_element_file($file_element, $node_filename);
- last;
+ foreach my $root_command (@{$file_element->{'contents'}}) {
+ if ($root_command->{'cmdname'}
+ and $root_command->{'cmdname'} eq 'node') {
+ my $node_filename;
+ # double node are not normalized, they are handled here
+ if (!defined($root_command->{'extra'}->{'normalized'})
+ or !defined($self->{'labels'}->{$root_command->{'extra'}->{'normalized'}})) {
+ $node_filename = 'unknown_node';
+ } else {
+ $node_filename = $self->_node_filename($root_command->{'extra'});
}
+ $node_filename .= $extension;
+ $self->_set_element_file($file_element, $node_filename);
+ last;
}
- if (!defined($file_element->{'filename'})) {
- # use section to do the file name if there is no node
- my $command = $self->element_command($file_element);
- if ($command) {
- if ($command->{'cmdname'} eq 'top' and !$node_top
- and defined($top_node_filename)) {
- $self->_set_element_file($file_element, $top_node_filename);
- } else {
- my ($normalized_name, $filename)
- = $self->_sectioning_command_normalized_filename($command);
- $self->_set_element_file($file_element, $filename)
- }
+ }
+ if (!defined($file_element->{'filename'})) {
+ # use section to do the file name if there is no node
+ my $command = $self->element_command($file_element);
+ if ($command) {
+ if ($command->{'cmdname'} eq 'top' and !$node_top
+ and defined($top_node_filename)) {
+ $self->_set_element_file($file_element, $top_node_filename);
+ } else {
+ my ($normalized_name, $filename)
+ = $self->_sectioning_command_normalized_filename($command);
+ $self->_set_element_file($file_element, $filename)
+ }
+ } else {
+ # when everything else has failed
+ if ($file_nr == 0 and !$node_top
+ and defined($top_node_filename)) {
+ $self->_set_element_file($file_element, $top_node_filename);
} else {
- # when everything else has failed
- if ($file_nr == 0 and !$node_top
- and defined($top_node_filename)) {
- $self->_set_element_file($file_element, $top_node_filename);
- } else {
- my $filename = $self->{'document_name'} . "_$file_nr";
- $filename .= $extension;
- $self->_set_element_file($element, $filename);
- }
- $file_nr++;
+ my $filename = $self->{'document_name'} . "_$file_nr";
+ $filename .= $extension;
+ $self->_set_element_file($element, $filename);
}
+ $file_nr++;
}
- } else {
- my $filename = $self->{'document_name'} . "_$file_nr";
- $filename .= '.'.$self->get_conf('EXTENSION')
- if (defined($self->get_conf('EXTENSION'))
- and $self->get_conf('EXTENSION') ne '');
- $self->_set_element_file($file_element, $filename);
- $file_nr++;
}
}
$element->{'filename'}
@@ -777,13 +747,6 @@ sub output($$)
if ($self->get_conf('SPLIT')) {
$self->set_conf('NODE_FILES', 1);
}
- if ($self->get_conf('NODE_FILES')
- or ($self->get_conf('SPLIT') and $self->get_conf('SPLIT') eq 'node')) {
- $self->set_conf('NODE_FILENAMES', 1);
- }
- if ($self->get_conf('NODE_FILENAMES') and defined($self->get_conf('EXTENSION'))) {
- $self->set_conf('NODE_FILE_EXTENSION', $self->get_conf('EXTENSION'));
- }
$self->_set_outfile();
return undef unless $self->_create_destination_directory();
@@ -1085,19 +1048,6 @@ sub _collect_leading_trailing_spaces_arg($$)
return @result;
}
-sub _register_command_arg($$$)
-{
- my ($self, $current, $type) = @_;
-
- my @contents = @{$current->{'contents'}};
- Texinfo::Common::trim_spaces_comment_from_content(\@contents);
- if (scalar(@contents)) {
- push @{$current->{'parent'}->{'extra'}->{$type}}, \@contents;
- } else {
- push @{$current->{'parent'}->{'extra'}->{$type}}, undef;
- }
-}
-
sub _table_item_content_tree($$$)
{
my $self = shift;
@@ -1348,6 +1298,8 @@ sub sort_element_counts($$;$$)
my $max_count = 0;
my @name_counts_array;
+
+ require Texinfo::Convert::Texinfo;
foreach my $element (@$elements) {
my $name = 'UNNAMED element';
if ($element->{'extra'}
@@ -1404,6 +1356,21 @@ sub xml_protect_text($$)
return $text;
}
+# Add any index sub-entries specified with @subentry, separated by commas.
+sub convert_index_subentries {
+ my ($self, $entry) = @_;
+
+ my $result = '';
+ my $tmp = $entry->{'command'};
+ while ($tmp->{'extra'} and $tmp->{'extra'}->{'subentry'}) {
+ $tmp = $tmp->{'extra'}->{'subentry'};
+ $result .= $self->_convert({'text' => ', '});
+ $result .= $self->_convert($tmp->{'args'}->[0]);
+ }
+ return $result;
+}
+
+
# 'today' is not set here.
our %default_xml_commands_formatting;
$default_xml_commands_formatting{'normal'} = {
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm
index 8b220ab323..3b30955a53 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm
@@ -47,7 +47,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
my $nbsp = '&#'.hex('00A0').';';
my $mdash = '&#'.hex('2014').';';
@@ -407,13 +407,42 @@ sub _index_entry($$)
if ($root->{'extra'} and $root->{'extra'}->{'index_entry'}) {
my $index_entry = $root->{'extra'}->{'index_entry'};
# FIXME DocBook 5 role->type
- my $result = "<indexterm role=\"$index_entry->{'index_name'}\"><primary>";
+ my $result = "<indexterm role=\"$index_entry->{'index_name'}\">";
+
push @{$self->{'document_context'}}, {'monospace' => [0], 'upper_case' => [0]};
$self->{'document_context'}->[-1]->{'monospace'}->[-1] = 1
if ($index_entry->{'in_code'});
+
+ $result .= "<primary>";
$result .= $self->_convert({'contents' => $index_entry->{'content'}});
+ $result .= "</primary>";
+
+ # Add any index subentries.
+ my $tmp = $index_entry->{'command'};
+ my $level = "secondary";
+ while ($tmp->{'extra'}->{'subentry'}) {
+ $result .= "<$level>";
+ $tmp = $tmp->{'extra'}->{'subentry'};
+ $result .= $self->_convert($tmp->{'args'}->[0]);
+ $result .= "</$level>";
+ $level = "tertiary";
+ }
+
+ if ($index_entry->{'command'}->{'extra'}->{'seeentry'}) {
+ $result .= "<see>";
+ $result .= $index_entry->{'command'}->{'extra'}->{'seeentry'};
+ $result .= "</see>";
+ }
+ if ($index_entry->{'command'}->{'extra'}->{'seealso'}) {
+ $result .= "<seealso>";
+ $result .= $index_entry->{'command'}->{'extra'}->{'seealso'};
+ $result .= "</seealso>";
+ }
+
pop @{$self->{'document_context'}};
- return $result ."</primary></indexterm>"
+
+ $result .= "</indexterm>";
+ return $result;
}
return '';
}
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm
index d2bb7af0c6..80dc1a9d8c 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm
@@ -14,6 +14,22 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Formatting functions, registered in %default_types_conversion
+# should not have side effects, such that users can overrides
+# them independently without risking unwanted results. Also in
+# formatting functions, the state of the converter should only
+# be accessed through functions, such as in_math, in_preformatted,
+# preformatted_classes_stack and similar functions.
+#
+# In most formatting functions, the case where $self->in_string() is
+# true should be handled explicitely and the simplest formatting should be
+# done in that case, without any HTML element such that the result
+# can be in an attribute or in a comment.
+#
+# FIXME: there is already a case with a side effect, with the
+# variable $html_menu_entry_index.
#
# Original author: Patrice Dumas <pertusus@free.fr>
@@ -55,7 +71,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
# misc commands that are of use for formatting.
my %formatting_misc_commands = %Texinfo::Convert::Text::formatting_misc_commands;
@@ -174,6 +190,17 @@ sub preformatted_number($)
return $self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'preformatted_number'};
}
+sub count_elements_in_filename($$)
+{
+ my $self = shift;
+ my $filename = shift;
+
+ if (defined($self->{'elements_in_file_count'}->{$filename})) {
+ return $self->{'elements_in_file_count'}->{$filename};
+ }
+ return undef;
+}
+
sub top_format($)
{
my $self = shift;
@@ -376,7 +403,7 @@ sub command_href($$;$$)
$filename = $self->{'current_filename'} if (!defined($filename));
- if ($command->{'manual_content'} or $command->{'top_node_up'}) {
+ if ($command->{'manual_content'}) {
return $self->_external_node_href($command, $filename, $link_command);
}
@@ -399,6 +426,16 @@ sub command_href($$;$$)
if (!defined($filename)
or $filename ne $target_filename) {
$href .= $target_filename;
+ # omit target if the command is an element command, there is only
+ # one element in file and there is a file in the href
+ if (defined($filename)
+ and defined($self->command_element_command($command))
+ and $self->command_element_command($command) eq $command) {
+ my $count_elements_in_file = $self->count_elements_in_filename($target_filename);
+ if (defined($count_elements_in_file) and $count_elements_in_file == 1) {
+ $target = '';
+ }
+ }
}
}
$href .= '#' . $target if ($target ne '');
@@ -444,7 +481,7 @@ sub command_contents_href($$$$)
# 'tree' - return a tree
# 'tree_nonumber' - return tree representing text without a chapter number
# being included.
-# 'string'
+# 'string' - return simpler text that can be used in element attributes
sub command_text($$;$)
{
my $self = shift;
@@ -458,7 +495,7 @@ sub command_text($$;$)
cluck "in command_text($type) command not defined";
}
- if ($command->{'manual_content'} or $command->{'top_node_up'}) {
+ if ($command->{'manual_content'}) {
my $node_content = [];
$node_content = $command->{'node_content'}
if (defined($command->{'node_content'}));
@@ -924,8 +961,6 @@ my %defaults = (
'ENABLE_ENCODING' => 0,
'SHOW_MENU' => 1,
'OUTPUT_ENCODING_NAME' => 'utf-8',
- #'encoding_name' => undef,
- #'perl_encoding' => undef,
'OUTFILE' => undef,
'SUBDIR' => undef,
'USE_NODES' => 1,
@@ -940,11 +975,9 @@ my %defaults = (
'OPEN_QUOTE_SYMBOL' => '&lsquo;',
'CLOSE_QUOTE_SYMBOL' => '&rsquo;',
'USE_ISO' => 1,
-# file name used for Top node when NODE_FILENAMES is true
- 'TOP_NODE_FILE' => 'index',
- 'NODE_FILE_EXTENSION' => 'html',
+ 'TOP_FILE' => 'index.html',
'EXTENSION' => 'html',
- 'TOP_NODE_FILE_TARGET' => 'index',
+ 'TOP_NODE_FILE_TARGET' => 'index.html',
'TRANSLITERATE_FILE_NAMES' => 1,
'USE_LINKS' => 1,
'USE_NUMERIC_ENTITY' => 1,
@@ -1640,7 +1673,7 @@ sub _convert_footnote_command($$$$)
}
}
- $foot_lines .= '<h3>' .
+ $foot_lines .= '<h5>' .
"<a id=\"$footid\" href=\"$document_filename#$docid\">($number_in_doc)</a></h3>\n"
. $footnote_text;
@@ -2368,22 +2401,6 @@ sub _convert_heading_command($$$$$)
}
$result .= $content if (defined($content));
- if ($cmdname ne 'node'
- and $self->{'current_node'}
- and !$self->{'seenmenus'}->{$self->{'current_node'}}) {
- $self->{'seenmenus'}->{$self->{'current_node'}} = 1;
- # Generate a menu for this node.
- my $menu_text;
- my $menu_node = Texinfo::Structuring::section_menu_of_node (undef,
- $command->{'extra'}{'associated_node'});
- if ($menu_node) {
- $menu_text = _convert ($self, $menu_node);
- if ($menu_text) {
- $result .= $menu_text;
- $result .= "\n";
- }
- }
- }
return $result;
}
@@ -2759,6 +2776,9 @@ sub _convert_menu_command($$$$)
if ($content !~ /\S/) {
return '';
}
+ # This can probably only happen with incorrect input,
+ # for instance menu in copying
+ # FIXME check?
if ($self->in_string()) {
return $content;
}
@@ -2768,9 +2788,6 @@ sub _convert_menu_command($$$$)
$begin_row = '<tr><td>';
$end_row = '</td></tr>';
}
- if ($self->{'current_node'}) {
- $self->{'seenmenus'}->{$self->{'current_node'}} = 1;
- }
return $self->_attribute_class('table', 'menu')
." border=\"0\" cellspacing=\"0\">${begin_row}\n"
. $content . "${end_row}</table>\n";
@@ -2940,7 +2957,7 @@ sub _convert_enumerate_command($$$$)
if ($content eq '') {
return '';
}
- my $specification = $command->{'extra'}{'enumerate_specification'};
+ my $specification = $command->{'extra'}->{'enumerate_specification'};
if (defined $specification) {
my ($start, $type);
if ($specification =~ /^\d*$/ and $specification ne '1') {
@@ -3481,6 +3498,7 @@ sub _convert_printindex_command($$$$)
} else {
$entry = $self->convert_tree({'contents' => $index_entry_ref->{'content'}});
}
+ $entry .= $self->convert_index_subentries($index_entry_ref);
if ($already_formatted) {
$self->{'ignore_notice'}--;
}
@@ -3857,7 +3875,7 @@ sub _convert_menu_entry_type($$$)
my $command = shift;
my $href;
- my $node;
+ my $rel = '';
my $section;
my $node_entry = $command->{'extra'}->{'menu_entry_node'};
# external node
@@ -3866,7 +3884,7 @@ sub _convert_menu_entry_type($$$)
$href = $self->command_href($node_entry, undef, $command);
$external_node = 1;
} else {
- $node = $self->label_command($node_entry->{'normalized'});
+ my $node = $self->label_command($node_entry->{'normalized'});
# if !NODE_NAME_IN_MENU, we pick the associated section, except if
# the node is the element command
if ($node->{'extra'}->{'associated_section'}
@@ -3877,6 +3895,11 @@ sub _convert_menu_entry_type($$$)
} else {
$href = $self->command_href($node, undef, $command);
}
+ if ($node->{'extra'}->{'isindex'}) {
+ # Mark the target as an index. See
+ # http://microformats.org/wiki/existing-rel-values#HTML5_link_type_extensions
+ $rel = ' rel="index"';
+ }
}
$html_menu_entry_index++;
@@ -3899,7 +3922,7 @@ sub _convert_menu_entry_type($$$)
my $name = $self->convert_tree(
{'type' => '_code', 'contents' => $arg->{'contents'}});
if ($href ne '' and !$self->in_string()) {
- $result .= "<a href=\"$href\"$accesskey>".$name."</a>";
+ $result .= "<a href=\"$href\"$rel$accesskey>".$name."</a>";
} else {
$result .= $name;
}
@@ -3936,16 +3959,11 @@ sub _convert_menu_entry_type($$$)
my $name;
my $name_no_number;
if ($section) {
- #my $section_name = $self->command_text($section);
$name = $self->command_text($section);
$name_no_number = $self->command_text($section, 'text_nonumber');
if ($href ne '' and $name ne '') {
- #$name = "<a href=\"$href\"$accesskey>".$section_name."</a>";
- $name = "<a href=\"$href\"$accesskey>".$name."</a>";
- }# else {
- # $name = $section_name;
- #}
- #$name = "$MENU_SYMBOL ".$name if ($section_name eq $name_no_number);
+ $name = "<a href=\"$href\"$rel$accesskey>".$name."</a>";
+ }
}
if (!defined($name) or $name eq '') {
if ($command->{'extra'}->{'menu_entry_name'}) {
@@ -3963,7 +3981,7 @@ sub _convert_menu_entry_type($$$)
$name =~ s/^\s*//;
$name_no_number = $name;
if ($href ne '') {
- $name = "<a href=\"$href\"$accesskey>".$name."</a>";
+ $name = "<a href=\"$href\"$rel$accesskey>".$name."</a>";
}
$name = "$MENU_SYMBOL ".$name;
}
@@ -4749,9 +4767,6 @@ sub converter_initialize($)
{
my $self = shift;
- if ($self->get_conf('SHORTEXTN')) {
- $self->set_conf('EXTENSION', 'htm');
- }
$foot_num = 0;
$foot_lines = '';
%formatted_index_entries = ();
@@ -4878,9 +4893,6 @@ sub converter_initialize($)
= $default_formatting_references{$formatting_reference};
}
}
- if ($Texinfo::Config::renamed_nodes) {
- %{$self->{'renamed_nodes'}} = %{$Texinfo::Config::renamed_nodes};
- }
$self->{'document_context'} = [];
$self->{'multiple_pass'} = [];
@@ -5212,6 +5224,8 @@ sub _new_sectioning_command_target($$)
# * the target, id and normalized filename of 'labels', ie everything that
# may be the target of a ref, like @node, @float, @anchor...
# conversion to HTML is done on-demand, upon call to command_text.
+# Note that 'node_filename', which is set here for Top too, is not
+# used later for Top, see the NOTE below.
sub _set_root_commands_targets_node_files($$)
{
my $self = shift;
@@ -5221,12 +5235,14 @@ sub _set_root_commands_targets_node_files($$)
$no_unidecode = 1 if (defined($self->get_conf('USE_UNIDECODE'))
and !$self->get_conf('USE_UNIDECODE'));
+ my $extension = '';
+ $extension = '.'.$self->get_conf('EXTENSION')
+ if (defined($self->get_conf('EXTENSION'))
+ and $self->get_conf('EXTENSION') ne '');
if ($self->{'labels'}) {
foreach my $root_command (values(%{$self->{'labels'}})) {
my ($filename, $target) = $self->_node_id_file($root_command->{'extra'});
- $filename .= '.'.$self->get_conf('NODE_FILE_EXTENSION')
- if (defined($self->get_conf('NODE_FILE_EXTENSION'))
- and $self->get_conf('NODE_FILE_EXTENSION') ne '');
+ $filename .= $extension;
if (defined($Texinfo::Config::node_file_name)) {
$filename = &$Texinfo::Config::node_file_name($self, $root_command,
$filename);
@@ -5343,8 +5359,7 @@ sub _set_pages_files($$)
my $top_node_filename = $self->_top_node_filename();
# first determine the top node file name.
- if ($self->get_conf('NODE_FILENAMES') and $node_top
- and defined($top_node_filename)) {
+ if ($node_top and defined($top_node_filename)) {
my ($node_top_element) = $self->_get_element($node_top);
die "BUG: No element for top node" if (!defined($node_top));
$self->_set_element_file($node_top_element, $top_node_filename);
@@ -5359,65 +5374,54 @@ sub _set_pages_files($$)
}
if (!defined($element->{'extra'}->{'first_in_page'}->{'filename'})) {
my $file_element = $element->{'extra'}->{'first_in_page'};
- if ($self->get_conf('NODE_FILENAMES')) {
- foreach my $root_command (@{$file_element->{'contents'}}) {
- if ($root_command->{'cmdname'}
- and $root_command->{'cmdname'} eq 'node') {
- my $node_filename;
- # double node are not normalized, they are handled here
- if (!defined($root_command->{'extra'}->{'normalized'})
- or !defined($self->{'labels'}->{$root_command->{'extra'}->{'normalized'}})) {
- $node_filename = 'unknown_node';
- $node_filename .= '.'.$self->get_conf('NODE_FILE_EXTENSION')
- if (defined($self->get_conf('NODE_FILE_EXTENSION'))
- and $self->get_conf('NODE_FILE_EXTENSION') ne '');
- } else {
- if (!defined($self->{'targets'}->{$root_command})
- or !defined($self->{'targets'}->{$root_command}->{'node_filename'})) {
- # Could have been a double node, thus use equivalent node.
- # However since double nodes are not normalized, in fact it
- # never happens.
- $root_command
- = $self->{'labels'}->{$root_command->{'extra'}->{'normalized'}};
- }
- $node_filename
- = $self->{'targets'}->{$root_command}->{'node_filename'};
+ foreach my $root_command (@{$file_element->{'contents'}}) {
+ if ($root_command->{'cmdname'}
+ and $root_command->{'cmdname'} eq 'node') {
+ my $node_filename;
+ # double node are not normalized, they are handled here
+ if (!defined($root_command->{'extra'}->{'normalized'})
+ or !defined($self->{'labels'}->{$root_command->{'extra'}->{'normalized'}})) {
+ $node_filename = 'unknown_node';
+ $node_filename .= $extension;
+ } else {
+ if (!defined($self->{'targets'}->{$root_command})
+ or !defined($self->{'targets'}->{$root_command}->{'node_filename'})) {
+ # Could have been a double node, thus use equivalent node.
+ # However since double nodes are not normalized, in fact it
+ # never happens.
+ $root_command
+ = $self->{'labels'}->{$root_command->{'extra'}->{'normalized'}};
}
- $self->_set_element_file($file_element, $node_filename);
- last;
+ $node_filename
+ = $self->{'targets'}->{$root_command}->{'node_filename'};
}
+ $self->_set_element_file($file_element, $node_filename);
+ last;
}
- if (!defined($file_element->{'filename'})) {
- # use section to do the file name if there is no node
- my $command = $self->element_command($file_element);
- if ($command) {
- if ($command->{'cmdname'} eq 'top' and !$node_top
- and defined($top_node_filename)) {
- $self->_set_element_file($file_element, $top_node_filename);
- } else {
- $self->_set_element_file($file_element,
- $self->{'targets'}->{$command}->{'section_filename'});
- }
+ }
+ if (!defined($file_element->{'filename'})) {
+ # use section to do the file name if there is no node
+ my $command = $self->element_command($file_element);
+ if ($command) {
+ if ($command->{'cmdname'} eq 'top' and !$node_top
+ and defined($top_node_filename)) {
+ $self->_set_element_file($file_element, $top_node_filename);
} else {
- # when everything else has failed
- if ($file_nr == 0 and !$node_top
- and defined($top_node_filename)) {
- $self->_set_element_file($file_element, $top_node_filename);
- } else {
- my $filename = $self->{'document_name'} . "_$file_nr";
- $filename .= $extension;
- $self->_set_element_file($element, $filename);
- }
- $file_nr++;
+ $self->_set_element_file($file_element,
+ $self->{'targets'}->{$command}->{'section_filename'});
+ }
+ } else {
+ # when everything else has failed
+ if ($file_nr == 0 and !$node_top
+ and defined($top_node_filename)) {
+ $self->_set_element_file($file_element, $top_node_filename);
+ } else {
+ my $filename = $self->{'document_name'} . "_$file_nr";
+ $filename .= $extension;
+ $self->_set_element_file($element, $filename);
}
+ $file_nr++;
}
- } else {
- my $filename = $self->{'document_name'} . "_$file_nr";
- $filename .= '.'.$self->get_conf('EXTENSION')
- if (defined($self->get_conf('EXTENSION'))
- and $self->get_conf('EXTENSION') ne '');
- $self->_set_element_file($file_element, $filename);
- $file_nr++;
}
}
$element->{'filename'}
@@ -5820,21 +5824,6 @@ sub _external_node_href($$$$)
my $filename = shift;
my $link_command = shift;
- # This only overrides an implicit pointer to (dir) as the Top node's Up.
- # It has no effect if a pointer is explicitly specified,
- # or if implicit pointers aren't being created (e.g., just a Top node).
- if ($external_node->{'top_node_up'}
- and defined($self->get_conf('TOP_NODE_UP_URL'))) {
- return $self->get_conf('TOP_NODE_UP_URL');
- }
-
- # In addition to that implicit (dir) as the Top node's Up, replace all
- # other references to external file "dir" with the same TOP_NODE_UP_URL.
- if (defined($self->get_conf('TOP_NODE_UP_URL'))
- and $external_node->{'manual_content'}[0]->{'text'} eq "dir") {
- return $self->get_conf('TOP_NODE_UP_URL');
- }
-
#print STDERR "external_node: ".join('|', keys(%$external_node))."\n";
my ($target_filebase, $target) = $self->_node_id_file($external_node);
@@ -5842,10 +5831,7 @@ sub _external_node_href($$$$)
my $default_target_split = $self->get_conf('EXTERNAL_CROSSREF_SPLIT');
- my $extension = '';
- $extension = "." . $self->get_conf('NODE_FILE_EXTENSION')
- if (defined($self->get_conf('NODE_FILE_EXTENSION'))
- and $self->get_conf('NODE_FILE_EXTENSION') ne '');
+ my $external_file_extension = '.html';
my $target_split;
my $file;
@@ -5855,7 +5841,7 @@ sub _external_node_href($$$$)
{ 'code' => 1,
Texinfo::Common::_convert_text_options($self)});
my $manual_base = $manual_name;
- $manual_base =~ s/\.[^\.]*$//;
+ $manual_base =~ s/\.info*$//;
$manual_base =~ s/^.*\///;
my $document_split = $self->get_conf('SPLIT');
$document_split = 'mono' if (!$document_split);
@@ -5875,8 +5861,7 @@ sub _external_node_href($$$$)
$target_split = 1 unless ($split_found eq 'mono');
} else { # nothing specified for that manual, use default
$target_split = $default_target_split;
- if ($self->get_conf('CHECK_HTMLXREF')
- and !$external_node->{'top_node_up'}) {
+ if ($self->get_conf('CHECK_HTMLXREF')) {
if (defined($link_command) and $link_command->{'line_nr'}) {
$self->line_warn(sprintf(__(
"no htmlxref.cnf entry found for `%s'"), $manual_name),
@@ -5910,7 +5895,7 @@ sub _external_node_href($$$$)
} else {
$file = $manual_base;
}
- $file .= $extension;
+ $file .= $external_file_extension;
}
}
} else {
@@ -5921,8 +5906,7 @@ sub _external_node_href($$$$)
if ($target eq '') {
if ($target_split) {
if (defined($self->get_conf('TOP_NODE_FILE_TARGET'))) {
- return $file . $self->get_conf('TOP_NODE_FILE_TARGET')
- . $extension;# . '#Top';
+ return $file . $self->get_conf('TOP_NODE_FILE_TARGET');
} else {
return $file;# . '#Top';
}
@@ -5934,13 +5918,13 @@ sub _external_node_href($$$$)
if (! $target_split) {
return $file . '#' . $xml_target;
} else {
- my $file_basename;
+ my $file_name;
if ($target eq 'Top' and defined($self->get_conf('TOP_NODE_FILE_TARGET'))) {
- $file_basename = $self->get_conf('TOP_NODE_FILE_TARGET');
+ $file_name = $self->get_conf('TOP_NODE_FILE_TARGET');
} else {
- $file_basename = $target_filebase;
+ $file_name = $target_filebase . $external_file_extension;
}
- return $file . $file_basename . $extension . '#' . $xml_target;
+ return $file . $file_name . '#' . $xml_target;
}
}
@@ -5957,6 +5941,13 @@ foreach my $no_number_type ('text', 'tree', 'string') {
$valid_types{$no_number_type .'_nonumber'} = 1;
}
+# $element can be undef.
+# $element undef happens at least when there is no output file, or for
+# the table of content when frames are used. That call would result
+# for instance from _element_direction being called from _get_links,
+# itself called from 'format_begin_file' which, in the default case
+# points to _default_begin_file.
+# TODO are there other cases?
sub _element_direction($$$$;$)
{
my $self = shift;
@@ -5982,6 +5973,21 @@ sub _element_direction($$$$;$)
and $element->{'extra'}->{'directions'}->{$direction}) {
$element_target
= $element->{'extra'}->{'directions'}->{$direction};
+ # output TOP_NODE_UP related infos even if element is not
+ # defined which should mostly correspond to cases when there is no
+ # output file, for example in the tests.
+ } elsif ((not defined($element)
+ or ($element and $self->element_is_top($element)))
+ and defined($self->get_conf('TOP_NODE_UP_URL'))
+ and ($direction eq 'Up' or $direction eq 'NodeUp')) {
+ if ($type eq 'href') {
+ return $self->get_conf('TOP_NODE_UP_URL');
+ } elsif ($type eq 'text' or $type eq 'node' or $type eq 'string') {
+ return $self->get_conf('TOP_NODE_UP');
+ } else {
+ cluck("type $type not available for TOP_NODE_UP\n");
+ return '';
+ }
}
if ($element_target) {
@@ -5992,8 +5998,7 @@ sub _element_direction($$$$;$)
. "directions :". Texinfo::Structuring::_print_directions($element);
}
########
- if ($element_target->{'type'} eq 'external_node'
- or $element_target->{'type'} eq 'top_node_up') {
+ if ($element_target->{'type'} eq 'external_node') {
my $external_node = $element_target->{'extra'};
if ($type eq 'href') {
return $self->command_href($external_node, $filename);
@@ -6106,13 +6111,19 @@ sub _default_contents($$;$$)
if ($toc_id ne '' or $href ne '') {
my $toc_name_attribute = '';
if ($toc_id ne '') {
- $toc_name_attribute = "id=\"$toc_id\" ";
+ $toc_name_attribute = " id=\"$toc_id\"";
}
my $href_attribute = '';
if ($href ne '') {
- $href_attribute = "href=\"$href\"";
+ $href_attribute = " href=\"$href\"";
+ }
+ my $rel = '';
+ if ($section->{'extra'}
+ and $section->{'extra'}->{'associated_node'}
+ and $section->{'extra'}->{'associated_node'}->{'extra'}->{'isindex'}) {
+ $rel = ' rel="index"';
}
- $result .= "<li><a ${toc_name_attribute}${href_attribute}>$text</a>";
+ $result .= "<li><a${toc_name_attribute}${href_attribute}$rel>$text</a>";
} else {
$result .= "<li>$text";
}
@@ -6207,9 +6218,9 @@ $pre_body_close
";
}
-# This is used for normal output files and other files, like renamed
-# nodes file headers, or redirection file headers. $COMMAND is the tree
-# element for a @node that is being output in the file.
+# This is used for normal output files and other files, like
+# redirection file headers. $COMMAND is the tree element for
+# a @node that is being output in the file.
sub _file_header_informations($$)
{
my $self = shift;
@@ -6309,7 +6320,7 @@ sub _get_links ($$$)
foreach my $link (@$link_buttons) {
my $link_href = $self->_element_direction($element,
$link, 'href', $filename);
- #print STDERR "$title: $link -> $link_href \n";
+ #print STDERR "$link -> $link_href \n";
if ($link_href and $link_href ne '') {
my $link_string = $self->_element_direction($element,
$link, 'string');
@@ -6707,9 +6718,10 @@ foreach my $stage (@possible_stages) {
$possible_stages{$stage} = 1;
}
-sub run_stage_handlers($$)
+sub run_stage_handlers($$$)
{
my $converter = shift;
+ my $root = shift;
my $stage = shift;
die if (!$possible_stages{$stage});
@@ -6721,7 +6733,7 @@ sub run_stage_handlers($$)
if ($converter->get_conf('DEBUG')) {
print STDERR "HANDLER($stage) , priority $priority: $handler\n";
}
- my $status = &{$handler}($converter, $stage);
+ my $status = &{$handler}($converter, $root, $stage);
if (!$status) {
#if ($converter->get_conf('VERBOSE')) {
# print STDERR "Handler $handler of $stage($priority) failed\n";
@@ -6808,15 +6820,12 @@ sub output($$)
if ($self->get_conf('SPLIT')) {
$self->set_conf('NODE_FILES', 1);
}
- if ($self->get_conf('NODE_FILES') or $self->get_conf('SPLIT') eq 'node') {
- $self->set_conf('NODE_FILENAMES', 1);
- }
if ($self->get_conf('FRAMES')) {
$self->set_conf('shortcontents', 1);
}
$self->set_conf('EXTERNAL_CROSSREF_SPLIT', $self->get_conf('SPLIT'));
- my $setup_status = $self->run_stage_handlers('setup');
+ my $setup_status = $self->run_stage_handlers($root, 'setup');
return undef unless($setup_status);
$self->_prepare_css();
@@ -6826,13 +6835,6 @@ sub output($$)
$self->_set_outfile();
return undef unless $self->_create_destination_directory();
- # collect renamed nodes
- ($self->{'renamed_nodes'}, $self->{'renamed_nodes_lines'},
- $self->{'renamed_nodes_file'})
- = Texinfo::Common::collect_renamed_nodes($self, $self->{'input_basename_name'},
- $self->{'renamed_nodes'});
-
-
# Get the list of "elements" to be processed, i.e. nodes or sections.
# This should return undef if called on a tree without node or sections.
my ($elements, $special_elements) = $self->_prepare_elements($root);
@@ -6873,8 +6875,14 @@ sub output($$)
$self->_prepare_index_entries();
$self->_prepare_footnotes();
+
+ # 'file_counters' is dynamic, decreased when the element is encountered
+ # 'elements_in_file_count' is not modified afterwards
+ foreach my $filename (keys(%{$self->{'file_counters'}})) {
+ $self->{'elements_in_file_count'}->{$filename} = $self->{'file_counters'}->{$filename};
+ }
- my $structure_status = $self->run_stage_handlers('structure');
+ my $structure_status = $self->run_stage_handlers($root, 'structure');
return undef unless($structure_status);
&{$self->{'format_css_lines'}}($self);
@@ -6963,7 +6971,7 @@ sub output($$)
chomp($self->{'documentdescription_string'});
}
- my $init_status = $self->run_stage_handlers('init');
+ my $init_status = $self->run_stage_handlers($root, 'init');
return undef unless($init_status);
if ($self->get_conf('FRAMES')) {
@@ -7092,9 +7100,13 @@ sub output($$)
}
}
- my $finish_status = $self->run_stage_handlers('finish');
+ my $finish_status = $self->run_stage_handlers($root, 'finish');
return undef unless($finish_status);
+ my $extension = '';
+ $extension = '.'.$self->get_conf('EXTENSION')
+ if (defined($self->get_conf('EXTENSION'))
+ and $self->get_conf('EXTENSION') ne '');
# do node redirection pages
$self->{'current_filename'} = undef;
if ($self->get_conf('NODE_FILES')
@@ -7112,12 +7124,7 @@ sub output($$)
if ($node->{'extra'} and $node->{'extra'}->{'normalized'}
and $node->{'extra'}->{'normalized'} eq 'Top'
and defined($self->get_conf('TOP_NODE_FILE_TARGET'))) {
- my $extension = '';
- $extension = "." . $self->get_conf('NODE_FILE_EXTENSION')
- if (defined($self->get_conf('NODE_FILE_EXTENSION'))
- and $self->get_conf('NODE_FILE_EXTENSION') ne '');
- $node_filename = $self->get_conf('TOP_NODE_FILE_TARGET')
- .$extension;
+ $node_filename = $self->get_conf('TOP_NODE_FILE_TARGET');
} else {
$node_filename = $target->{'node_filename'};
}
@@ -7151,128 +7158,6 @@ sub output($$)
}
}
}
- if ($self->{'renamed_nodes'}
- and $self->{'labels'} and $self->{'output_file'} ne '') {
- # do a fresh parser, to avoid, for example adding new labels if renamed
- # nodes incorrectly define anchors...
- my $parser_for_renamed_nodes;
- if ($self->{'parser'}) {
- $parser_for_renamed_nodes
- = Texinfo::Parser::duplicate_parser($self->{'parser'});
- }
- my %warned_new_node;
- foreach my $old_node_name (sort(keys(%{$self->{'renamed_nodes'}}))) {
- my $parsed_old_node = $self->_parse_node_and_warn_external(
- $old_node_name, $parser_for_renamed_nodes,
- $self->{'renamed_nodes_lines'}->{$old_node_name},
- $self->{'renamed_nodes_file'});
- if ($parsed_old_node) {
- if ($self->label_command($parsed_old_node->{'normalized'})) {
- $self->file_line_error(sprintf(__(
- "old name for `%s' is a node of the document"), $old_node_name),
- $self->{'renamed_nodes_file'},
- $self->{'renamed_nodes_lines'}->{$old_node_name});
- $parsed_old_node = undef;
- } elsif ($parsed_old_node->{'normalized'} !~ /[^-]/) {
- $self->file_line_error(sprintf(__(
- "file empty for renamed node `%s'"), $old_node_name),
- $self->{'renamed_nodes_file'},
- $self->{'renamed_nodes_lines'}->{$old_node_name});
- $parsed_old_node = undef;
- }
- }
- my $new_node_name = $self->{'renamed_nodes'}->{$old_node_name};
- my $parsed_new_node = $self->_parse_node_and_warn_external(
- $new_node_name, $parser_for_renamed_nodes,
- $self->{'renamed_nodes_lines'}->{$new_node_name},
- $self->{'renamed_nodes_file'});
- if (!$self->label_command($parsed_new_node->{'normalized'})) {
- if (!$warned_new_node{$new_node_name}) {
- $self->file_line_warn(sprintf(__(
- "target node (new name for `%s') not in document: %s"),
- $old_node_name, $new_node_name), $self->{'renamed_nodes_file'},
- $self->{'renamed_nodes_lines'}->{$new_node_name});
- $warned_new_node{$new_node_name} = 1;
- }
- $parsed_new_node = undef;
- }
- if ($parsed_new_node and $parsed_old_node) {
- my ($filename, $target) = $self->_node_id_file($parsed_old_node);
- $filename .= '.'.$self->get_conf('NODE_FILE_EXTENSION')
- if (defined($self->get_conf('NODE_FILE_EXTENSION'))
- and $self->get_conf('NODE_FILE_EXTENSION') ne '');
- my $redirection_page
- = &{$self->{'format_node_redirection_page'}}($self,
- $self->label_command($parsed_new_node->{'normalized'}));
- my $out_filename;
- if (defined($self->{'destination_directory'})
- and $self->{'destination_directory'} ne '') {
- $out_filename = File::Spec->catfile($self->{'destination_directory'},
- $filename);
- } else {
- $out_filename = $filename;
- }
- my $file_fh = $self->Texinfo::Common::open_out($out_filename);
- if (!$file_fh) {
- $self->document_error(sprintf(__("could not open %s for writing: %s"),
- $out_filename, $!));
- } else {
- print $file_fh $redirection_page;
- $self->register_close_file($out_filename);
- if (!close ($file_fh)) {
- $self->document_error(sprintf(__(
- "error on closing renamed node redirection file %s: %s"),
- $out_filename, $!));
- return undef;
- }
- }
- }
- }
- }
-}
-
-sub _parse_node_and_warn_external($$$$$)
-{
- my $self = shift;
- my $node_texi = shift;
- my $parser = shift;
- my $line_number = shift;
- my $file = shift;
-
- # NOTE nothing to check that there is an invalid nesting. Indeed, there
- # is no information given to the parser stating that we are in a label
- # command.
- # A possibility would be to consider
- # 'root_line' type as a $simple_text_command, or, to avoid spurious
- # messages, $full_text_command. This would imply really using
- # the gdt 4th argument to pass 'translated_paragraph' when in a
- # less constrained environment, for instance @center in @quotation for
- # @author
- #
- # it is unlikely, however that invalid nesting does much harm, since
- # the tree is mostly used to be normalized and this converter should
- # be rather foolproof.
- my $node_tree = Texinfo::Parser::parse_texi_line($parser,
- $node_texi, $line_number, $file);
- if ($node_tree) {
- my $node_normalized_result = Texinfo::Common::parse_node_manual(
- $node_tree);
- my $line_nr = {'line_nr' => $line_number, 'file_name' => $file };
- if (!$node_normalized_result) {
- $self->line_warn(__('empty node name'), $line_nr);
- } elsif ($node_normalized_result->{'manual_content'}) {
- $self->line_error(sprintf(__("syntax for an external node used for `%s'"),
- $node_texi), $line_nr);
-
- } else {
- if ($node_normalized_result->{'node_content'}) {
- $node_normalized_result->{'normalized'} =
- Texinfo::Convert::NodeNameNormalization::normalize_node(
- {'contents' => $node_normalized_result->{'node_content'}});
- }
- return $node_normalized_result;
- }
- }
return undef;
}
@@ -7586,6 +7471,9 @@ sub _convert($$;$)
if ($root->{'cmdname'} eq 'node') {
$self->{'current_node'} = $root;
}
+ elsif ($root->{'cmdname'} eq 'menu' and $self->{'current_node'}) {
+ $self->{'seenmenus'}->{$self->{'current_node'}} = 1;
+ }
# args are formatted, now format the command itself
my $result;
if ($args_formatted) {
@@ -7600,6 +7488,24 @@ sub _convert($$;$)
$result = &{$self->{'commands_conversion'}->{$command_name}}($self,
$command_name, $root, $content_formatted);
}
+ # FIXME add a configuration variable to be able turn automatically
+ # adding menus off?
+ if ($sectioning_commands{$command_name}
+ and $self->{'current_node'}
+ and !$self->{'seenmenus'}->{$self->{'current_node'}}) {
+ $self->{'seenmenus'}->{$self->{'current_node'}} = 1;
+ # Generate automatically a menu for this node.
+ my $menu_text;
+ my $menu_node = Texinfo::Structuring::section_menu_of_node (undef,
+ $root->{'extra'}->{'associated_node'});
+ if ($menu_node) {
+ $menu_text = _convert ($self, $menu_node);
+ if ($menu_text) {
+ $result .= $menu_text;
+ $result .= "\n";
+ }
+ }
+ }
return $result;
} else {
print STDERR "Unknown command `$command_name'\n"
@@ -7707,7 +7613,6 @@ sub _set_variables_texi2html()
['INLINE_CONTENTS', 0],
['FORCE', 1],
['AVOID_MENU_REDUNDANCY', 1],
- ['TOP_FILE', ''],
['USE_ACCESSKEY', 0],
['NODE_NAME_IN_MENU', 0],
['OVERVIEW_LINK_TO_TOC', 0],
@@ -7715,7 +7620,6 @@ sub _set_variables_texi2html()
['USE_REL_REV', 0],
['USE_LINKS', 0],
['USE_NODES', 0],
- ['NODE_FILENAMES', 0],
['USE_NUMERIC_ENTITY', 1],
['SPLIT', ''],
['SPLIT_INDEX', 100],
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/IXIN.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/IXIN.pm
index c1e9ab22d9..d89c32c896 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/IXIN.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/IXIN.pm
@@ -47,7 +47,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
my $ixin_version = 1;
@@ -848,8 +848,8 @@ sub output_ixin($$)
$blob_nr++;
if ($extension eq 'txt') {
binmode($filehandle, ":encoding("
- .$self->get_conf('INPUT_PERL_ENCODING').")")
- if (defined($self->get_conf('INPUT_PERL_ENCODING')));
+ .$self->{'info'}->{'input_perl_encoding'}
+ if (defined($self->{'info'}->{'input_perl_encoding'});
}
my $file_content;
if (-z $file) {
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/IXINSXML.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/IXINSXML.pm
index ac2264763f..3b536db5a8 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/IXINSXML.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/IXINSXML.pm
@@ -46,7 +46,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
my %defaults = (
'ENABLE_ENCODING' => 0,
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/Info.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/Info.pm
index 54ad8b7ca0..b1ea027c12 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/Info.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/Info.pm
@@ -43,7 +43,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
my $STDIN_DOCU_NAME = 'stdin';
@@ -52,6 +52,7 @@ $defaults{'SHOW_MENU'} = 1;
$defaults{'EXTENSION'} = 'info';
$defaults{'USE_SETFILENAME_EXTENSION'} = 1;
$defaults{'OUTFILE'} = undef;
+#$defaults{'TOP_NODE_UP'} = '(dir)';
sub converter_defaults($$)
{
@@ -448,6 +449,11 @@ sub _node($$)
$self->{'count_context'}->[-1]->{'bytes'} += $byte_count;
$result .= $node_text;
}
+ } elsif ($direction eq 'Up' and $node->{'extra'}->{'normalized'} eq 'Top') {
+ # add an up direction for Top node
+ my $text = ", $direction: ".$self->get_conf('TOP_NODE_UP');
+ $self->_add_text_count($text);
+ $result .= $text;
}
}
$result .="\n\n";
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm
index a2880ffe52..0f2e90cb71 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm
@@ -20,7 +20,7 @@ use 5.00405;
use strict;
use warnings;
-our $VERSION = '6.6';
+our $VERSION = '6.7';
use Texinfo::XSLoader;
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm
index 02c31b0220..8b72c239dc 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm
@@ -61,7 +61,7 @@ sub import {
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
# misc commands that are of use for formatting.
my %formatting_misc_commands = %Texinfo::Convert::Text::formatting_misc_commands;
@@ -398,20 +398,26 @@ sub converter_initialize($)
}
%{$self->{'style_map'}} = %style_map;
+ $self->{'convert_text_options'}
+ = {Texinfo::Common::_convert_text_options($self)};
+
if ($self->get_conf('ENABLE_ENCODING') and $self->get_conf('OUTPUT_ENCODING_NAME')
and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
# cache this to avoid redoing calls to get_conf
$self->{'to_utf8'} = 1;
-
- foreach my $quoted_command (@quoted_commands) {
- # Directed single quotes
- $self->{'style_map'}->{$quoted_command} = ["\x{2018}", "\x{2019}"];
+ if (!$self->{'extra'}->{'documentencoding'}) {
+ # Do not use curly quotes or some other unnecessary non-ASCII characters
+ # if '@documentencoding UTF-8' is not given.
+ $self->{'convert_text_options'}->{'no_extra_unicode'} = 1;
+ } else {
+ foreach my $quoted_command (@quoted_commands) {
+ # Directed single quotes
+ $self->{'style_map'}->{$quoted_command} = ["\x{2018}", "\x{2019}"];
+ }
+ # Directed double quotes
+ $self->{'style_map'}->{'dfn'} = ["\x{201C}", "\x{201D}"];
}
- # Directed double quotes
- $self->{'style_map'}->{'dfn'} = ["\x{201C}", "\x{201D}"];
}
- $self->{'convert_text_options'}
- = {Texinfo::Common::_convert_text_options($self)};
if (defined($self->get_conf('OPEN_QUOTE_SYMBOL'))) {
foreach my $quoted_command (@quoted_commands) {
$self->{'style_map'}->{$quoted_command}->[0]
@@ -565,7 +571,8 @@ sub _process_text($$$)
$text = uc($text);
}
- if ($self->{'to_utf8'}) {
+ if ($self->{'to_utf8'}
+ and $self->{'extra'}->{'documentencoding'}) {
return Texinfo::Convert::Unicode::unicode_text($text,
$context->{'font_type_stack'}->[-1]->{'monospace'});
} elsif (!$context->{'font_type_stack'}->[-1]->{'monospace'}) {
@@ -1235,9 +1242,18 @@ sub _printindex_formatted($$;$)
$entry_tree->{'type'} = 'frenchspacing';
}
my $entry_text = '';
- $entry_text .= $self->convert_line($entry_tree, {'indent' => 0,
- 'suppress_styles' => 1});
+
+ my $formatter = $self->new_formatter('line',
+ {'indent' => 0, 'suppress_styles' => 1});
+ push @{$self->{'formatters'}}, $formatter;
+ $entry_text = $self->_convert($entry_tree);
+ $entry_text .= $self->convert_index_subentries($entry);
+ $entry_text .= _count_added($self, $formatter->{'container'},
+ Texinfo::Convert::Paragraph::end($formatter->{'container'}));
+ pop @{$self->{'formatters'}};
+
next if ($entry_text !~ /\S/);
+
# FIXME protect instead
if ($entry_text =~ /:/ and $self->get_conf('INDEX_SPECIAL_CHARS_WARNING')) {
$self->line_warn (sprintf(__("Index entry in \@%s with : produces invalid Info: %s"),
@@ -1369,6 +1385,7 @@ sub ensure_end_of_line($$)
$self->{'count_context'}->[-1]->{'lines'} -= 1;
}
$text .= "\n";
+ $self->{'text_element_context'}->[-1]->{'counter'} = 0;
_add_text_count($self, "\n");
_add_lines_count($self, 1);
return $text;
@@ -2260,9 +2277,6 @@ sub _convert($$)
$arg = $root->{'args'}->[0]->{'contents'}->[0]->{'text'};
}
if ($arg) {
- # The general idea is to output UTF-8 if that has been
- # explicitly given as the encoding, else simple ASCII.
- #
# Syntactic checks on the value were already done in Parser.pm,
# but we have one more thing to test: since this is the one
# place where we might output actual UTF-8 binary bytes, we have
@@ -2270,12 +2284,9 @@ sub _convert($$)
# and will not output UTF-8 for Unicode non-characters such as
# U+10FFFF. In this case, silently fall back to plain text, on
# the theory that the user wants something.
- #
- # Having an option to output binary bytes nevertheless is
- # possible, but seems unlikely to be practically useful, so skip
- # it until it gets requested.
my $res;
if ($self->{'to_utf8'}) {
+ my $error = 0;
# The warning about non-characters is only given when the code
# point is attempted to be output, not just manipulated.
# http://stackoverflow.com/questions/5127725/how-could-i-catch-an-unicode-non-character-warning
@@ -2283,8 +2294,7 @@ sub _convert($$)
# Therefore, we have to try to output it within an eval.
# Since opening /dev/null or a temporary file means
# more system-dependent checks, use a string as our
- # filehandle; this was introduced ca.2000, which should be old
- # enough. We hope.
+ # filehandle.
eval {
use warnings FATAL => qw(all);
my ($fh, $string);
@@ -2294,7 +2304,15 @@ sub _convert($$)
};
if ($@) {
warn "\@U chr(hex($arg)) eval failed: $@\n" if ($self->{'DEBUG'});
- $res = "U+$arg"; # chr won't work
+ $error = 1;
+ } elsif (hex($arg) > 0x10FFFF) {
+ # The check above appears not to work in older versions of perl,
+ # so check the argument is not greater the maximum Unicode code
+ # point.
+ $error = 1;
+ }
+ if ($error) {
+ $res = "U+$arg";
} else {
$res = chr(hex($arg)); # ok to call chr
}
@@ -2706,8 +2724,11 @@ sub _convert($$)
} else {
$unknown_command = 1;
}
- if ($unknown_command and !($root->{'extra'}
- and $root->{'extra'}->{'index_entry'})
+ if ($unknown_command
+ and !($root->{'extra'}
+ and ($root->{'extra'}->{'index_entry'}
+ or $root->{'extra'}->{'seeentry'}
+ or $root->{'extra'}->{'seealso'}))
# commands like def*x are not processed above, since only the def_line
# associated is processed. If they have no name and no category they
# are not considered as index entries either so they have a specific
@@ -2938,6 +2959,11 @@ sub _convert($$)
my ($pre_quote, $post_quote);
if ($arg->{'type'} eq 'menu_entry_node') {
$self->{'formatters'}->[-1]->{'suppress_styles'} = 1;
+
+ # Flush a leading space
+ $result .= _count_added($self, $formatter->{'container'},
+ add_pending_word($formatter->{'container'}, 1));
+
my $node_text = _convert($self, {'type' => '_code',
'contents' => $arg->{'contents'}});
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/Texinfo.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/Texinfo.pm
index e691776e09..5ba330d9a3 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/Texinfo.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/Texinfo.pm
@@ -40,7 +40,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
my %misc_commands = %Texinfo::Common::misc_commands;
my %brace_commands = %Texinfo::Common::brace_commands;
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoSXML.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoSXML.pm
index c51924fcac..2166664e89 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoSXML.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoSXML.pm
@@ -43,7 +43,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
# SXML specific
my %defaults = (
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoXML.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoXML.pm
index 5baff7df3a..b065ffca2e 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/TexinfoXML.pm
@@ -45,7 +45,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
# XML specific
my %defaults = (
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/Text.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/Text.pm
index e90b1fa1d6..989f81688c 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/Text.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/Text.pm
@@ -47,7 +47,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
# this is in fact not needed for 'footnote', 'shortcaption', 'caption'
# when they have no brace_command_arg, see below.
@@ -246,8 +246,12 @@ sub brace_no_arg_command($;$)
if ($root->{'extra'}
and defined($root->{'extra'}->{'clickstyle'})
and defined($text_brace_no_arg_commands{$root->{'extra'}->{'clickstyle'}}));
- my $result = Texinfo::Convert::Unicode::unicode_for_brace_no_arg_command(
+ my $result;
+ if (!$options->{'no_extra_unicode'}
+ or !$Texinfo::Convert::Unicode::extra_unicode_map{$command}) {
+ $result = Texinfo::Convert::Unicode::unicode_for_brace_no_arg_command(
$command, $encoding);
+ }
if (!defined($result and $options and $options->{'converter'})) {
my $tree = Texinfo::Common::translated_command_tree(
$options->{'converter'}, $command);
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm b/macros/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm
index be28b88d0d..4526c202d7 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Convert/Unicode.pm
@@ -478,20 +478,6 @@ our %unicode_simple_character_map = (
#http://www.alanwood.net/unicode/mathematical_operators.html 22**
our %unicode_map = (
- 'bullet' => '2022',
- 'copyright' => '00A9',
- 'registeredsymbol' => '00AE',
- 'dots' => '2026',
- 'enddots' => '',
- 'equiv' => '2261',
- 'error' => '',
- 'expansion' => '21A6',
- 'arrow' => '2192',
- 'minus' => '2212', # in mathematical operators
-# 'minus' => '002D', # in latin1
- 'point' => '2605',
- 'print' => '22A3',
- 'result' => '21D2',
'today' => '',
'aa' => '00E5',
'AA' => '00C5',
@@ -538,10 +524,30 @@ our %unicode_map = (
'guillemotright' => '00BB',
'guilsinglleft' => '2039',
'guilsinglright' => '203A',
+ );
+
+# For commands where ASCII output is acceptable
+our %extra_unicode_map = (
+ 'bullet' => '2022',
+ 'copyright' => '00A9',
+ 'registeredsymbol' => '00AE',
+ 'dots' => '2026',
+ 'enddots' => '',
+ 'equiv' => '2261',
+ 'error' => '',
+ 'expansion' => '21A6',
+ 'arrow' => '2192',
+ 'minus' => '2212', # in mathematical operators
+# 'minus' => '002D', # in latin1
+ 'point' => '2605',
+ 'print' => '22A3',
+ 'result' => '21D2',
# this should only happen if the @clickstyle argument isn't a
# command with braces and no argument.
'click' => '2192',
- );
+);
+
+%unicode_map = (%unicode_map, %extra_unicode_map);
# set the %unicode_character_brace_no_arg_commands value to the character
# corresponding to the hex value in %unicode_map.
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Documentlanguages.pm b/macros/texinfo/texinfo/tp/Texinfo/Documentlanguages.pm
index 6f67ba08fa..cb976165aa 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Documentlanguages.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Documentlanguages.pm
@@ -1373,6 +1373,7 @@ our %language_codes = (
'cel' => 1,
'cen' => 1,
'cet' => 1,
+'cey' => 1,
'cfa' => 1,
'cfd' => 1,
'cfg' => 1,
@@ -3778,11 +3779,13 @@ our %language_codes = (
'lsh' => 1,
'lsi' => 1,
'lsl' => 1,
+'lsn' => 1,
'lso' => 1,
'lsp' => 1,
'lsr' => 1,
'lss' => 1,
'lst' => 1,
+'lsv' => 1,
'lsy' => 1,
'ltc' => 1,
'lth' => 1,
@@ -3812,6 +3815,7 @@ our %language_codes = (
'luy' => 1,
'luz' => 1,
'lva' => 1,
+'lvi' => 1,
'lvk' => 1,
'lvu' => 1,
'lwa' => 1,
@@ -5289,6 +5293,7 @@ our %language_codes = (
'pmz' => 1,
'pna' => 1,
'pnc' => 1,
+'pnd' => 1,
'pne' => 1,
'png' => 1,
'pnh' => 1,
@@ -6104,6 +6109,7 @@ our %language_codes = (
'szs' => 1,
'szv' => 1,
'szw' => 1,
+'szy' => 1,
'taa' => 1,
'tab' => 1,
'tac' => 1,
@@ -6294,10 +6300,12 @@ our %language_codes = (
'tja' => 1,
'tjg' => 1,
'tji' => 1,
+'tjj' => 1,
'tjl' => 1,
'tjm' => 1,
'tjn' => 1,
'tjo' => 1,
+'tjp' => 1,
'tjs' => 1,
'tju' => 1,
'tjw' => 1,
@@ -6557,6 +6565,7 @@ our %language_codes = (
'tvt' => 1,
'tvu' => 1,
'tvw' => 1,
+'tvx' => 1,
'tvy' => 1,
'twa' => 1,
'twb' => 1,
@@ -6722,9 +6731,11 @@ our %language_codes = (
'usi' => 1,
'usk' => 1,
'usp' => 1,
+'uss' => 1,
'usu' => 1,
'uta' => 1,
'ute' => 1,
+'uth' => 1,
'utp' => 1,
'utr' => 1,
'utu' => 1,
@@ -6924,6 +6935,7 @@ our %language_codes = (
'wkb' => 1,
'wkd' => 1,
'wkl' => 1,
+'wkr' => 1,
'wku' => 1,
'wkw' => 1,
'wky' => 1,
diff --git a/macros/texinfo/texinfo/tp/Texinfo/MiscXS.pm b/macros/texinfo/texinfo/tp/Texinfo/MiscXS.pm
index 2e5aa40e75..1b20969f50 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/MiscXS.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/MiscXS.pm
@@ -22,7 +22,7 @@ use 5.00405;
use strict;
use warnings;
-our $VERSION = '6.6';
+our $VERSION = '6.7';
use Texinfo::XSLoader;
diff --git a/macros/texinfo/texinfo/tp/Texinfo/ModulePath.pm.in b/macros/texinfo/texinfo/tp/Texinfo/ModulePath.pm.in
index ca6a2bf66e..dfd4fd3f39 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/ModulePath.pm.in
+++ b/macros/texinfo/texinfo/tp/Texinfo/ModulePath.pm.in
@@ -12,6 +12,14 @@ $VERSION = '6.3dev';
use File::Basename;
use File::Spec;
+# Used as a flag to say whether to look for data files in uninstalled
+# locations.
+our $texinfo_uninstalled = 0;
+
+# Pathname of the tp/ build directory. Used to find the locale
+# data.
+our $builddir = '';
+
# If $LIB_DIR and $LIBEXEC_DIR are given,
# (likely the installation directories)
# use them to add directories
@@ -27,35 +35,50 @@ sub init {
my $libexec_dir = shift;
my %named_args = @_;
- if (!$ENV{'top_srcdir'} and !$ENV{'top_builddir'}
- and $named_args{'updirs'}) {
- my ($real_command_name, $command_directory, $command_suffix)
- = fileparse($0, '.pl');
- my $updir = File::Spec->updir();
-
- # e.g. tp/t -> tp/t/../.. for 'updirs' = 2.
- my $count = $named_args{'updirs'};
- my $top_srcdir = $command_directory;
- while ($count-- > 0) {
- $top_srcdir = File::Spec->catdir($top_srcdir, $updir);
+ if (!$named_args{'installed'}) {
+ $texinfo_uninstalled = 1;
+
+ my $top_srcdir;
+ if ($ENV{'top_srcdir'}) {
+ $top_srcdir = $ENV{'top_srcdir'};
+ } elsif (defined $named_args{'updirs'}) {
+ my ($real_command_name, $command_directory, $command_suffix)
+ = fileparse($0, '.pl');
+ my $updir = File::Spec->updir();
+
+ # e.g. tp/t -> tp/t/../.. for 'updirs' = 2.
+ my $count = $named_args{'updirs'};
+ $top_srcdir = $command_directory;
+ while ($count-- > 0) {
+ $top_srcdir = File::Spec->catdir($top_srcdir, $updir);
+ }
}
- $ENV{'top_srcdir'} = $top_srcdir;
- $ENV{'top_builddir'} = $top_srcdir;
- }
-
- if (!$lib_dir) {
- if (defined($ENV{'top_srcdir'})) {
+
+ if (defined($top_srcdir)) {
# For Texinfo::Parser and the rest.
- unshift @INC, File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
+ unshift @INC, File::Spec->catdir($top_srcdir, 'tp');
+
+ $lib_dir = File::Spec->catdir($top_srcdir, 'tp', 'maintain');
+ }
- $lib_dir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp', 'maintain');
+ # Find XS modules in the build directory
+ my $top_builddir;
+ if (defined($ENV{'top_builddir'})) {
+ $top_builddir = $ENV{'top_builddir'};
+ } else {
+ $top_builddir = $top_srcdir;
}
+ if (defined($top_builddir)) {
+ unshift @INC, File::Spec->catdir($top_builddir, 'tp',
+ 'Texinfo', 'XS');
+ unshift @INC, File::Spec->catdir($top_builddir, 'tp',
+ 'Texinfo', 'XS', 'parsetexi');
+ }
+
+ $builddir = File::Spec->catdir($top_builddir, 'tp');
}
- # module using values from configure
if (defined($lib_dir)) {
- #warn "lib dir is $lib_dir\n";
-
unshift @INC, $lib_dir;
# '@USE_EXTERNAL_LIBINTL @' and similar are substituted
@@ -72,14 +95,6 @@ sub init {
if (defined($libexec_dir)) {
unshift @INC, $libexec_dir;
- } else {
- # *.la files are generated in the build directory.
- if (defined($ENV{'top_builddir'})) {
- unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp',
- 'Texinfo', 'XS');
- unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp',
- 'Texinfo', 'XS', 'parsetexi');
- }
}
unshift @INC, sub {
diff --git a/macros/texinfo/texinfo/tp/Texinfo/ParserNonXS.pm b/macros/texinfo/texinfo/tp/Texinfo/ParserNonXS.pm
index cccfdb2b75..2ceb6a69b4 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/ParserNonXS.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/ParserNonXS.pm
@@ -28,11 +28,7 @@
# user visible subroutines.
# internal subroutines, doing the parsing.
-package Texinfo::ParserNonXS;
-
-no strict 'refs';
-BEGIN { *Texinfo::Parser:: = \%Texinfo::ParserNonXS::; }
-use strict 'refs';
+package Texinfo::Parser;
# We need the unicode stuff.
use 5.006;
@@ -103,7 +99,7 @@ sub import {
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
sub N__($)
{
@@ -178,16 +174,9 @@ my %parser_default_configuration = (
# line_nr current line number in the file
# fh filehandle for the file
-# content is not copied but reference is copied when duplicating a parser.
-my %tree_informations;
-foreach my $tree_information ('values', 'macros', 'explained_commands', 'labels') {
- $tree_informations{$tree_information} = 1;
-}
-
# The commands in initialization_overrides are not set in the document if
# set at the parser initialization.
my %initialization_overrides = (
- 'INPUT_ENCODING_NAME' => 1,
'documentlanguage' => 1,
);
@@ -248,7 +237,7 @@ foreach my $type ('before_item', 'text_root', 'document_root',
my %command_ignore_space_after;
foreach my $command ('anchor', 'hyphenation', 'caption', 'shortcaption',
- 'sortas') {
+ 'sortas', 'seeentry', 'seealso') {
$command_ignore_space_after{$command} = 1;
}
@@ -312,7 +301,7 @@ foreach my $no_paragraph_command (keys(%line_commands)) {
# in the manual
foreach my $not_begin_line_command ('comment', 'c', 'sp', 'columnfractions',
'item', 'verbatiminclude',
- 'set', 'clear', 'vskip') {
+ 'set', 'clear', 'vskip', 'subentry') {
delete $begin_line_commands{$not_begin_line_command};
}
@@ -350,7 +339,7 @@ my %in_full_text_commands;
foreach my $command (keys(%brace_commands), keys(%no_brace_commands)) {
$in_full_text_commands{$command} = 1;
}
-foreach my $in_full_text_command ('c', 'comment', 'refill',
+foreach my $in_full_text_command ('c', 'comment', 'refill', 'subentry',
'columnfractions', 'set', 'clear', 'end') {
$in_full_text_commands{$in_full_text_command} = 1;
}
@@ -531,31 +520,6 @@ sub _setup_conf($$$)
}
}
-# Duplicate an existing parser.
-sub duplicate_parser {
- my $old_parser = shift;
-
- my $parser = dclone(\%parser_default_configuration);
-
- foreach my $key (keys(%parser_default_configuration)) {
- if ($tree_informations{$key}) {
- if (defined($old_parser->{$key})) {
- foreach my $info_key (keys(%{$old_parser->{$key}})) {
- $parser->{$key}->{$info_key}
- = $old_parser->{$key}->{$info_key};
- }
- }
- } elsif(ref($old_parser->{$key})) {
- $parser->{$key} = dclone($old_parser->{$key});
- } else {
- $parser->{$key} = $old_parser->{$key};
- }
- }
- bless $parser, ref($old_parser);
-
- return _setup_parser($parser, undef);
-}
-
# initialization entry point. Set up a parser.
# The last argument, optional, is a hash provided by the user to change
# the default values for what is present in %parser_default_configuration.
@@ -767,13 +731,34 @@ sub parse_texi_text($$;$$$$)
return $tree;
}
+sub _open_in {
+ my ($self, $filehandle, $file_name) = @_;
+
+ if (open($filehandle, $file_name)) {
+ if (defined($self->{'info'}->{'input_perl_encoding'})) {
+ if ($self->{'info'}->{'input_perl_encoding'} eq 'utf-8') {
+ binmode($filehandle, ":utf8");
+ } else {
+ binmode($filehandle, ":encoding($self->{'info'}->{'input_perl_encoding'})");
+ # For UTF-8, this would lead to errors in Latin-1 input the first time
+ # a line is read from the file, even though the binmode is changed
+ # later. Evidently Perl is checking ahead in the file to see if the
+ # input is valid.
+ }
+ }
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
# parse a texi file
sub parse_texi_file($$)
{
my ($self, $file_name) = @_;
my $filehandle = do { local *FH };
- if (! open($filehandle, $file_name)) {
+ if (!_open_in($self, $filehandle, $file_name)) {
$self->document_error(sprintf(__("could not open %s: %s"),
$file_name, $!));
return undef;
@@ -820,6 +805,7 @@ sub parse_texi_file($$)
}];
$self->{'info'}->{'input_file_name'} = $file_name;
$self->{'info'}->{'input_directory'} = $directories;
+
my $tree = $self->_parse_texi($root);
# Find 'text_root', which contains everything before first node/section.
@@ -2412,7 +2398,14 @@ sub _enter_index_entry($$$$$$$)
$self->line_warn(sprintf(__("entry for index `%s' outside of any node"),
$index_name), $line_nr);
}
- push @{$index->{'index_entries'}}, $index_entry;
+
+ # Skip these as these entries do not refer to the place in the document where
+ # the index commands occurred.
+ if (!defined $current->{'extra'}->{'seeentry'}
+ and !defined $current->{'extra'}->{'seealso'}) {
+ push @{$index->{'index_entries'}}, $index_entry;
+ }
+
$current->{'extra'}->{'index_entry'} = $index_entry;
}
@@ -2957,10 +2950,8 @@ sub _end_line($$$)
my $file = Texinfo::Common::locate_include_file($self, $text) ;
if (defined($file)) {
my $filehandle = do { local *FH };
- if (open ($filehandle, $file)) {
+ if (_open_in ($self, $filehandle, $file)) {
$included_file = 1;
- binmode($filehandle, ":encoding($self->{'INPUT_PERL_ENCODING'})")
- if (defined($self->{'INPUT_PERL_ENCODING'}));
print STDERR "Included $file($filehandle)\n" if ($self->{'DEBUG'});
my ($directories, $suffix);
($file, $directories, $suffix) = fileparse($file)
@@ -2982,8 +2973,8 @@ sub _end_line($$$)
}
} elsif ($command eq 'verbatiminclude') {
$current->{'extra'}->{'input_perl_encoding'}
- = $self->{'INPUT_PERL_ENCODING'}
- if defined $self->{'INPUT_PERL_ENCODING'};
+ = $self->{'info'}->{'input_perl_encoding'}
+ if defined $self->{'info'}->{'input_perl_encoding'};
} elsif ($command eq 'documentencoding') {
my ($texinfo_encoding, $perl_encoding, $input_encoding)
= Texinfo::Encoding::encoding_alias($text);
@@ -3001,18 +2992,12 @@ sub _end_line($$$)
$current->{'extra'}->{'input_perl_encoding'} = $perl_encoding;
if ($input_encoding) {
- if (!$self->{'set'}->{'INPUT_ENCODING_NAME'}) {
- $self->{'INPUT_ENCODING_NAME'} = $input_encoding;
- $self->{'info'}->{'input_encoding_name'} = $input_encoding;
- }
+ $self->{'info'}->{'input_encoding_name'} = $input_encoding;
}
- if (!$self->{'set'}->{'INPUT_PERL_ENCODING'}) {
- $self->{'INPUT_PERL_ENCODING'} = $perl_encoding;
- $self->{'info'}->{'input_perl_encoding'} = $perl_encoding;
- foreach my $input (@{$self->{'input'}}) {
- binmode($input->{'fh'}, ":encoding($perl_encoding)") if ($input->{'fh'});
- }
+ $self->{'info'}->{'input_perl_encoding'} = $perl_encoding;
+ foreach my $input (@{$self->{'input'}}) {
+ binmode($input->{'fh'}, ":encoding($perl_encoding)") if ($input->{'fh'});
}
}
} elsif ($command eq 'documentlanguage') {
@@ -3359,6 +3344,17 @@ sub _command_with_command_as_argument($)
and scalar(@{$current->{'contents'}}) == 1);
}
+sub _is_index_element {
+ my ($self, $element) = @_;
+
+ if (!$element->{'cmdname'}
+ or (!$self->{'command_index'}->{$element->{'cmdname'}}
+ and $element->{'cmdname'} ne 'subentry')) {
+ return 0;
+ }
+ return 1;
+}
+
# This combines several regular expressions used in '_parse_texi' to
# look at what is next on the remaining part of the line.
# NOTE - this sub has an XS override
@@ -4067,6 +4063,18 @@ sub _parse_texi($;$)
$current = _end_preformatted($self, $current, $line_nr);
}
+ if ($in_index_commands{$command}
+ and $current->{'contents'}
+ and $current->{'contents'}->[-1]
+ and $current->{'contents'}->[-1]->{'text'}) {
+ $current->{'contents'}->[-1]->{'text'} =~ s/(\s+)$//;
+ if ($1 ne '') {
+ my $new_spaces = { 'text' => $1, 'parent' => $current,
+ 'type' => 'empty_spaces_before_argument' };
+ push @{$current->{'contents'}}, $new_spaces;
+ }
+ }
+
if (defined($other_commands{$command})
and ($command ne 'item' or !_item_line_parent($current))) {
# noarg skipspace
@@ -4341,9 +4349,32 @@ sub _parse_texi($;$)
push @{$current->{'contents'}}, $misc;
$misc->{'line_nr'} = $line_nr;
} else {
- $misc = { 'cmdname' => $command, 'parent' => $current,
- 'line_nr' => $line_nr };
+ $misc = { 'cmdname' => $command, 'line_nr' => $line_nr };
+ if ($command eq 'subentry') {
+ my $parent = $current->{'parent'};
+ if (!_is_index_element($self, $parent)) {
+ $self->line_warn(
+ sprintf(__("\@%s should only appear in an index entry"),
+ $command), $line_nr);
+ }
+ $parent->{'extra'}->{'subentry'} = $misc;
+ my $subentry_level = 1;
+ if ($parent->{'cmdname'} eq 'subentry') {
+ $subentry_level = $parent->{'extra'}->{'level'} + 1;
+ }
+ $misc->{'extra'}->{'level'} = $subentry_level;
+ if ($subentry_level > 2) {
+ $self->line_error(__(
+ "no more than two levels of index subentry are allowed"),
+ $line_nr);
+ }
+ # Do not make the @subentry element a child of the index
+ # command. This means that spaces are preserved properly
+ # when converting back to Texinfo.
+ $current = _end_line($self, $current, $line_nr);
+ }
push @{$current->{'contents'}}, $misc;
+ $misc->{'parent'} = $current;
if ($sectioning_commands{$command}) {
if ($self->{'sections_level'}) {
$current->{'contents'}->[-1]->{'extra'}->{'sections_level'}
@@ -4419,6 +4450,12 @@ sub _parse_texi($;$)
} elsif ($command eq 'dircategory' and $self->{'current_node'}) {
$self->line_warn(__("\@dircategory after first node"),
$line_nr);
+ } elsif ($command eq 'printindex') {
+ # Record that @printindex occurs in this node so we know it
+ # is an index node.
+ if ($self->{'current_node'}) {
+ $self->{'current_node'}->{'extra'}->{'isindex'} = 1;
+ }
}
$current = $current->{'args'}->[-1];
@@ -4656,11 +4693,8 @@ sub _parse_texi($;$)
$current->{'contents'}->[-1]->{'line_nr'} = $line_nr
if ($keep_line_nr_brace_commands{$command}
and !$self->{'definfoenclose'}->{$command});
-
if ($in_index_commands{$command}
- and (!$current->{'parent'}->{'cmdname'}
- or !$self->{'command_index'}
- ->{$current->{'parent'}->{'cmdname'}})) {
+ and !_is_index_element($self, $current->{'parent'})) {
$self->line_warn(
sprintf(__("\@%s should only appear in an index entry"),
$command), $line_nr);
@@ -4935,8 +4969,8 @@ sub _parse_texi($;$)
__("\@image missing filename argument"), $line_nr);
}
$image->{'extra'}->{'input_perl_encoding'}
- = $self->{'INPUT_PERL_ENCODING'}
- if defined $self->{'INPUT_PERL_ENCODING'};
+ = $self->{'info'}->{'input_perl_encoding'}
+ if defined $self->{'info'}->{'input_perl_encoding'};
} elsif($current->{'parent'}->{'cmdname'} eq 'dotless') {
my $dotless = $current->{'parent'};
if (@{$current->{'contents'}}) {
@@ -5019,14 +5053,16 @@ sub _parse_texi($;$)
if (!$current->{'parent'}->{'type'});
$current->{'parent'}->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument'}
= $current->{'parent'};
- } elsif ($current->{'parent'}->{'cmdname'} eq 'sortas') {
+ } elsif ($in_index_commands{$current->{'parent'}->{'cmdname'}}) {
+ my $command = $current->{'parent'}->{'cmdname'};
my @contents = @{$current->{'contents'}};
my $arg = $current->{'contents'}->[0]->{'text'};
+
if (defined($arg)) {
my $index_element = $current->{'parent'}->{'parent'}->{'parent'};
- if ($index_element and $index_element->{'cmdname'}
- and $self->{'command_index'}->{$index_element->{'cmdname'}}) {
- $index_element->{'extra'}->{'sortas'} = $arg;
+ if ($index_element
+ and _is_index_element($self, $index_element)) {
+ $index_element->{'extra'}->{$command} = $arg;
}
}
}
@@ -6075,15 +6111,6 @@ A string, the command name associated with C<@clickstyle>.
A string corresponding to a document language set by C<@documentlanguage>.
-=item INPUT_ENCODING_NAME
-
-=item INPUT_PERL_ENCODING
-
-C<INPUT_ENCODING_NAME> string is the encoding name as set
-by C<@documentencoding>.
-C<INPUT_PERL_ENCODING> string is a corresponding perl encoding name.
-In general those two strings should be set simultaneously.
-
=item indices
If it is a hash reference, the keys are index names, the values are
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Report.pm b/macros/texinfo/texinfo/tp/Texinfo/Report.pm
index 050d74bc9f..19a207238e 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Report.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Report.pm
@@ -251,8 +251,6 @@ sub gdt($$;$$)
my $encoding;
if ($self->get_conf('OUTPUT_ENCODING_NAME')) {
$encoding = $self->get_conf('OUTPUT_ENCODING_NAME');
- } elsif ($self->get_conf('INPUT_ENCODING_NAME')) {
- $encoding = $self->get_conf('INPUT_ENCODING_NAME');
}
Locale::Messages::bind_textdomain_codeset($strings_textdomain, $encoding)
if ($encoding and $encoding ne 'us-ascii');
@@ -260,8 +258,6 @@ sub gdt($$;$$)
my $perl_encoding;
if ($self->get_conf('OUTPUT_PERL_ENCODING')) {
$perl_encoding = $self->get_conf('OUTPUT_PERL_ENCODING');
- } elsif ($self->get_conf('INPUT_PERL_ENCODING')) {
- $perl_encoding = $self->get_conf('INPUT_PERL_ENCODING');
}
if ($perl_encoding) {
Locale::Messages::bind_textdomain_filter($strings_textdomain,
diff --git a/macros/texinfo/texinfo/tp/Texinfo/Structuring.pm b/macros/texinfo/texinfo/tp/Texinfo/Structuring.pm
index bd8192d0c0..ea0eb3d10d 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/Structuring.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/Structuring.pm
@@ -64,7 +64,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
my %types_to_enter;
@@ -408,7 +408,6 @@ sub nodes_tree($)
my $self = shift;
return undef unless ($self->{'nodes'} and @{$self->{'nodes'}});
my $top_node;
- my $top_node_up;
my $check_menu_entries = (!$self->{'info'}->{'novalidate'}
and $self->{'SHOW_MENU'});
@@ -416,19 +415,6 @@ sub nodes_tree($)
foreach my $node (@{$self->{'nodes'}}) {
if ($node->{'extra'}->{'normalized'} eq 'Top') {
$top_node = $node;
- my $parser = Texinfo::Parser::simple_parser ($self->{'conf'});
- my $top_node_up_content_tree
- = $parser->parse_texi_line($self->{'TOP_NODE_UP'});
- $top_node_up
- = {'type' => 'top_node_up',
- 'extra' => Texinfo::Common::parse_node_manual(
- {'contents' => $top_node_up_content_tree->{'contents'}})};
- if ($top_node_up->{'extra'}->{'node_content'}) {
- $top_node_up->{'extra'}->{'normalized'} =
- Texinfo::Convert::NodeNameNormalization::normalize_node(
- {'contents' => $top_node_up->{'extra'}->{'node_content'}}
- );
- }
}
if ($node->{'menus'}) {
if ($self->{'SHOW_MENU'} and @{$node->{'menus'}} > 1) {
@@ -599,8 +585,6 @@ sub nodes_tree($)
}
} else {
# Special case for Top node.
- $node->{'node_up'} = $top_node_up;
- $node->{'node_up'}->{'extra'}->{'top_node_up'} = $node;
if ($node->{'menu_child'}) {
$node->{'node_next'} = $node->{'menu_child'};
if (!$node->{'menu_child'}->{'extra'}->{'manual_content'}) {
@@ -617,21 +601,6 @@ sub nodes_tree($)
# external node
if ($node_direction->{'manual_content'}) {
$node->{'node_'.$direction} = { 'extra' => $node_direction };
- # set top_node_up for up of Top if it is the same as top_node_up
- if ($node->{'extra'}->{'normalized'} eq 'Top'
- and $direction eq 'up'
- and $top_node_up->{'extra'}->{'manual_content'}
- and ((!defined($node_direction->{'normalized'})
- and !defined($top_node_up->{'extra'}->{'normalized'}))
- or (defined($node_direction->{'normalized'})
- and defined($top_node_up->{'extra'}->{'normalized'})
- and $node_direction->{'normalized'} eq $top_node_up->{'extra'}->{'normalized'}))
- and (Texinfo::Convert::NodeNameNormalization::normalize_node(
- {'contents' => $node_direction->{'manual_content'}})
- eq Texinfo::Convert::NodeNameNormalization::normalize_node(
- {'contents' => $top_node_up->{'extra'}->{'manual_content'}}))) {
- $node->{'node_'.$direction}->{'extra'}->{'top_node_up'} = $node;
- }
} else {
if ($self->{'labels'}->{$node_direction->{'normalized'}}) {
my $node_target
@@ -653,17 +622,6 @@ sub nodes_tree($)
} else {
if ($self->{'info'}->{'novalidate'}) {
$node->{'node_'.$direction} = { 'extra' => $node_direction };
- # special case of up for top an internal node and the same
- # as TOP_NODE_UP. This is not the default case, since in the
- # default case TOP_NODE_UP is an external node.
- } elsif ($node->{'extra'}->{'normalized'} eq 'Top'
- and $direction eq 'up'
- and !$top_node_up->{'extra'}->{'manual_content'}
- and $node_direction->{'normalized'} eq $top_node_up->{'extra'}->{'normalized'}) {
- $node->{'node_'.$direction} = { 'type' => 'top_node_up',
- 'extra' => $node_direction };
- $node->{'node_'.$direction}->{'extra'}->{'top_node_up'}
- = $node;
} else {
$self->line_error(sprintf(
__("%s reference to nonexistent `%s'"),
@@ -876,14 +834,9 @@ sub _node_element($)
Texinfo::Convert::NodeNameNormalization::normalize_node(
{'contents' => $node->{'extra'}->{'node_content'}});
}
- $external_node->{'extra'}->{'top_node_up'}
- = $node->{'extra'}->{'top_node_up'}
- if (exists($node->{'extra'}->{'top_node_up'}));
return $external_node;
} elsif ($node->{'cmdname'} and $node->{'cmdname'} eq 'node') {
return $node->{'parent'};
- } elsif ($node->{'type'} and $node->{'type'} eq 'top_node_up') {
- return $node;
} else {
# case of a @float or an @anchor
return undef;
@@ -1481,8 +1434,8 @@ sub do_index_keys($$)
my $options = {'sort_string' => 1};
if ($self->get_conf('ENABLE_ENCODING')
- and $self->get_conf('INPUT_ENCODING_NAME')) {
- $options->{'enabled_encoding'} = $self->get_conf('INPUT_ENCODING_NAME');
+ and $self->{'info'}->{'input_encoding_name'}) {
+ $options->{'enabled_encoding'} = $self->{'info'}->{'input_encoding_name'};
}
my %convert_text_options = Texinfo::Common::_convert_text_options($self);
$options = {%$options, %convert_text_options};
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.am b/macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.am
index e9e0f267a0..d62ca68dc6 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.am
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.am
@@ -21,9 +21,6 @@ AM_CPPFLAGS = \
-I$(srcdir)/gnulib/lib \
-I$(builddir)/gnulib/lib
-XSParagraph_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la \
- $(TERMLIBS) $(LIBINTL) $(LIBICONV)
-
ACLOCAL_AMFLAGS = -I gnulib/m4
SUBDIRS=gnulib/lib
@@ -32,6 +29,8 @@ EXTRA_DIST+=gnulib/m4/gnulib-cache.m4
################### End Gnulib section #########################
+AM_CPPFLAGS += -DDATADIR=\"$(datadir)\"
+
xsdir = $(pkglibdir)
PERL_INC = $(PERL_CONF_archlibexp)/CORE
@@ -88,6 +87,11 @@ endif
AM_LDFLAGS = -avoid-version -module $(PERL_CONF_ccdlflags)
AM_LDFLAGS += $(PLATFORM_LDFLAGS)
+XSParagraph_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la
+XSParagraph_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBINTL) $(LTLIBICONV)
+
+
+
########################## parsetexi
p=parsetexi
@@ -148,7 +152,7 @@ EXTRA_DIST += $p/command_data.c
EXTRA_DIST += $p/Parsetexi.xs
Parsetexi_la_LIBADD = $(top_builddir)/gnulib/lib/libgnu.la
-Parsetexi_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBICONV)
+Parsetexi_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBINTL) $(LTLIBICONV)
BUILT_SOURCES=parsetexi/element_types.c \
parsetexi/element_types.h \
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.in b/macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.in
index 28fb46d903..6567246745 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.in
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
$(top_srcdir)/gnulib/m4/float_h.m4 \
$(top_srcdir)/gnulib/m4/getdelim.m4 \
$(top_srcdir)/gnulib/m4/getline.m4 \
+ $(top_srcdir)/gnulib/m4/gettext.m4 \
$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
$(top_srcdir)/gnulib/m4/host-cpu-c-abi.m4 \
@@ -122,8 +123,10 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
$(top_srcdir)/gnulib/m4/memchr.m4 \
$(top_srcdir)/gnulib/m4/mmap-anon.m4 \
$(top_srcdir)/gnulib/m4/multiarch.m4 \
- $(top_srcdir)/gnulib/m4/off_t.m4 \
+ $(top_srcdir)/gnulib/m4/nls.m4 \
+ $(top_srcdir)/gnulib/m4/off_t.m4 $(top_srcdir)/gnulib/m4/po.m4 \
$(top_srcdir)/gnulib/m4/printf.m4 \
+ $(top_srcdir)/gnulib/m4/progtest.m4 \
$(top_srcdir)/gnulib/m4/rawmemchr.m4 \
$(top_srcdir)/gnulib/m4/size_max.m4 \
$(top_srcdir)/gnulib/m4/ssize_t.m4 \
@@ -210,11 +213,13 @@ Parsetexi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
TestXS_la_LIBADD =
am_TestXS_la_OBJECTS = TestXS.lo
TestXS_la_OBJECTS = $(am_TestXS_la_OBJECTS)
-am__DEPENDENCIES_1 =
-XSParagraph_la_DEPENDENCIES = $(builddir)/gnulib/lib/libgnu.la \
- $(am__DEPENDENCIES_1)
+XSParagraph_la_DEPENDENCIES = $(builddir)/gnulib/lib/libgnu.la
am_XSParagraph_la_OBJECTS = XSParagraph.lo xspara.lo text.lo
XSParagraph_la_OBJECTS = $(am_XSParagraph_la_OBJECTS)
+XSParagraph_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(XSParagraph_la_LDFLAGS) $(LDFLAGS) -o \
+ $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -405,6 +410,9 @@ ERRNO_H = @ERRNO_H@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FLOAT_H = @FLOAT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
GNULIB_BTOWC = @GNULIB_BTOWC@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@
@@ -538,6 +546,7 @@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
GNULIB_WMEMSET = @GNULIB_WMEMSET@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
@@ -640,9 +649,12 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -650,11 +662,15 @@ LIMITS_H = @LIMITS_H@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
@@ -700,6 +716,7 @@ PERL_EXT_CC = @PERL_EXT_CC@
PERL_EXT_CFLAGS = @PERL_EXT_CFLAGS@
PERL_EXT_CPPFLAGS = @PERL_EXT_CPPFLAGS@
PERL_EXT_LDFLAGS = @PERL_EXT_LDFLAGS@
+POSUB = @POSUB@
PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -775,11 +792,15 @@ STDDEF_H = @STDDEF_H@
STDINT_H = @STDINT_H@
STRIP = @STRIP@
UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
+USE_NLS = @USE_NLS@
VERSION = @VERSION@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XSUBPP = @XSUBPP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -830,6 +851,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -862,18 +884,12 @@ EXTRA_DIST = gnulib/m4/gnulib-cache.m4 TestXS.pm TestXS.xs \
$p/command_data.awk $p/Parser-5556.pm
######################## Gnulib ################################
-AM_CPPFLAGS = \
- -I$(srcdir) \
- -I$(srcdir)/gnulib/lib \
- -I$(builddir)/gnulib/lib
-
-XSParagraph_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la \
- $(TERMLIBS) $(LIBINTL) $(LIBICONV)
+################### End Gnulib section #########################
+AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/gnulib/lib \
+ -I$(builddir)/gnulib/lib -DDATADIR=\"$(datadir)\"
ACLOCAL_AMFLAGS = -I gnulib/m4
SUBDIRS = gnulib/lib
-
-################### End Gnulib section #########################
xsdir = $(pkglibdir)
PERL_INC = $(PERL_CONF_archlibexp)/CORE
XSUBPPARGS = -typemap $(PERL_CONF_privlibexp)/ExtUtils/typemap
@@ -893,6 +909,8 @@ AM_CFLAGS = $(PERL_CONF_ccflags) $(PERL_CONF_optimize) \
@HOST_NEEDS_NO_UNDEFINED_TRUE@PLATFORM_LDFLAGS = -no-undefined -L$(PERL_INC) $(PERL_CONF_libperl)
AM_LDFLAGS = -avoid-version -module $(PERL_CONF_ccdlflags) \
$(PLATFORM_LDFLAGS)
+XSParagraph_la_LIBADD = $(builddir)/gnulib/lib/libgnu.la
+XSParagraph_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBINTL) $(LTLIBICONV)
########################## parsetexi
p = parsetexi
@@ -944,7 +962,7 @@ Parsetexi_la_SOURCES = parsetexi/Parsetexi.c \
parsetexi/counter.h
Parsetexi_la_LIBADD = $(top_builddir)/gnulib/lib/libgnu.la
-Parsetexi_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBICONV)
+Parsetexi_la_LDFLAGS = $(AM_LDFLAGS) $(LTLIBINTL) $(LTLIBICONV)
BUILT_SOURCES = parsetexi/element_types.c \
parsetexi/element_types.h \
parsetexi/command_data.c \
@@ -1105,7 +1123,7 @@ TestXS.la: $(TestXS_la_OBJECTS) $(TestXS_la_DEPENDENCIES) $(EXTRA_TestXS_la_DEPE
$(AM_V_CCLD)$(LINK) -rpath $(xsdir) $(TestXS_la_OBJECTS) $(TestXS_la_LIBADD) $(LIBS)
XSParagraph.la: $(XSParagraph_la_OBJECTS) $(XSParagraph_la_DEPENDENCIES) $(EXTRA_XSParagraph_la_DEPENDENCIES)
- $(AM_V_CCLD)$(LINK) -rpath $(xsdir) $(XSParagraph_la_OBJECTS) $(XSParagraph_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(XSParagraph_la_LINK) -rpath $(xsdir) $(XSParagraph_la_OBJECTS) $(XSParagraph_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/MiscXS.c b/macros/texinfo/texinfo/tp/Texinfo/XS/MiscXS.c
index c44602f302..4847171b07 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/MiscXS.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/MiscXS.c
@@ -1,5 +1,5 @@
/*
- * This file was generated automatically by ExtUtils::ParseXS version 3.39 from the
+ * This file was generated automatically by ExtUtils::ParseXS version 3.34 from the
* contents of MiscXS.xs. Do not edit this file, edit MiscXS.xs instead.
*
* ANY CHANGES MADE HERE WILL BE LOST!
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.c b/macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.c
index f8a9ac4a6f..d1780203ed 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.c
@@ -1,5 +1,5 @@
/*
- * This file was generated automatically by ExtUtils::ParseXS version 3.39 from the
+ * This file was generated automatically by ExtUtils::ParseXS version 3.34 from the
* contents of TestXS.xs. Do not edit this file, edit TestXS.xs instead.
*
* ANY CHANGES MADE HERE WILL BE LOST!
@@ -168,14 +168,16 @@ XS_EUPXS(XS_TestXS_init); /* prototype to pass -Wmissing-prototypes */
XS_EUPXS(XS_TestXS_init)
{
dVAR; dXSARGS;
- if (items != 0)
- croak_xs_usage(cv, "");
+ if (items != 2)
+ croak_xs_usage(cv, "int, char *");
{
int RETVAL;
dXSTARG;
#line 19 "TestXS.xs"
puts ("message from XS module\n");
-#line 179 "TestXS.c"
+ RETVAL = 1;
+#line 180 "TestXS.c"
+ XSprePUSH; PUSHi((IV)RETVAL);
}
XSRETURN(1);
}
@@ -208,7 +210,7 @@ XS_EXTERNAL(boot_TestXS)
# endif
#endif
- (void)newXSproto_portable("TestXS::init", XS_TestXS_init, file, "");
+ (void)newXSproto_portable("TestXS::init", XS_TestXS_init, file, "$$");
#if PERL_VERSION_LE(5, 21, 5)
# if PERL_VERSION_GE(5, 9, 0)
if (PL_unitcheckav)
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.xs b/macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.xs
index fc80a0c43f..56c4ae55db 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.xs
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/TestXS.xs
@@ -14,6 +14,9 @@ MODULE = TestXS PACKAGE = TestXS PREFIX = xspara_
PROTOTYPES: ENABLE
int
-xspara_init ()
+xspara_init (int, char *)
CODE:
puts ("message from XS module\n");
+ RETVAL = 1;
+ OUTPUT:
+ RETVAL
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.c b/macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.c
index 92f0dfd195..219786f714 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.c
@@ -1,5 +1,5 @@
/*
- * This file was generated automatically by ExtUtils::ParseXS version 3.39 from the
+ * This file was generated automatically by ExtUtils::ParseXS version 3.34 from the
* contents of XSParagraph.xs. Do not edit this file, edit XSParagraph.xs instead.
*
* ANY CHANGES MADE HERE WILL BE LOST!
@@ -170,13 +170,17 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_init); /* prototype to pass -Wmissing-proto
XS_EUPXS(XS_Texinfo__XS__XSParagraph_init)
{
dVAR; dXSARGS;
- if (items != 0)
- croak_xs_usage(cv, "");
+ if (items != 2)
+ croak_xs_usage(cv, "unused, unused2");
{
+ int unused = (int)SvIV(ST(0))
+;
+ char * unused2 = (char *)SvPV_nolen(ST(1))
+;
int RETVAL;
dXSTARG;
- RETVAL = xspara_init();
+ RETVAL = xspara_init(unused, unused2);
XSprePUSH; PUSHi((IV)RETVAL);
}
XSRETURN(1);
@@ -208,13 +212,13 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_new)
{
SV * class = ST(0)
;
-#line 47 "XSParagraph.xs"
+#line 49 "XSParagraph.xs"
HV *pkg;
HV *conf = 0;
int id;
-#line 216 "XSParagraph.c"
+#line 220 "XSParagraph.c"
SV * RETVAL;
-#line 51 "XSParagraph.xs"
+#line 53 "XSParagraph.xs"
items--;
if (items > 0)
{
@@ -227,7 +231,7 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_new)
need as their first argument. */
pkg = gv_stashpv ("Texinfo::Convert::XSParagraph::XSParagraph", 0);
RETVAL = newSViv (id);
-#line 231 "XSParagraph.c"
+#line 235 "XSParagraph.c"
RETVAL = sv_2mortal(RETVAL);
ST(0) = RETVAL;
}
@@ -246,10 +250,10 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_end_line_count)
;
int RETVAL;
dXSTARG;
-#line 71 "XSParagraph.xs"
+#line 73 "XSParagraph.xs"
xspara_set_state (paragraph);
RETVAL = xspara_end_line_count ();
-#line 253 "XSParagraph.c"
+#line 257 "XSParagraph.c"
XSprePUSH; PUSHi((IV)RETVAL);
}
XSRETURN(1);
@@ -265,10 +269,10 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph__end_line)
{
SV * paragraph = ST(0)
;
-#line 80 "XSParagraph.xs"
+#line 82 "XSParagraph.xs"
xspara_set_state (paragraph);
xspara__end_line ();
-#line 272 "XSParagraph.c"
+#line 276 "XSParagraph.c"
}
XSRETURN_EMPTY;
}
@@ -285,10 +289,10 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_end_line)
;
char * RETVAL;
dXSTARG;
-#line 87 "XSParagraph.xs"
+#line 89 "XSParagraph.xs"
xspara_set_state (paragraph);
RETVAL = xspara_end_line ();
-#line 292 "XSParagraph.c"
+#line 296 "XSParagraph.c"
sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
}
XSRETURN(1);
@@ -306,10 +310,10 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_get_pending)
;
char * RETVAL;
dXSTARG;
-#line 96 "XSParagraph.xs"
+#line 98 "XSParagraph.xs"
xspara_set_state (paragraph);
RETVAL = xspara_get_pending ();
-#line 313 "XSParagraph.c"
+#line 317 "XSParagraph.c"
sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
}
XSRETURN(1);
@@ -325,12 +329,12 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_add_pending_word)
{
SV * paragraph = ST(0)
;
-#line 106 "XSParagraph.xs"
+#line 108 "XSParagraph.xs"
int add_spaces = 0;
char *retval;
-#line 332 "XSParagraph.c"
+#line 336 "XSParagraph.c"
SV * RETVAL;
-#line 109 "XSParagraph.xs"
+#line 111 "XSParagraph.xs"
items -= 1;
if (items > 0)
{
@@ -344,7 +348,7 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_add_pending_word)
RETVAL = newSVpv (retval, 0);
SvUTF8_on (RETVAL);
-#line 348 "XSParagraph.c"
+#line 352 "XSParagraph.c"
RETVAL = sv_2mortal(RETVAL);
ST(0) = RETVAL;
}
@@ -361,17 +365,17 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_end)
{
SV * paragraph = ST(0)
;
-#line 129 "XSParagraph.xs"
+#line 131 "XSParagraph.xs"
char *retval;
-#line 367 "XSParagraph.c"
+#line 371 "XSParagraph.c"
SV * RETVAL;
-#line 131 "XSParagraph.xs"
+#line 133 "XSParagraph.xs"
xspara_set_state (paragraph);
retval = xspara_end ();
RETVAL = newSVpv (retval, 0);
SvUTF8_on (RETVAL);
-#line 375 "XSParagraph.c"
+#line 379 "XSParagraph.c"
RETVAL = sv_2mortal(RETVAL);
ST(0) = RETVAL;
}
@@ -390,12 +394,12 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_add_text)
;
SV * text_in = ST(1)
;
-#line 145 "XSParagraph.xs"
+#line 147 "XSParagraph.xs"
char *text;
char *retval;
-#line 397 "XSParagraph.c"
+#line 401 "XSParagraph.c"
SV * RETVAL;
-#line 148 "XSParagraph.xs"
+#line 150 "XSParagraph.xs"
/* Always convert the input to UTF8 with sv_utf8_upgrade, so we can
process it properly in xspara_add_next. */
if (!SvUTF8 (text_in))
@@ -409,7 +413,7 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_add_text)
RETVAL = newSVpv (retval, 0);
SvUTF8_on (RETVAL);
-#line 413 "XSParagraph.c"
+#line 417 "XSParagraph.c"
RETVAL = sv_2mortal(RETVAL);
ST(0) = RETVAL;
}
@@ -428,15 +432,15 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_add_next)
;
SV * text_in = ST(1)
;
-#line 169 "XSParagraph.xs"
+#line 171 "XSParagraph.xs"
char *text;
STRLEN text_len;
char *retval;
SV *arg_in;
int transparent = 0;
-#line 438 "XSParagraph.c"
+#line 442 "XSParagraph.c"
SV * RETVAL;
-#line 175 "XSParagraph.xs"
+#line 177 "XSParagraph.xs"
items -= 2;
if (items > 0)
{
@@ -458,7 +462,7 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_add_next)
RETVAL = newSVpv (retval, 0);
SvUTF8_on (RETVAL);
-#line 462 "XSParagraph.c"
+#line 466 "XSParagraph.c"
RETVAL = sv_2mortal(RETVAL);
ST(0) = RETVAL;
}
@@ -475,10 +479,10 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_remove_end_sentence)
{
SV * paragraph = ST(0)
;
-#line 204 "XSParagraph.xs"
+#line 206 "XSParagraph.xs"
xspara_set_state (paragraph);
xspara_remove_end_sentence ();
-#line 482 "XSParagraph.c"
+#line 486 "XSParagraph.c"
}
XSRETURN_EMPTY;
}
@@ -495,15 +499,15 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_add_end_sentence)
;
SV * value = ST(1)
;
-#line 212 "XSParagraph.xs"
- int intvalue = 0;
-#line 501 "XSParagraph.c"
#line 214 "XSParagraph.xs"
+ int intvalue = 0;
+#line 505 "XSParagraph.c"
+#line 216 "XSParagraph.xs"
if (SvOK(value))
intvalue = (int)SvIV(value);
xspara_set_state (paragraph);
xspara_add_end_sentence (intvalue);
-#line 507 "XSParagraph.c"
+#line 511 "XSParagraph.c"
}
XSRETURN_EMPTY;
}
@@ -518,10 +522,10 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_allow_end_sentence)
{
SV * paragraph = ST(0)
;
-#line 223 "XSParagraph.xs"
+#line 225 "XSParagraph.xs"
xspara_set_state (paragraph);
xspara_allow_end_sentence ();
-#line 525 "XSParagraph.c"
+#line 529 "XSParagraph.c"
}
XSRETURN_EMPTY;
}
@@ -538,17 +542,17 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_set_space_protection)
;
SV * space_protection_in = ST(1)
;
-#line 234 "XSParagraph.xs"
+#line 236 "XSParagraph.xs"
int space_protection = -1;
int ignore_columns = -1;
int keep_end_lines = -1;
int french_spacing = -1;
int double_width_no_break = -1;
SV *arg_in;
-#line 549 "XSParagraph.c"
+#line 553 "XSParagraph.c"
char * RETVAL;
dXSTARG;
-#line 241 "XSParagraph.xs"
+#line 243 "XSParagraph.xs"
if (SvOK(space_protection_in))
space_protection = (int)SvIV(space_protection_in);
/* Get optional arguments from stack. */
@@ -586,7 +590,7 @@ XS_EUPXS(XS_Texinfo__XS__XSParagraph_set_space_protection)
RETVAL = xspara_set_space_protection
(space_protection, ignore_columns, keep_end_lines,
french_spacing, double_width_no_break);
-#line 590 "XSParagraph.c"
+#line 594 "XSParagraph.c"
sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
}
XSRETURN(1);
@@ -620,7 +624,7 @@ XS_EXTERNAL(boot_Texinfo__XS__XSParagraph)
# endif
#endif
- (void)newXSproto_portable("Texinfo::XS::XSParagraph::init", XS_Texinfo__XS__XSParagraph_init, file, "");
+ (void)newXSproto_portable("Texinfo::XS::XSParagraph::init", XS_Texinfo__XS__XSParagraph_init, file, "$$");
(void)newXSproto_portable("Texinfo::XS::XSParagraph::set_state", XS_Texinfo__XS__XSParagraph_set_state, file, "$");
(void)newXSproto_portable("Texinfo::XS::XSParagraph::new", XS_Texinfo__XS__XSParagraph_new, file, "$;@");
(void)newXSproto_portable("Texinfo::XS::XSParagraph::end_line_count", XS_Texinfo__XS__XSParagraph_end_line_count, file, "$");
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.xs b/macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.xs
index fe632c774d..5a0b117e09 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.xs
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/XSParagraph.xs
@@ -13,7 +13,7 @@
MODULE = Texinfo::XS::XSParagraph PACKAGE = Texinfo::XS::XSParagraph PREFIX = xspara_
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -31,7 +31,9 @@ MODULE = Texinfo::XS::XSParagraph PACKAGE = Texinfo::XS::XSParagraph PREFIX = xs
PROTOTYPES: ENABLE
int
-xspara_init ()
+xspara_init (unused, unused2)
+ int unused
+ char *unused2
void
xspara_set_state (state)
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/aclocal.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/aclocal.m4
index c6ef29a174..4eb69bb7f4 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/aclocal.m4
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
@@ -20,8 +20,8 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 6 (gettext-0.20)
+dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -35,443 +35,62 @@ dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AC_PROG_MKDIR_P])dnl
- AC_REQUIRE([AC_PROG_SED])dnl
- AC_REQUIRE([AM_NLS])dnl
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
-
- dnl Search for GNU msgfmt in the PATH.
- dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
- dnl The second test excludes FreeBSD msgfmt.
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
- dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([MSGFMT_015])
-changequote(,)dnl
- case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
- *) GMSGFMT_015=$GMSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([GMSGFMT_015])
-
- dnl Search for GNU xgettext 0.12 or newer in the PATH.
- dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
- dnl The second test excludes FreeBSD xgettext.
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- dnl Remove leftover from FreeBSD xgettext call.
- rm -f messages.po
-
- dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
- case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
- *) XGETTEXT_015=$XGETTEXT ;;
- esac
-changequote([,])dnl
- AC_SUBST([XGETTEXT_015])
-
- dnl Search for GNU msgmerge 0.11 or newer in the PATH.
- AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
- [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
- dnl Installation directories.
- dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
- dnl have to define it here, so that it can be used in po/Makefile.
- test -n "$localedir" || localedir='${datadir}/locale'
- AC_SUBST([localedir])
-
- dnl Support for AM_XGETTEXT_OPTION.
- test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
- AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
- AC_CONFIG_COMMANDS([po-directories], [[
- for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- esac
- # PO directories have a Makefile.in generated from Makefile.in.in.
- case "$ac_file" in */Makefile.in)
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- # Treat a directory as a PO directory if and only if it has a
- # POTFILES.in file. This allows packages to have multiple PO
- # directories under different names or in different locations.
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
- rm -f "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- gt_tab=`printf '\t'`
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
- POMAKEFILEDEPS="POTFILES.in"
- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
- # on $ac_dir but don't depend on user-specified configuration
- # parameters.
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
- fi
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- done
- fi
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
- if test -f "$f"; then
- case "$f" in
- *.orig | *.bak | *~) ;;
- *) cat "$f" >> "$ac_dir/Makefile" ;;
- esac
- fi
- done
- fi
- ;;
- esac
- done]],
- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
- # Capture the value of LINGUAS because we need it to compute CATALOGS.
- LINGUAS="${LINGUAS-%UNSET%}"
- ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
[
- # When this code is run, in config.status, two variables have already been
- # set:
- # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
- # - LINGUAS is the value of the environment variable LINGUAS at configure
- # time.
-
-changequote(,)dnl
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
- # Find a way to echo strings without interpreting backslash.
- if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='echo'
- else
- if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='printf %s\n'
- else
- echo_func () {
- cat <<EOT
-$*
-EOT
- }
- gt_echo='echo_func'
- fi
- fi
-
- # A sed script that extracts the value of VARIABLE from a Makefile.
- tab=`printf '\t'`
- sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
- # Seen the first line of the variable definition.
- s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
- ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
- # Set POTFILES to the value of the Makefile variable POTFILES.
- sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
- POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
- # Compute POTFILES_DEPS as
- # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
- POTFILES_DEPS=
- for file in $POTFILES; do
- POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
- done
- POMAKEFILEDEPS=""
-
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
- sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
- ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
- fi
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- # Compute PROPERTIESFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
- # Compute CLASSFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
- # Compute QMFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
- # Compute MSGFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
- # Compute RESOURCESDLLFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- PROPERTIESFILES=
- CLASSFILES=
- QMFILES=
- MSGFILES=
- RESOURCESDLLFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
- CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
- QMFILES="$QMFILES $srcdirpre$lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- JAVACATALOGS=
- QTCATALOGS=
- TCLCATALOGS=
- CSHARPCATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
- QTCATALOGS="$QTCATALOGS $lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
- done
+ dnl Check for API introduced in Mac OS X 10.4.
+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+ [gt_cv_func_CFPreferencesCopyAppValue],
+ [gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFPreferences.h>]],
+ [[CFPreferencesCopyAppValue(NULL, NULL)]])],
+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
+ [gt_cv_func_CFPreferencesCopyAppValue=no])
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+ [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
fi
-
- sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
- tab=`printf '\t'`
- if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
+ dnl Check for API introduced in Mac OS X 10.5.
+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+ [gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFLocale.h>]],
+ [[CFLocaleCopyCurrent();]])],
+ [gt_cv_func_CFLocaleCopyCurrent=yes],
+ [gt_cv_func_CFLocaleCopyCurrent=no])
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
fi
- if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
+ AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
+ [gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFLocale.h>]],
+ [[CFLocaleCopyPreferredLanguages();]])],
+ [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
+ [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
+ LIBS="$gt_save_LIBS"])
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+ AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
fi
- if test -n "$POMAKEFILEDEPS"; then
- cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
+ INTL_MACOSX_LIBS=
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
fi
- mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
- XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
- AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
- XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+ AC_SUBST([INTL_MACOSX_LIBS])
])
# Copyright (C) 2002-2018 Free Software Foundation, Inc.
@@ -489,7 +108,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -505,7 +124,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1597,6 +1216,7 @@ m4_include([gnulib/m4/extern-inline.m4])
m4_include([gnulib/m4/float_h.m4])
m4_include([gnulib/m4/getdelim.m4])
m4_include([gnulib/m4/getline.m4])
+m4_include([gnulib/m4/gettext.m4])
m4_include([gnulib/m4/gnulib-common.m4])
m4_include([gnulib/m4/gnulib-comp.m4])
m4_include([gnulib/m4/host-cpu-c-abi.m4])
@@ -1617,8 +1237,11 @@ m4_include([gnulib/m4/lt~obsolete.m4])
m4_include([gnulib/m4/memchr.m4])
m4_include([gnulib/m4/mmap-anon.m4])
m4_include([gnulib/m4/multiarch.m4])
+m4_include([gnulib/m4/nls.m4])
m4_include([gnulib/m4/off_t.m4])
+m4_include([gnulib/m4/po.m4])
m4_include([gnulib/m4/printf.m4])
+m4_include([gnulib/m4/progtest.m4])
m4_include([gnulib/m4/rawmemchr.m4])
m4_include([gnulib/m4/size_max.m4])
m4_include([gnulib/m4/ssize_t.m4])
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/compile b/macros/texinfo/texinfo/tp/Texinfo/XS/compile
index a85b723c7e..99e50524b3 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/compile
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/config.guess b/macros/texinfo/texinfo/tp/Texinfo/XS/config.guess
index 6c32c8645c..256083a70d 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/config.guess
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2014-11-04'
+timestamp='2018-03-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2014-11-04'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2014-11-04'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches@gnu.org>.
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
+ ,,) echo "int x;" > "$dummy.c" ;
for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
+ eval "$set_cc_for_build"
+ cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -168,21 +175,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+ "/sbin/$sysctl" 2>/dev/null || \
+ "/usr/sbin/$sysctl" 2>/dev/null || \
+ echo unknown)`
+ case "$UNAME_MACHINE_ARCH" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ earmv*)
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine="${arch}${endian}"-unknown
+ ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
+ # to ELF recently (or will in the future) and ABI.
+ case "$UNAME_MACHINE_ARCH" in
+ earm*)
+ os=netbsdelf
+ ;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -197,44 +214,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
os=netbsd
;;
esac
+ # Determine ABI tags.
+ case "$UNAME_MACHINE_ARCH" in
+ earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+ ;;
+ esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
+ case "$UNAME_VERSION" in
Debian*)
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
+ echo "$machine-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+ exit ;;
+ *:LibertyBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ exit ;;
+ *:MidnightBSD:*:*)
+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
+ *:Sortix:*:*)
+ echo "$UNAME_MACHINE"-unknown-sortix
+ exit ;;
+ *:Redox:*:*)
+ echo "$UNAME_MACHINE"-unknown-redox
+ exit ;;
+ mips:OSF1:*.*)
+ echo mips-dec-osf1
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -251,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
+ UNAME_MACHINE=alphaev5 ;;
"EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
+ UNAME_MACHINE=alphaev56 ;;
"EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
+ UNAME_MACHINE=alphapca56 ;;
"EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
+ UNAME_MACHINE=alphapca57 ;;
"EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
+ UNAME_MACHINE=alphaev6 ;;
"EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
+ UNAME_MACHINE=alphaev67 ;;
"EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
+ UNAME_MACHINE=alphaev69 ;;
"EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
+ UNAME_MACHINE=alphaev7 ;;
"EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
+ UNAME_MACHINE=alphaev79 ;;
esac
# A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
+ echo "$UNAME_MACHINE"-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ echo "$UNAME_MACHINE"-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -319,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
+ echo arm-acorn-riscix"$UNAME_RELEASE"
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
@@ -346,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
+ echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
+ eval "$set_cc_for_build"
+ SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
- SUN_ARCH="x86_64"
+ SUN_ARCH=x86_64
fi
fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
@@ -386,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
exit ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
;;
sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
+ echo sparc-sun-sunos"$UNAME_RELEASE"
;;
esac
exit ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
+ echo sparc-auspex-sunos"$UNAME_RELEASE"
exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
@@ -415,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
+ echo m68k-milan-mint"$UNAME_RELEASE"
exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
+ echo m68k-hades-mint"$UNAME_RELEASE"
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
+ echo m68k-unknown-mint"$UNAME_RELEASE"
exit ;;
m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
+ echo m68k-apple-machten"$UNAME_RELEASE"
exit ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
+ echo powerpc-apple-machten"$UNAME_RELEASE"
exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
+ echo mips-dec-ultrix"$UNAME_RELEASE"
exit ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
+ echo vax-dec-ultrix"$UNAME_RELEASE"
exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
+ echo clipper-intergraph-clix"$UNAME_RELEASE"
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
@@ -461,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
+ echo mips-mips-riscos"$UNAME_RELEASE"
exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
@@ -503,17 +534,17 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+ [ "$TARGET_BINARY_INTERFACE"x = x ]
then
- echo m88k-dg-dgux${UNAME_RELEASE}
+ echo m88k-dg-dgux"$UNAME_RELEASE"
else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
fi
else
- echo i586-dg-dgux${UNAME_RELEASE}
+ echo i586-dg-dgux"$UNAME_RELEASE"
fi
exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -530,7 +561,7 @@ EOF
echo m68k-tektronix-bsd
exit ;;
*:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -542,14 +573,14 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#include <sys/systemcfg.h>
main()
@@ -560,7 +591,7 @@ EOF
exit(0);
}
EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
then
echo "$SYSTEM_NAME"
else
@@ -574,7 +605,7 @@ EOF
exit ;;
*:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -583,18 +614,18 @@ EOF
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
@@ -609,28 +640,28 @@ EOF
echo m68k-hp-bsd4.4
exit ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ case "$UNAME_MACHINE" in
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ case "$sc_cpu_version" in
+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ case "$sc_kernel_bits" in
+ 32) HP_ARCH=hppa2.0n ;;
+ 64) HP_ARCH=hppa2.0w ;;
+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
esac ;;
esac
fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ if [ "$HP_ARCH" = "" ]; then
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -663,13 +694,13 @@ EOF
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
+ if [ "$HP_ARCH" = hppa2.0w ]
then
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -680,23 +711,23 @@ EOF
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
# => hppa64-hp-hpux11.23
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
grep -q __LP64__
then
- HP_ARCH="hppa2.0w"
+ HP_ARCH=hppa2.0w
else
- HP_ARCH="hppa64"
+ HP_ARCH=hppa64
fi
fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
exit ;;
ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux"$HPUX_REV"
exit ;;
3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#include <unistd.h>
int
main ()
@@ -721,11 +752,11 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -734,7 +765,7 @@ EOF
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -742,9 +773,9 @@ EOF
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
+ echo "$UNAME_MACHINE"-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
+ echo "$UNAME_MACHINE"-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -769,127 +800,109 @@ EOF
echo c4-convex-bsd
exit ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
+ case "$UNAME_PROCESSOR" in
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
esac
+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
+ echo "$UNAME_MACHINE"-pc-cygwin
exit ;;
*:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
+ echo "$UNAME_MACHINE"-pc-mingw64
exit ;;
*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
+ echo "$UNAME_MACHINE"-pc-mingw32
exit ;;
*:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ echo "$UNAME_MACHINE"-pc-msys
exit ;;
i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
+ echo "$UNAME_MACHINE"-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case "$UNAME_MACHINE" in
x86)
- echo i586-pc-interix${UNAME_RELEASE}
+ echo i586-pc-interix"$UNAME_RELEASE"
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
+ echo x86_64-unknown-interix"$UNAME_RELEASE"
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
+ echo ia64-unknown-interix"$UNAME_RELEASE"
exit ;;
esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
+ echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
exit ;;
i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
+ echo "$UNAME_MACHINE"-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -902,58 +915,64 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+ exit ;;
+ e2k:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
+ k1om:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ eval "$set_cc_for_build"
+ sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
@@ -967,64 +986,70 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
;;
+ mips64el:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
+ echo or1k-unknown-linux-"$LIBC"
exit ;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-unknown-linux-"$LIBC"
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-"$LIBC"
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+ *) echo hppa-unknown-linux-"$LIBC" ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-"$LIBC"
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-"$LIBC"
exit ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
+ echo powerpc64le-unknown-linux-"$LIBC"
exit ;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
+ echo powerpcle-unknown-linux-"$LIBC"
+ exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1038,34 +1063,34 @@ EOF
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
+ echo "$UNAME_MACHINE"-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ echo "$UNAME_MACHINE"-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ echo "$UNAME_MACHINE"-unknown-atheos
exit ;;
i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
+ echo "$UNAME_MACHINE"-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
+ echo i386-unknown-lynxos"$UNAME_RELEASE"
exit ;;
i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ i*86:*:4.*:*)
+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
fi
exit ;;
i*86:*:5:[678]*)
@@ -1075,12 +1100,12 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1090,9 +1115,9 @@ EOF
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv32
+ echo "$UNAME_MACHINE"-pc-sysv32
fi
exit ;;
pc:*:*:*)
@@ -1100,7 +1125,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
+ # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
@@ -1112,9 +1137,9 @@ EOF
exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1134,9 +1159,9 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
@@ -1145,28 +1170,28 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
+ echo mips-dde-sysv"$UNAME_RELEASE"
exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
@@ -1177,7 +1202,7 @@ EOF
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
+ echo "$UNAME_MACHINE"-sni-sysv4
else
echo ns32k-sni-sysv
fi
@@ -1197,23 +1222,23 @@ EOF
exit ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
+ echo "$UNAME_MACHINE"-stratus-vos
exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
exit ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
+ echo m68k-apple-aux"$UNAME_RELEASE"
exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv"$UNAME_RELEASE"
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv"$UNAME_RELEASE"
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1232,46 +1257,56 @@ EOF
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
+ echo sx4-nec-superux"$UNAME_RELEASE"
exit ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
+ echo sx5-nec-superux"$UNAME_RELEASE"
exit ;;
SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
+ echo sx6-nec-superux"$UNAME_RELEASE"
exit ;;
SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
+ echo sx7-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
+ echo sx8-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
+ echo sx8r-nec-superux"$UNAME_RELEASE"
+ exit ;;
+ SX-ACE:SUPER-UX:*:*)
+ echo sxace-nec-superux"$UNAME_RELEASE"
exit ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_PPC >/dev/null
+ then
+ UNAME_PROCESSOR=powerpc
+ fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1282,27 +1317,33 @@ EOF
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
+ if test "$UNAME_PROCESSOR" = x86; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
+ NEO-*:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
+ echo nse-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSR-*:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk"$UNAME_RELEASE"
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
+ NSV-*:NONSTOP_KERNEL:*:*)
+ echo nsv-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSX-*:NONSTOP_KERNEL:*:*)
+ echo nsx-tandem-nsk"$UNAME_RELEASE"
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
@@ -1311,18 +1352,18 @@ EOF
echo bs2000-siemens-sysv
exit ;;
DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
- if test "$cputype" = "386"; then
+ if test "$cputype" = 386; then
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-unknown-plan9
+ echo "$UNAME_MACHINE"-unknown-plan9
exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
@@ -1343,14 +1384,14 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux"$UNAME_RELEASE"
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
+ case "$UNAME_MACHINE" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
V*) echo vax-dec-vms ; exit ;;
@@ -1359,34 +1400,48 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
exit ;;
i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
+ echo "$UNAME_MACHINE"-pc-rdos
exit ;;
i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
+ echo "$UNAME_MACHINE"-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
+ echo "$UNAME_MACHINE"-unknown-esx
+ exit ;;
+ amd64:Isilon\ OneFS:*:*)
+ echo x86_64-unknown-onefs
exit ;;
esac
+echo "$0: unable to guess system type" >&2
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+ mips:Linux | mips64:Linux)
+ # If we got here on MIPS GNU/Linux, output extra information.
+ cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+ ;;
+esac
+
cat >&2 <<EOF
-$0: unable to guess system type
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
config.guess timestamp = $timestamp
@@ -1405,16 +1460,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
EOF
exit 1
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/config.in b/macros/texinfo/texinfo/tp/Texinfo/XS/config.in
index a55d5759fc..f884481900 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/config.in
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/config.in
@@ -33,6 +33,10 @@
/* Define as the word index where to find the exponent of 'double'. */
#undef DBL_EXPBIT0_WORD
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+#undef ENABLE_NLS
+
/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
whether the gnulib module fscanf shall be considered present. */
#undef GNULIB_FSCANF
@@ -80,9 +84,25 @@
/* Define to 1 if you have the <bp-sym.h> header file. */
#undef HAVE_BP_SYM_H
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the Mac OS X function
+ CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
+
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
/* Define to 1 if you have the <crtdefs.h> header file. */
#undef HAVE_CRTDEFS_H
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+#undef HAVE_DCGETTEXT
+
/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
don't. */
#undef HAVE_DECL_GETC_UNLOCKED
@@ -122,6 +142,9 @@
/* Define to 1 if you have the `getdelim' function. */
#undef HAVE_GETDELIM
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
/* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV
@@ -416,10 +439,13 @@
/* The _Noreturn keyword of C11. */
#ifndef _Noreturn
-# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# if (defined __cplusplus \
+ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
+ || (defined _MSC_VER && 1900 <= _MSC_VER)))
# define _Noreturn [[noreturn]]
-# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
- || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+# elif ((!defined __cplusplus || defined __clang__) \
+ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
+ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)))
/* _Noreturn works as-is. */
# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
# define _Noreturn __attribute__ ((__noreturn__))
@@ -447,6 +473,33 @@
/* Define to 1 if the system <stdint.h> predates C++11. */
#undef __STDC_LIMIT_MACROS
+/* The _GL_ASYNC_SAFE marker should be attached to functions that are
+ signal handlers (for signals other than SIGABRT, SIGPIPE) or can be
+ invoked from such signal handlers. Such functions have some restrictions:
+ * All functions that it calls should be marked _GL_ASYNC_SAFE as well,
+ or should be listed as async-signal-safe in POSIX
+ <http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04>
+ section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in
+ particular, are NOT async-signal-safe.
+ * All memory locations (variables and struct fields) that these functions
+ access must be marked 'volatile'. This holds for both read and write
+ accesses. Otherwise the compiler might optimize away stores to and
+ reads from such locations that occur in the program, depending on its
+ data flow analysis. For example, when the program contains a loop
+ that is intended to inspect a variable set from within a signal handler
+ while (!signal_occurred)
+ ;
+ the compiler is allowed to transform this into an endless loop if the
+ variable 'signal_occurred' is not declared 'volatile'.
+ Additionally, recall that:
+ * A signal handler should not modify errno (except if it is a handler
+ for a fatal signal and ends by raising the same signal again, thus
+ provoking the termination of the process). If it invokes a function
+ that may clobber errno, it needs to save and restore the value of
+ errno. */
+#define _GL_ASYNC_SAFE
+
+
/* Please see the Gnulib manual for how to use these macros.
Suppress extern inline with HP-UX cc, as it appears to be broken; see
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/config.sub b/macros/texinfo/texinfo/tp/Texinfo/XS/config.sub
index 7ffe373784..9ccf09a7a3 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/config.sub
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2014-12-03'
+timestamp='2018-03-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2014-12-03'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2014-12-03'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -53,12 +53,11 @@ timestamp='2014-12-03'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -95,7 +94,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
- echo $1
+ echo "$1"
exit ;;
* )
@@ -113,24 +112,24 @@ esac
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+ kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
android-linux)
os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
;;
*)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
+ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+ if [ "$basic_machine" != "$1" ]
+ then os=`echo "$1" | sed 's/.*-/-/'`
else os=; fi
;;
esac
@@ -179,44 +178,44 @@ case $os in
;;
-sco6)
os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco4)
os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2.[4-9]*)
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-isc)
os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-clix*)
basic_machine=clipper-intergraph
;;
-isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
@@ -228,10 +227,7 @@ case $os in
os=-lynxos
;;
-ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
;;
-psos*)
os=-psos
@@ -255,15 +251,16 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
+ | ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
- | epiphany \
- | fido | fr30 | frv \
+ | e2k | epiphany \
+ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
- | i370 | i860 | i960 | ia64 \
+ | i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
@@ -299,13 +296,14 @@ case $basic_machine in
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
- | pdp10 | pdp11 | pj | pjl \
+ | pdp10 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -314,7 +312,7 @@ case $basic_machine in
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
- | we32k \
+ | wasm32 \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -335,7 +333,7 @@ case $basic_machine in
basic_machine=$basic_machine-unknown
os=-none
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
ms1)
basic_machine=mt-unknown
@@ -364,7 +362,7 @@ case $basic_machine in
;;
# Object if more than one company name word.
*-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -376,17 +374,18 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
- | elxsi-* \
+ | e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
+ | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
@@ -427,13 +426,15 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pru-* \
| pyramid-* \
+ | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
@@ -442,6 +443,7 @@ case $basic_machine in
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
+ | wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -455,7 +457,7 @@ case $basic_machine in
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
- basic_machine=i386-unknown
+ basic_machine=i386-pc
os=-bsd
;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -489,7 +491,7 @@ case $basic_machine in
basic_machine=x86_64-pc
;;
amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
amdahl)
basic_machine=580-amdahl
@@ -518,6 +520,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
+ asmjs)
+ basic_machine=asmjs-unknown
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -531,7 +536,7 @@ case $basic_machine in
os=-linux
;;
blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
bluegene*)
@@ -539,13 +544,13 @@ case $basic_machine in
os=-cnk
;;
c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
c90)
basic_machine=c90-cray
@@ -634,10 +639,18 @@ case $basic_machine in
basic_machine=rs6000-bull
os=-bosx
;;
- dpx2* | dpx2*-bull)
+ dpx2*)
basic_machine=m68k-bull
os=-sysv3
;;
+ e500v[12])
+ basic_machine=powerpc-unknown
+ os=$os"spe"
+ ;;
+ e500v[12]-*)
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ os=$os"spe"
+ ;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
@@ -727,9 +740,6 @@ case $basic_machine in
hp9k8[0-9][0-9] | hp8[0-9][0-9])
basic_machine=hppa1.0-hp
;;
- hppa-next)
- os=-nextstep3
- ;;
hppaosf)
basic_machine=hppa1.1-hp
os=-osf
@@ -742,26 +752,26 @@ case $basic_machine in
basic_machine=i370-ibm
;;
i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
i386mach)
basic_machine=i386-mach
os=-mach
;;
- i386-vsta | vsta)
+ vsta)
basic_machine=i386-unknown
os=-vsta
;;
@@ -780,19 +790,16 @@ case $basic_machine in
os=-sysv
;;
leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
magnum | m3230)
basic_machine=mips-mips
os=-sysv
@@ -824,10 +831,10 @@ case $basic_machine in
os=-mint
;;
mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
;;
mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
;;
monitor)
basic_machine=m68k-rom68k
@@ -846,7 +853,7 @@ case $basic_machine in
os=-msdos
;;
ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i686-pc
@@ -888,7 +895,7 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -933,6 +940,12 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
+ nsv-tandem)
+ basic_machine=nsv-tandem
+ ;;
+ nsx-tandem)
+ basic_machine=nsx-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
@@ -965,7 +978,7 @@ case $basic_machine in
os=-linux
;;
parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
@@ -981,7 +994,7 @@ case $basic_machine in
basic_machine=i386-pc
;;
pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
@@ -996,16 +1009,16 @@ case $basic_machine in
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
@@ -1015,23 +1028,23 @@ case $basic_machine in
ppc | ppcbe) basic_machine=powerpc-unknown
;;
ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
+ ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
ps2)
basic_machine=i386-ibm
@@ -1085,17 +1098,10 @@ case $basic_machine in
sequent)
basic_machine=i386-sequent
;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
sh5el)
basic_machine=sh5le-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
+ simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -1114,7 +1120,7 @@ case $basic_machine in
os=-sysv4
;;
strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
sun2)
basic_machine=m68000-sun
@@ -1236,6 +1242,9 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ x64)
+ basic_machine=x86_64-pc
+ ;;
xbox)
basic_machine=i686-pc
os=-mingw32
@@ -1244,20 +1253,12 @@ case $basic_machine in
basic_machine=xps100-honeywell
;;
xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
;;
ymp)
basic_machine=ymp-cray
os=-unicos
;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1286,10 +1287,6 @@ case $basic_machine in
vax)
basic_machine=vax-dec
;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
pdp11)
basic_machine=pdp11-dec
;;
@@ -1299,9 +1296,6 @@ case $basic_machine in
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
cydra)
basic_machine=cydra-cydrome
;;
@@ -1321,7 +1315,7 @@ case $basic_machine in
# Make sure to match an already-canonicalized machine name.
;;
*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
exit 1
;;
esac
@@ -1329,10 +1323,10 @@ esac
# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
*-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
;;
*-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
;;
*)
;;
@@ -1343,8 +1337,8 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases that might get confused
+ # with valid system types.
# -solaris* is a basic system type, with this one exception.
-auroraux)
os=-auroraux
@@ -1355,45 +1349,48 @@ case $os in
-solaris)
os=-solaris2
;;
- -svr4*)
- os=-sysv4
- ;;
-unixware*)
os=-sysv4.2uw
;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
- # First accept the basic system types.
+ # es1800 is here to avoid being matched by es* (a different OS)
+ -es1800*)
+ os=-ose
+ ;;
+ # Now accept the basic system types.
# The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
+ # Each alternative MUST end in a * to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* \
+ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
+ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -morphos* | -superux* | -rtmk* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+ | -midnightbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1410,12 +1407,12 @@ case $os in
-nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ -sim | -xray | -os68k* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
+ os=`echo "$os" | sed -e 's|mac|macos|'`
;;
-linux-dietlibc)
os=-linux-dietlibc
@@ -1424,10 +1421,10 @@ case $os in
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
-sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
-opened*)
os=-openedition
@@ -1438,12 +1435,6 @@ case $os in
-wince*)
os=-wince
;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
-utek*)
os=-bsd
;;
@@ -1468,7 +1459,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1490,7 +1481,7 @@ case $os in
-oss*)
os=-sysv3
;;
- -svr4)
+ -svr4*)
os=-sysv4
;;
-svr3)
@@ -1505,32 +1496,38 @@ case $os in
-ose*)
os=-ose
;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
- -aros*)
- os=-aros
- ;;
-zvmoe)
os=-zvmoe
;;
-dicos*)
os=-dicos
;;
+ -pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $basic_machine in
+ arm*)
+ os=-eabi
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
-nacl*)
;;
+ -ios)
+ ;;
-none)
;;
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
exit 1
;;
esac
@@ -1620,12 +1617,12 @@ case $basic_machine in
sparc-* | *-sun)
os=-sunos4.1.1
;;
+ pru-*)
+ os=-elf
+ ;;
*-be)
os=-beos
;;
- *-haiku)
- os=-haiku
- ;;
*-ibm)
os=-aix
;;
@@ -1665,7 +1662,7 @@ case $basic_machine in
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
@@ -1680,9 +1677,6 @@ case $basic_machine in
i370-*)
os=-mvs
;;
- *-next)
- os=-nextstep3
- ;;
*-gould)
os=-sysv
;;
@@ -1792,15 +1786,15 @@ case $basic_machine in
vendor=stratus
;;
esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
;;
esac
-echo $basic_machine$os
+echo "$basic_machine$os"
exit
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/configure b/macros/texinfo/texinfo/tp/Texinfo/XS/configure
index 83ef85f3de..892ad6dc17 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/configure
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/configure
@@ -628,6 +628,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
+gt_needs=
ac_func_list=
ac_header_list=
ac_subst_vars='gltests_LTLIBOBJS
@@ -669,7 +670,6 @@ ac_ct_DUMPBIN
DUMPBIN
LD
FGREP
-SED
LIBTOOL
gltests_WITNESS
HAVE_CRTDEFS_H
@@ -896,8 +896,6 @@ GL_GENERATE_LIMITS_H_TRUE
LIMITS_H
NEXT_AS_FIRST_DIRECTIVE_LIMITS_H
NEXT_LIMITS_H
-LTLIBICONV
-LIBICONV
REPLACE_VSPRINTF
REPLACE_VSNPRINTF
REPLACE_VPRINTF
@@ -1016,18 +1014,11 @@ GL_GENERATE_ERRNO_H_TRUE
ERRNO_H
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H
NEXT_ERRNO_H
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
PRAGMA_COLUMNS
PRAGMA_SYSTEM_HEADER
INCLUDE_NEXT_AS_FIRST_DIRECTIVE
INCLUDE_NEXT
+HAVE_ALLOCA_H
GL_GENERATE_ALLOCA_H_FALSE
GL_GENERATE_ALLOCA_H_TRUE
ALLOCA_H
@@ -1035,6 +1026,32 @@ ALLOCA
GL_COND_LIBTOOL_FALSE
GL_COND_LIBTOOL_TRUE
XSUBPP
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+LTLIBICONV
+LIBICONV
+INTL_MACOSX_LIBS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+XGETTEXT_EXTRA_OPTIONS
+MSGMERGE
+XGETTEXT_015
+XGETTEXT
+GMSGFMT_015
+MSGFMT_015
+GMSGFMT
+MSGFMT
+GETTEXT_MACRO_VERSION
+USE_NLS
+SED
RANLIB
ARFLAGS
AR
@@ -1105,6 +1122,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -1131,9 +1149,11 @@ enable_option_checking
enable_silent_rules
enable_perl_xs
enable_dependency_tracking
+enable_nls
with_gnu_ld
enable_rpath
with_libiconv_prefix
+with_libintl_prefix
enable_static
enable_shared
with_pic
@@ -1194,6 +1214,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1446,6 +1467,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1583,7 +1613,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1736,6 +1766,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1781,6 +1812,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
+ --disable-nls do not use Native Language Support
--disable-rpath do not hardcode runtime library paths
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
@@ -1794,6 +1826,8 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --without-libintl-prefix don't search for libintl in includedir and libdir
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-aix-soname=aix|svr4|both
@@ -2137,6 +2171,52 @@ $as_echo "$ac_res" >&6; }
} # ac_fn_c_check_header_compile
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
# -------------------------------------------
# Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2191,52 +2271,6 @@ $as_echo "$ac_res" >&6; }
} # ac_fn_c_check_type
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- test -x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2816,6 +2850,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
+gt_needs="$gt_needs "
as_fn_append ac_func_list " getdelim"
as_fn_append ac_header_list " limits.h"
as_fn_append ac_header_list " sys/mman.h"
@@ -5477,332 +5512,387 @@ fi
# Code from module xsize:
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
-XSUBPP=${XSUBPP-"${am_missing_run}xsubpp"}
+ $ac_path_SED_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+else
+ ac_cv_path_SED=$SED
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+ # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+ enableval=$enable_nls; USE_NLS=$enableval
+else
+ USE_NLS=yes
+fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
- LIBC_FATAL_STDERR_=1
- export LIBC_FATAL_STDERR_
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+ GETTEXT_MACRO_VERSION=0.19
-else
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-fi
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments. Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_working_alloca_h=yes
-else
- ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
fi
+rm -f conf$$.file
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-# endif
-# endif
-# endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_func_alloca_works=yes
-else
- ac_cv_func_alloca_works=no
+ case "$MSGFMT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+ ;;
+esac
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMSGFMT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GMSGFMT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
else
- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble. Some versions do not even contain alloca or
-# contain a buggy version. If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+ *) MSGFMT_015=$MSGFMT ;;
+ esac
+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+ *) GMSGFMT_015=$GMSGFMT ;;
+ esac
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
+fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
- $as_echo_n "(cached) " >&6
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then :
- ac_cv_os_cray=yes
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XGETTEXT+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_os_cray=no
+ case "$XGETTEXT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ ;;
+esac
fi
-rm -f conftest*
-
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
+ rm -f messages.po
- break
-fi
+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+ *) XGETTEXT_015=$XGETTEXT ;;
+ esac
- done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- ac_cv_c_stack_direction=0
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-find_stack_direction (int *addr, int depth)
-{
- int dir, dummy = 0;
- if (! addr)
- addr = &dummy;
- *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
- dir = depth ? find_stack_direction (addr, depth - 1) : 0;
- return dir + dummy;
-}
-
-int
-main (int argc, char **argv)
-{
- return find_stack_direction (0, argc + !argv + 20) < 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_c_stack_direction=1
-else
- ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
fi
+rm -f conf$$.file
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
-$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
-if ${gl_cv_have_include_next+:} false; then :
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGMERGE+:} false; then :
$as_echo_n "(cached) " >&6
else
- rm -rf conftestd1a conftestd1b conftestd2
- mkdir conftestd1a conftestd1b conftestd2
- cat <<EOF > conftestd1a/conftest.h
-#define DEFINED_IN_CONFTESTD1
-#include_next <conftest.h>
-#ifdef DEFINED_IN_CONFTESTD2
-int foo;
-#else
-#error "include_next doesn't work"
-#endif
-EOF
- cat <<EOF > conftestd1b/conftest.h
-#define DEFINED_IN_CONFTESTD1
-#include <stdio.h>
-#include_next <conftest.h>
-#ifdef DEFINED_IN_CONFTESTD2
-int foo;
-#else
-#error "include_next doesn't work"
-#endif
-EOF
- cat <<EOF > conftestd2/conftest.h
-#ifndef DEFINED_IN_CONFTESTD1
-#error "include_next test doesn't work"
-#endif
-#define DEFINED_IN_CONFTESTD2
-EOF
- gl_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <conftest.h>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_have_include_next=yes
-else
- CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <conftest.h>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_have_include_next=buggy
+ case "$MSGMERGE" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+ ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
else
- gl_cv_have_include_next=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CPPFLAGS="$gl_save_CPPFLAGS"
- rm -rf conftestd1a conftestd1b conftestd2
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
-$as_echo "$gl_cv_have_include_next" >&6; }
- PRAGMA_SYSTEM_HEADER=
- if test $gl_cv_have_include_next = yes; then
- INCLUDE_NEXT=include_next
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
- if test -n "$GCC"; then
- PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
- fi
- else
- if test $gl_cv_have_include_next = buggy; then
- INCLUDE_NEXT=include
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
- else
- INCLUDE_NEXT=include
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
- fi
- fi
+ test -n "$localedir" || localedir='${datadir}/locale'
+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
-$as_echo_n "checking whether system header files limit the line length... " >&6; }
-if ${gl_cv_pragma_columns+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __TANDEM
-choke me
-#endif
+ ac_config_commands="$ac_config_commands po-directories"
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "choke me" >/dev/null 2>&1; then :
- gl_cv_pragma_columns=yes
-else
- gl_cv_pragma_columns=no
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5
-$as_echo "$gl_cv_pragma_columns" >&6; }
- if test $gl_cv_pragma_columns = yes; then
- PRAGMA_COLUMNS="#pragma COLUMNS 10000"
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
else
- PRAGMA_COLUMNS=
+ acl_final_prefix="$prefix"
fi
-
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -5877,543 +5967,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
-$as_echo_n "checking for complete errno.h... " >&6; }
-if ${gl_cv_header_errno_h_complete+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <errno.h>
-#if !defined ETXTBSY
-booboo
-#endif
-#if !defined ENOMSG
-booboo
-#endif
-#if !defined EIDRM
-booboo
-#endif
-#if !defined ENOLINK
-booboo
-#endif
-#if !defined EPROTO
-booboo
-#endif
-#if !defined EMULTIHOP
-booboo
-#endif
-#if !defined EBADMSG
-booboo
-#endif
-#if !defined EOVERFLOW
-booboo
-#endif
-#if !defined ENOTSUP
-booboo
-#endif
-#if !defined ENETRESET
-booboo
-#endif
-#if !defined ECONNABORTED
-booboo
-#endif
-#if !defined ESTALE
-booboo
-#endif
-#if !defined EDQUOT
-booboo
-#endif
-#if !defined ECANCELED
-booboo
-#endif
-#if !defined EOWNERDEAD
-booboo
-#endif
-#if !defined ENOTRECOVERABLE
-booboo
-#endif
-#if !defined EILSEQ
-booboo
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "booboo" >/dev/null 2>&1; then :
- gl_cv_header_errno_h_complete=no
-else
- gl_cv_header_errno_h_complete=yes
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
-$as_echo "$gl_cv_header_errno_h_complete" >&6; }
- if test $gl_cv_header_errno_h_complete = yes; then
- ERRNO_H=''
- else
-
-
-
-
-
-
-
-
- if test $gl_cv_have_include_next = yes; then
- gl_cv_next_errno_h='<'errno.h'>'
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
-$as_echo_n "checking absolute name of <errno.h>... " >&6; }
-if ${gl_cv_next_errno_h+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <errno.h>
-_ACEOF
- case "$host_os" in
- aix*) gl_absname_cpp="$ac_cpp -C" ;;
- *) gl_absname_cpp="$ac_cpp" ;;
- esac
-
- case "$host_os" in
- mingw*)
- gl_dirsep_regex='[/\\]'
- ;;
- *)
- gl_dirsep_regex='\/'
- ;;
- esac
- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
- gl_header_literal_regex=`echo 'errno.h' \
- | sed -e "$gl_make_literal_regex_sed"`
- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
- s|^/[^/]|//&|
- p
- q
- }'
-
- gl_cv_absolute_errno_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
- sed -n "$gl_absolute_header_sed"`
-
- gl_header=$gl_cv_absolute_errno_h
- gl_cv_next_errno_h='"'$gl_header'"'
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
-$as_echo "$gl_cv_next_errno_h" >&6; }
- fi
- NEXT_ERRNO_H=$gl_cv_next_errno_h
-
- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
- gl_next_as_first_directive='<'errno.h'>'
- else
- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
- gl_next_as_first_directive=$gl_cv_next_errno_h
- fi
- NEXT_AS_FIRST_DIRECTIVE_ERRNO_H=$gl_next_as_first_directive
-
-
-
-
- ERRNO_H='errno.h'
- fi
-
- if test -n "$ERRNO_H"; then
- GL_GENERATE_ERRNO_H_TRUE=
- GL_GENERATE_ERRNO_H_FALSE='#'
-else
- GL_GENERATE_ERRNO_H_TRUE='#'
- GL_GENERATE_ERRNO_H_FALSE=
-fi
-
-
- if test -n "$ERRNO_H"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
-$as_echo_n "checking for EMULTIHOP value... " >&6; }
-if ${gl_cv_header_errno_h_EMULTIHOP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <errno.h>
-#ifdef EMULTIHOP
-yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- gl_cv_header_errno_h_EMULTIHOP=yes
-else
- gl_cv_header_errno_h_EMULTIHOP=no
-fi
-rm -f conftest*
-
- if test $gl_cv_header_errno_h_EMULTIHOP = no; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#define _XOPEN_SOURCE_EXTENDED 1
-#include <errno.h>
-#ifdef EMULTIHOP
-yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- gl_cv_header_errno_h_EMULTIHOP=hidden
-fi
-rm -f conftest*
-
- if test $gl_cv_header_errno_h_EMULTIHOP = hidden; then
- if ac_fn_c_compute_int "$LINENO" "EMULTIHOP" "gl_cv_header_errno_h_EMULTIHOP" "
-#define _XOPEN_SOURCE_EXTENDED 1
-#include <errno.h>
-/* The following two lines are a workaround against an autoconf-2.52 bug. */
-#include <stdio.h>
-#include <stdlib.h>
-"; then :
-
-fi
-
- fi
- fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
-$as_echo "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
- case $gl_cv_header_errno_h_EMULTIHOP in
- yes | no)
- EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE=
- ;;
- *)
- EMULTIHOP_HIDDEN=1; EMULTIHOP_VALUE="$gl_cv_header_errno_h_EMULTIHOP"
- ;;
- esac
-
-
- fi
-
-
- if test -n "$ERRNO_H"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
-$as_echo_n "checking for ENOLINK value... " >&6; }
-if ${gl_cv_header_errno_h_ENOLINK+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <errno.h>
-#ifdef ENOLINK
-yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- gl_cv_header_errno_h_ENOLINK=yes
-else
- gl_cv_header_errno_h_ENOLINK=no
-fi
-rm -f conftest*
-
- if test $gl_cv_header_errno_h_ENOLINK = no; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#define _XOPEN_SOURCE_EXTENDED 1
-#include <errno.h>
-#ifdef ENOLINK
-yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- gl_cv_header_errno_h_ENOLINK=hidden
-fi
-rm -f conftest*
-
- if test $gl_cv_header_errno_h_ENOLINK = hidden; then
- if ac_fn_c_compute_int "$LINENO" "ENOLINK" "gl_cv_header_errno_h_ENOLINK" "
-#define _XOPEN_SOURCE_EXTENDED 1
-#include <errno.h>
-/* The following two lines are a workaround against an autoconf-2.52 bug. */
-#include <stdio.h>
-#include <stdlib.h>
-"; then :
-
-fi
-
- fi
- fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
-$as_echo "$gl_cv_header_errno_h_ENOLINK" >&6; }
- case $gl_cv_header_errno_h_ENOLINK in
- yes | no)
- ENOLINK_HIDDEN=0; ENOLINK_VALUE=
- ;;
- *)
- ENOLINK_HIDDEN=1; ENOLINK_VALUE="$gl_cv_header_errno_h_ENOLINK"
- ;;
- esac
-
-
- fi
-
-
- if test -n "$ERRNO_H"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
-$as_echo_n "checking for EOVERFLOW value... " >&6; }
-if ${gl_cv_header_errno_h_EOVERFLOW+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <errno.h>
-#ifdef EOVERFLOW
-yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- gl_cv_header_errno_h_EOVERFLOW=yes
-else
- gl_cv_header_errno_h_EOVERFLOW=no
-fi
-rm -f conftest*
-
- if test $gl_cv_header_errno_h_EOVERFLOW = no; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#define _XOPEN_SOURCE_EXTENDED 1
-#include <errno.h>
-#ifdef EOVERFLOW
-yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- gl_cv_header_errno_h_EOVERFLOW=hidden
-fi
-rm -f conftest*
-
- if test $gl_cv_header_errno_h_EOVERFLOW = hidden; then
- if ac_fn_c_compute_int "$LINENO" "EOVERFLOW" "gl_cv_header_errno_h_EOVERFLOW" "
-#define _XOPEN_SOURCE_EXTENDED 1
-#include <errno.h>
-/* The following two lines are a workaround against an autoconf-2.52 bug. */
-#include <stdio.h>
-#include <stdlib.h>
-"; then :
-
-fi
-
- fi
- fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
-$as_echo "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
- case $gl_cv_header_errno_h_EOVERFLOW in
- yes | no)
- EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE=
- ;;
- *)
- EOVERFLOW_HIDDEN=1; EOVERFLOW_VALUE="$gl_cv_header_errno_h_EOVERFLOW"
- ;;
- esac
-
-
- fi
-
-
-
-
-
-
- GNULIB_DPRINTF=0;
- GNULIB_FCLOSE=0;
- GNULIB_FDOPEN=0;
- GNULIB_FFLUSH=0;
- GNULIB_FGETC=0;
- GNULIB_FGETS=0;
- GNULIB_FOPEN=0;
- GNULIB_FPRINTF=0;
- GNULIB_FPRINTF_POSIX=0;
- GNULIB_FPURGE=0;
- GNULIB_FPUTC=0;
- GNULIB_FPUTS=0;
- GNULIB_FREAD=0;
- GNULIB_FREOPEN=0;
- GNULIB_FSCANF=0;
- GNULIB_FSEEK=0;
- GNULIB_FSEEKO=0;
- GNULIB_FTELL=0;
- GNULIB_FTELLO=0;
- GNULIB_FWRITE=0;
- GNULIB_GETC=0;
- GNULIB_GETCHAR=0;
- GNULIB_GETDELIM=0;
- GNULIB_GETLINE=0;
- GNULIB_OBSTACK_PRINTF=0;
- GNULIB_OBSTACK_PRINTF_POSIX=0;
- GNULIB_PCLOSE=0;
- GNULIB_PERROR=0;
- GNULIB_POPEN=0;
- GNULIB_PRINTF=0;
- GNULIB_PRINTF_POSIX=0;
- GNULIB_PUTC=0;
- GNULIB_PUTCHAR=0;
- GNULIB_PUTS=0;
- GNULIB_REMOVE=0;
- GNULIB_RENAME=0;
- GNULIB_RENAMEAT=0;
- GNULIB_SCANF=0;
- GNULIB_SNPRINTF=0;
- GNULIB_SPRINTF_POSIX=0;
- GNULIB_STDIO_H_NONBLOCKING=0;
- GNULIB_STDIO_H_SIGPIPE=0;
- GNULIB_TMPFILE=0;
- GNULIB_VASPRINTF=0;
- GNULIB_VFSCANF=0;
- GNULIB_VSCANF=0;
- GNULIB_VDPRINTF=0;
- GNULIB_VFPRINTF=0;
- GNULIB_VFPRINTF_POSIX=0;
- GNULIB_VPRINTF=0;
- GNULIB_VPRINTF_POSIX=0;
- GNULIB_VSNPRINTF=0;
- GNULIB_VSPRINTF_POSIX=0;
- HAVE_DECL_FPURGE=1;
- HAVE_DECL_FSEEKO=1;
- HAVE_DECL_FTELLO=1;
- HAVE_DECL_GETDELIM=1;
- HAVE_DECL_GETLINE=1;
- HAVE_DECL_OBSTACK_PRINTF=1;
- HAVE_DECL_SNPRINTF=1;
- HAVE_DECL_VSNPRINTF=1;
- HAVE_DPRINTF=1;
- HAVE_FSEEKO=1;
- HAVE_FTELLO=1;
- HAVE_PCLOSE=1;
- HAVE_POPEN=1;
- HAVE_RENAMEAT=1;
- HAVE_VASPRINTF=1;
- HAVE_VDPRINTF=1;
- REPLACE_DPRINTF=0;
- REPLACE_FCLOSE=0;
- REPLACE_FDOPEN=0;
- REPLACE_FFLUSH=0;
- REPLACE_FOPEN=0;
- REPLACE_FPRINTF=0;
- REPLACE_FPURGE=0;
- REPLACE_FREOPEN=0;
- REPLACE_FSEEK=0;
- REPLACE_FSEEKO=0;
- REPLACE_FTELL=0;
- REPLACE_FTELLO=0;
- REPLACE_GETDELIM=0;
- REPLACE_GETLINE=0;
- REPLACE_OBSTACK_PRINTF=0;
- REPLACE_PERROR=0;
- REPLACE_POPEN=0;
- REPLACE_PRINTF=0;
- REPLACE_REMOVE=0;
- REPLACE_RENAME=0;
- REPLACE_RENAMEAT=0;
- REPLACE_SNPRINTF=0;
- REPLACE_SPRINTF=0;
- REPLACE_STDIO_READ_FUNCS=0;
- REPLACE_STDIO_WRITE_FUNCS=0;
- REPLACE_TMPFILE=0;
- REPLACE_VASPRINTF=0;
- REPLACE_VDPRINTF=0;
- REPLACE_VFPRINTF=0;
- REPLACE_VPRINTF=0;
- REPLACE_VSNPRINTF=0;
- REPLACE_VSPRINTF=0;
-
-ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getdelim" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETDELIM $ac_have_decl
-_ACEOF
-
-
-
-
- for ac_func in $ac_func_list
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-ac_fn_c_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getline" = xyes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETLINE $ac_have_decl
-_ACEOF
-
-
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-
-
-
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -7414,6 +6967,1993 @@ fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+ gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_CFLocaleCopyCurrent=yes
+else
+ gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; }
+if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyPreferredLanguages();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ gt_cv_func_CFLocaleCopyPreferredLanguages=yes
+else
+ gt_cv_func_CFLocaleCopyPreferredLanguages=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
+
+ fi
+ INTL_MACOSX_LIBS=
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+ fi
+
+
+
+
+
+
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
+
+ case " $gt_needs " in
+ *" need-formatstring-macros "*) gt_api_version=3 ;;
+ *" need-ngettext "*) gt_api_version=2 ;;
+ *) gt_api_version=1 ;;
+ esac
+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+
+
+ if test $gt_api_version -ge 3; then
+ gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+'
+ else
+ gt_revision_test_code=
+ fi
+ if test $gt_api_version -ge 2; then
+ gt_expression_test_code=' + * ngettext ("", "", 0)'
+ else
+ gt_expression_test_code=
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if eval \${$gt_func_gnugettext_libc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+
+int
+main ()
+{
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$gt_func_gnugettext_libc=yes"
+else
+ eval "$gt_func_gnugettext_libc=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$gt_func_gnugettext_libc
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <iconv.h>
+#include <string.h>
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
+{
+int result = 0;
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+ returns. */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+ char buf[10];
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ result |= 1;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+ if (cd_ascii_to_88591 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\263";
+ char buf[10];
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_ascii_to_88591,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ result |= 2;
+ iconv_close (cd_ascii_to_88591);
+ }
+ }
+ /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\304";
+ static char buf[2] = { (char)0xDE, (char)0xAD };
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = 1;
+ char *outptr = buf;
+ size_t outbytesleft = 1;
+ size_t res = iconv (cd_88591_to_utf8,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+ result |= 4;
+ iconv_close (cd_88591_to_utf8);
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ char buf[50];
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ result |= 8;
+ iconv_close (cd_88591_to_utf8);
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ {
+ /* Try standardized names. */
+ iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+ /* Try IRIX, OSF/1 names. */
+ iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+ /* Try AIX names. */
+ iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+ /* Try HP-UX names. */
+ iconv_t cd4 = iconv_open ("utf8", "eucJP");
+ if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+ && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+ result |= 16;
+ if (cd1 != (iconv_t)(-1))
+ iconv_close (cd1);
+ if (cd2 != (iconv_t)(-1))
+ iconv_close (cd2);
+ if (cd3 != (iconv_t)(-1))
+ iconv_close (cd3);
+ if (cd4 != (iconv_t)(-1))
+ iconv_close (cd4);
+ }
+ return result;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ am_cv_func_iconv_works=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ test "$am_cv_func_iconv_works" = no || break
+ done
+ LIBS="$am_save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then :
+ withval=$with_libintl_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
+ && test ! -d "$withval/$acl_libdirstem"; then
+ additional_libdir="$withval/$acl_libdirstem2"
+ fi
+ fi
+ fi
+
+fi
+
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ LIBINTL_PREFIX=
+ HAVE_LIBINTL=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='intl '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ if test "$name" = 'intl'; then
+ LIBINTL_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem2 | */$acl_libdirstem2/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+ if test "$name" = 'intl'; then
+ LIBINTL_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+ done
+ fi
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+
+int
+main ()
+{
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$gt_func_gnugettext_libintl=yes"
+else
+ eval "$gt_func_gnugettext_libintl=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+
+int
+main ()
+{
+
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"
+fi
+eval ac_res=\$$gt_func_gnugettext_libintl
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ fi
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ fi
+
+
+
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+ if test "$USE_NLS" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+ fi
+ else
+ gt_source="included intl directory"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
+
+ for element in $INCINTL; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+ fi
+
+
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+ fi
+
+ POSUB=po
+ fi
+
+
+
+ INTLLIBS="$LIBINTL"
+
+
+
+
+
+
+
+XSUBPP=${XSUBPP-"${am_missing_run}xsubpp"}
+
+
+
+
+
+
+
+
+ LIBC_FATAL_STDERR_=1
+ export LIBC_FATAL_STDERR_
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments. Useless!
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+ if (p) return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_working_alloca_h=yes
+else
+ ac_cv_working_alloca_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
+# else
+# ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca (size_t);
+# endif
+# endif
+# endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+ if (p) return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_func_alloca_works=yes
+else
+ ac_cv_func_alloca_works=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
+
+if test $ac_cv_func_alloca_works = yes; then
+
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+
+else
+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble. Some versions do not even contain alloca or
+# contain a buggy version. If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+
+
+
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "webecray" >/dev/null 2>&1; then :
+ ac_cv_os_cray=yes
+else
+ ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+ break
+fi
+
+ done
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ ac_cv_c_stack_direction=0
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+find_stack_direction (int *addr, int depth)
+{
+ int dir, dummy = 0;
+ if (! addr)
+ addr = &dummy;
+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+ dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+ return dir + dummy;
+}
+
+int
+main (int argc, char **argv)
+{
+ return find_stack_direction (0, argc + !argv + 20) < 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_c_stack_direction=1
+else
+ ac_cv_c_stack_direction=-1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
+$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
+if ${gl_cv_have_include_next+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ rm -rf conftestd1a conftestd1b conftestd2
+ mkdir conftestd1a conftestd1b conftestd2
+ cat <<EOF > conftestd1a/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+ cat <<EOF > conftestd1b/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include <stdio.h>
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+ cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+ gl_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <conftest.h>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_have_include_next=yes
+else
+ CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <conftest.h>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_have_include_next=buggy
+else
+ gl_cv_have_include_next=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="$gl_save_CPPFLAGS"
+ rm -rf conftestd1a conftestd1b conftestd2
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
+$as_echo "$gl_cv_have_include_next" >&6; }
+ PRAGMA_SYSTEM_HEADER=
+ if test $gl_cv_have_include_next = yes; then
+ INCLUDE_NEXT=include_next
+ INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+ if test -n "$GCC"; then
+ PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
+ fi
+ else
+ if test $gl_cv_have_include_next = buggy; then
+ INCLUDE_NEXT=include
+ INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+ else
+ INCLUDE_NEXT=include
+ INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
+ fi
+ fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
+$as_echo_n "checking whether system header files limit the line length... " >&6; }
+if ${gl_cv_pragma_columns+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifdef __TANDEM
+choke me
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "choke me" >/dev/null 2>&1; then :
+ gl_cv_pragma_columns=yes
+else
+ gl_cv_pragma_columns=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5
+$as_echo "$gl_cv_pragma_columns" >&6; }
+ if test $gl_cv_pragma_columns = yes; then
+ PRAGMA_COLUMNS="#pragma COLUMNS 10000"
+ else
+ PRAGMA_COLUMNS=
+ fi
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5
+$as_echo_n "checking for complete errno.h... " >&6; }
+if ${gl_cv_header_errno_h_complete+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <errno.h>
+#if !defined ETXTBSY
+booboo
+#endif
+#if !defined ENOMSG
+booboo
+#endif
+#if !defined EIDRM
+booboo
+#endif
+#if !defined ENOLINK
+booboo
+#endif
+#if !defined EPROTO
+booboo
+#endif
+#if !defined EMULTIHOP
+booboo
+#endif
+#if !defined EBADMSG
+booboo
+#endif
+#if !defined EOVERFLOW
+booboo
+#endif
+#if !defined ENOTSUP
+booboo
+#endif
+#if !defined ENETRESET
+booboo
+#endif
+#if !defined ECONNABORTED
+booboo
+#endif
+#if !defined ESTALE
+booboo
+#endif
+#if !defined EDQUOT
+booboo
+#endif
+#if !defined ECANCELED
+booboo
+#endif
+#if !defined EOWNERDEAD
+booboo
+#endif
+#if !defined ENOTRECOVERABLE
+booboo
+#endif
+#if !defined EILSEQ
+booboo
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "booboo" >/dev/null 2>&1; then :
+ gl_cv_header_errno_h_complete=no
+else
+ gl_cv_header_errno_h_complete=yes
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
+$as_echo "$gl_cv_header_errno_h_complete" >&6; }
+ if test $gl_cv_header_errno_h_complete = yes; then
+ ERRNO_H=''
+ else
+
+
+
+
+
+
+
+
+ if test $gl_cv_have_include_next = yes; then
+ gl_cv_next_errno_h='<'errno.h'>'
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <errno.h>" >&5
+$as_echo_n "checking absolute name of <errno.h>... " >&6; }
+if ${gl_cv_next_errno_h+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <errno.h>
+_ACEOF
+ case "$host_os" in
+ aix*) gl_absname_cpp="$ac_cpp -C" ;;
+ *) gl_absname_cpp="$ac_cpp" ;;
+ esac
+
+ case "$host_os" in
+ mingw*)
+ gl_dirsep_regex='[/\\]'
+ ;;
+ *)
+ gl_dirsep_regex='\/'
+ ;;
+ esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+ gl_header_literal_regex=`echo 'errno.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
+ p
+ q
+ }'
+
+ gl_cv_absolute_errno_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+ sed -n "$gl_absolute_header_sed"`
+
+ gl_header=$gl_cv_absolute_errno_h
+ gl_cv_next_errno_h='"'$gl_header'"'
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
+$as_echo "$gl_cv_next_errno_h" >&6; }
+ fi
+ NEXT_ERRNO_H=$gl_cv_next_errno_h
+
+ if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+ gl_next_as_first_directive='<'errno.h'>'
+ else
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+ gl_next_as_first_directive=$gl_cv_next_errno_h
+ fi
+ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H=$gl_next_as_first_directive
+
+
+
+
+ ERRNO_H='errno.h'
+ fi
+
+ if test -n "$ERRNO_H"; then
+ GL_GENERATE_ERRNO_H_TRUE=
+ GL_GENERATE_ERRNO_H_FALSE='#'
+else
+ GL_GENERATE_ERRNO_H_TRUE='#'
+ GL_GENERATE_ERRNO_H_FALSE=
+fi
+
+
+ if test -n "$ERRNO_H"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5
+$as_echo_n "checking for EMULTIHOP value... " >&6; }
+if ${gl_cv_header_errno_h_EMULTIHOP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <errno.h>
+#ifdef EMULTIHOP
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ gl_cv_header_errno_h_EMULTIHOP=yes
+else
+ gl_cv_header_errno_h_EMULTIHOP=no
+fi
+rm -f conftest*
+
+ if test $gl_cv_header_errno_h_EMULTIHOP = no; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#define _XOPEN_SOURCE_EXTENDED 1
+#include <errno.h>
+#ifdef EMULTIHOP
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ gl_cv_header_errno_h_EMULTIHOP=hidden
+fi
+rm -f conftest*
+
+ if test $gl_cv_header_errno_h_EMULTIHOP = hidden; then
+ if ac_fn_c_compute_int "$LINENO" "EMULTIHOP" "gl_cv_header_errno_h_EMULTIHOP" "
+#define _XOPEN_SOURCE_EXTENDED 1
+#include <errno.h>
+/* The following two lines are a workaround against an autoconf-2.52 bug. */
+#include <stdio.h>
+#include <stdlib.h>
+"; then :
+
+fi
+
+ fi
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
+$as_echo "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
+ case $gl_cv_header_errno_h_EMULTIHOP in
+ yes | no)
+ EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE=
+ ;;
+ *)
+ EMULTIHOP_HIDDEN=1; EMULTIHOP_VALUE="$gl_cv_header_errno_h_EMULTIHOP"
+ ;;
+ esac
+
+
+ fi
+
+
+ if test -n "$ERRNO_H"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5
+$as_echo_n "checking for ENOLINK value... " >&6; }
+if ${gl_cv_header_errno_h_ENOLINK+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <errno.h>
+#ifdef ENOLINK
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ gl_cv_header_errno_h_ENOLINK=yes
+else
+ gl_cv_header_errno_h_ENOLINK=no
+fi
+rm -f conftest*
+
+ if test $gl_cv_header_errno_h_ENOLINK = no; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#define _XOPEN_SOURCE_EXTENDED 1
+#include <errno.h>
+#ifdef ENOLINK
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ gl_cv_header_errno_h_ENOLINK=hidden
+fi
+rm -f conftest*
+
+ if test $gl_cv_header_errno_h_ENOLINK = hidden; then
+ if ac_fn_c_compute_int "$LINENO" "ENOLINK" "gl_cv_header_errno_h_ENOLINK" "
+#define _XOPEN_SOURCE_EXTENDED 1
+#include <errno.h>
+/* The following two lines are a workaround against an autoconf-2.52 bug. */
+#include <stdio.h>
+#include <stdlib.h>
+"; then :
+
+fi
+
+ fi
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
+$as_echo "$gl_cv_header_errno_h_ENOLINK" >&6; }
+ case $gl_cv_header_errno_h_ENOLINK in
+ yes | no)
+ ENOLINK_HIDDEN=0; ENOLINK_VALUE=
+ ;;
+ *)
+ ENOLINK_HIDDEN=1; ENOLINK_VALUE="$gl_cv_header_errno_h_ENOLINK"
+ ;;
+ esac
+
+
+ fi
+
+
+ if test -n "$ERRNO_H"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5
+$as_echo_n "checking for EOVERFLOW value... " >&6; }
+if ${gl_cv_header_errno_h_EOVERFLOW+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <errno.h>
+#ifdef EOVERFLOW
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ gl_cv_header_errno_h_EOVERFLOW=yes
+else
+ gl_cv_header_errno_h_EOVERFLOW=no
+fi
+rm -f conftest*
+
+ if test $gl_cv_header_errno_h_EOVERFLOW = no; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#define _XOPEN_SOURCE_EXTENDED 1
+#include <errno.h>
+#ifdef EOVERFLOW
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then :
+ gl_cv_header_errno_h_EOVERFLOW=hidden
+fi
+rm -f conftest*
+
+ if test $gl_cv_header_errno_h_EOVERFLOW = hidden; then
+ if ac_fn_c_compute_int "$LINENO" "EOVERFLOW" "gl_cv_header_errno_h_EOVERFLOW" "
+#define _XOPEN_SOURCE_EXTENDED 1
+#include <errno.h>
+/* The following two lines are a workaround against an autoconf-2.52 bug. */
+#include <stdio.h>
+#include <stdlib.h>
+"; then :
+
+fi
+
+ fi
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
+$as_echo "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
+ case $gl_cv_header_errno_h_EOVERFLOW in
+ yes | no)
+ EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE=
+ ;;
+ *)
+ EOVERFLOW_HIDDEN=1; EOVERFLOW_VALUE="$gl_cv_header_errno_h_EOVERFLOW"
+ ;;
+ esac
+
+
+ fi
+
+
+
+
+
+
+ GNULIB_DPRINTF=0;
+ GNULIB_FCLOSE=0;
+ GNULIB_FDOPEN=0;
+ GNULIB_FFLUSH=0;
+ GNULIB_FGETC=0;
+ GNULIB_FGETS=0;
+ GNULIB_FOPEN=0;
+ GNULIB_FPRINTF=0;
+ GNULIB_FPRINTF_POSIX=0;
+ GNULIB_FPURGE=0;
+ GNULIB_FPUTC=0;
+ GNULIB_FPUTS=0;
+ GNULIB_FREAD=0;
+ GNULIB_FREOPEN=0;
+ GNULIB_FSCANF=0;
+ GNULIB_FSEEK=0;
+ GNULIB_FSEEKO=0;
+ GNULIB_FTELL=0;
+ GNULIB_FTELLO=0;
+ GNULIB_FWRITE=0;
+ GNULIB_GETC=0;
+ GNULIB_GETCHAR=0;
+ GNULIB_GETDELIM=0;
+ GNULIB_GETLINE=0;
+ GNULIB_OBSTACK_PRINTF=0;
+ GNULIB_OBSTACK_PRINTF_POSIX=0;
+ GNULIB_PCLOSE=0;
+ GNULIB_PERROR=0;
+ GNULIB_POPEN=0;
+ GNULIB_PRINTF=0;
+ GNULIB_PRINTF_POSIX=0;
+ GNULIB_PUTC=0;
+ GNULIB_PUTCHAR=0;
+ GNULIB_PUTS=0;
+ GNULIB_REMOVE=0;
+ GNULIB_RENAME=0;
+ GNULIB_RENAMEAT=0;
+ GNULIB_SCANF=0;
+ GNULIB_SNPRINTF=0;
+ GNULIB_SPRINTF_POSIX=0;
+ GNULIB_STDIO_H_NONBLOCKING=0;
+ GNULIB_STDIO_H_SIGPIPE=0;
+ GNULIB_TMPFILE=0;
+ GNULIB_VASPRINTF=0;
+ GNULIB_VFSCANF=0;
+ GNULIB_VSCANF=0;
+ GNULIB_VDPRINTF=0;
+ GNULIB_VFPRINTF=0;
+ GNULIB_VFPRINTF_POSIX=0;
+ GNULIB_VPRINTF=0;
+ GNULIB_VPRINTF_POSIX=0;
+ GNULIB_VSNPRINTF=0;
+ GNULIB_VSPRINTF_POSIX=0;
+ HAVE_DECL_FPURGE=1;
+ HAVE_DECL_FSEEKO=1;
+ HAVE_DECL_FTELLO=1;
+ HAVE_DECL_GETDELIM=1;
+ HAVE_DECL_GETLINE=1;
+ HAVE_DECL_OBSTACK_PRINTF=1;
+ HAVE_DECL_SNPRINTF=1;
+ HAVE_DECL_VSNPRINTF=1;
+ HAVE_DPRINTF=1;
+ HAVE_FSEEKO=1;
+ HAVE_FTELLO=1;
+ HAVE_PCLOSE=1;
+ HAVE_POPEN=1;
+ HAVE_RENAMEAT=1;
+ HAVE_VASPRINTF=1;
+ HAVE_VDPRINTF=1;
+ REPLACE_DPRINTF=0;
+ REPLACE_FCLOSE=0;
+ REPLACE_FDOPEN=0;
+ REPLACE_FFLUSH=0;
+ REPLACE_FOPEN=0;
+ REPLACE_FPRINTF=0;
+ REPLACE_FPURGE=0;
+ REPLACE_FREOPEN=0;
+ REPLACE_FSEEK=0;
+ REPLACE_FSEEKO=0;
+ REPLACE_FTELL=0;
+ REPLACE_FTELLO=0;
+ REPLACE_GETDELIM=0;
+ REPLACE_GETLINE=0;
+ REPLACE_OBSTACK_PRINTF=0;
+ REPLACE_PERROR=0;
+ REPLACE_POPEN=0;
+ REPLACE_PRINTF=0;
+ REPLACE_REMOVE=0;
+ REPLACE_RENAME=0;
+ REPLACE_RENAMEAT=0;
+ REPLACE_SNPRINTF=0;
+ REPLACE_SPRINTF=0;
+ REPLACE_STDIO_READ_FUNCS=0;
+ REPLACE_STDIO_WRITE_FUNCS=0;
+ REPLACE_TMPFILE=0;
+ REPLACE_VASPRINTF=0;
+ REPLACE_VDPRINTF=0;
+ REPLACE_VFPRINTF=0;
+ REPLACE_VPRINTF=0;
+ REPLACE_VSNPRINTF=0;
+ REPLACE_VSPRINTF=0;
+
+ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getdelim" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETDELIM $ac_have_decl
+_ACEOF
+
+
+
+
+ for ac_func in $ac_func_list
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+ac_fn_c_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "$ac_includes_default"
+if test "x$ac_cv_have_decl_getline" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETLINE $ac_have_decl
+_ACEOF
+
+
+
+
+
+
am_save_CPPFLAGS="$CPPFLAGS"
for element in $INCICONV; do
@@ -8038,6 +9578,8 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
# memchr should not dereference overestimated length after a match
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737
# https://sourceware.org/bugzilla/show_bug.cgi?id=10162
+ # memchr should cast the second argument to 'unsigned char'.
+ # This bug exists in Android 4.3.
# Assume that memchr works on platforms that lack mprotect.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memchr works" >&5
$as_echo_n "checking whether memchr works... " >&6; }
@@ -8046,10 +9588,12 @@ if ${gl_cv_func_memchr_works+:} false; then :
else
if test "$cross_compiling" = yes; then :
case "$host_os" in
- # Guess yes on native Windows.
- mingw*) gl_cv_func_memchr_works="guessing yes" ;;
- # Be pessimistic for now.
- *) gl_cv_func_memchr_works="guessing no" ;;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_memchr_works="guessing no" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_memchr_works="guessing yes" ;;
+ # Be pessimistic for now.
+ *) gl_cv_func_memchr_works="guessing no" ;;
esac
else
@@ -8102,6 +9646,15 @@ main ()
if (memchr (fence - 1, 0, 3) != fence - 1)
result |= 4;
}
+ /* Test against bug on Android 4.3. */
+ {
+ char input[3];
+ input[0] = 'a';
+ input[1] = 'b';
+ input[2] = 'c';
+ if (memchr (input, 0x789abc00 | 'b', 3) != input + 1)
+ result |= 8;
+ }
return result;
;
@@ -10052,6 +11605,8 @@ else
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
@@ -10074,6 +11629,8 @@ else
netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on MSVC, no on mingw.
mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -10446,6 +12003,13 @@ else
fi
+ if test $ac_cv_working_alloca_h = yes; then
+ HAVE_ALLOCA_H=1
+ else
+ HAVE_ALLOCA_H=0
+ fi
+
+
@@ -10688,8 +12252,8 @@ if ${gl_cv_func_working_getdelim+:} false; then :
$as_echo_n "(cached) " >&6
else
echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
- if test "$cross_compiling" = yes; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <features.h>
@@ -10704,7 +12268,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Lucky GNU user" >/dev/null 2>&1; then :
gl_cv_func_working_getdelim="guessing yes"
else
- gl_cv_func_working_getdelim="guessing no"
+ case "$host_os" in
+ *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
+ *) gl_cv_func_working_getdelim="guessing no" ;;
+ esac
+
fi
rm -f conftest*
@@ -10753,13 +12321,13 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5
$as_echo "$gl_cv_func_working_getdelim" >&6; }
case "$gl_cv_func_working_getdelim" in
- *no)
- REPLACE_GETDELIM=1
- ;;
+ *yes) ;;
+ *) REPLACE_GETDELIM=1 ;;
esac
else
HAVE_GETDELIM=0
@@ -10843,8 +12411,8 @@ if ${am_cv_func_working_getline+:} false; then :
$as_echo_n "(cached) " >&6
else
echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
- if test "$cross_compiling" = yes; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <features.h>
@@ -10859,7 +12427,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Lucky GNU user" >/dev/null 2>&1; then :
am_cv_func_working_getline="guessing yes"
else
- am_cv_func_working_getline="guessing no"
+ case "$host_os" in
+ *-musl*) am_cv_func_working_getline="guessing yes" ;;
+ *) am_cv_func_working_getline="guessing no" ;;
+ esac
+
fi
rm -f conftest*
@@ -10909,6 +12481,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_working_getline" >&5
$as_echo "$am_cv_func_working_getline" >&6; }
@@ -10919,7 +12492,8 @@ $as_echo "$am_cv_func_working_getline" >&6; }
fi
case "$am_cv_func_working_getline" in
- *no)
+ *yes) ;;
+ *)
REPLACE_GETLINE=1
;;
esac
@@ -13222,7 +14796,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -16646,6 +18220,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@ -16900,7 +18477,7 @@ _LT_EOF
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -17570,6 +19147,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
if test yes = "$lt_cv_irix_exported_symbol"; then
archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ link_all_deplibs=no
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -17591,7 +19169,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -18706,6 +20284,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -20611,6 +22201,13 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -20904,6 +22501,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -21597,6 +23195,120 @@ See \`config.log' for more details" "$LINENO" 5; }
rm -f conftest-deps.mk
}
;;
+ "po-directories":C)
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ # Treat a directory as a PO directory if and only if it has a
+ # POTFILES.in file. This allows packages to have multiple PO
+ # directories under different names or in different locations.
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+ gt_tab=`printf '\t'`
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+ POMAKEFILEDEPS="POTFILES.in"
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done ;;
"libtool":C)
# See if we are running on zsh, and set the options that allow our
@@ -21612,7 +23324,6 @@ See \`config.log' for more details" "$LINENO" 5; }
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/configure.ac b/macros/texinfo/texinfo/tp/Texinfo/XS/configure.ac
index 3348b29afd..932e20f746 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/configure.ac
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/configure.ac
@@ -93,6 +93,7 @@ AC_PROG_CC
gl_EARLY
+AM_GNU_GETTEXT([external])
AM_MISSING_PROG([XSUBPP], [xsubpp])
gl_INIT
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/depcomp b/macros/texinfo/texinfo/tp/Texinfo/XS/depcomp
index fc98710e2a..65cbf7093a 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/depcomp
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@ exit 0
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.am b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.am
index 1141abfa3f..64a9e93e54 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.am
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.am
@@ -86,7 +86,7 @@ if GL_GENERATE_ALLOCA_H
alloca.h: alloca.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
- cat $(srcdir)/alloca.in.h; \
+ sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \
} > $@-t && \
mv -f $@-t $@
else
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.in b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.in
index 27b18f764c..df001f36d1 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.in
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -140,6 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
$(top_srcdir)/gnulib/m4/float_h.m4 \
$(top_srcdir)/gnulib/m4/getdelim.m4 \
$(top_srcdir)/gnulib/m4/getline.m4 \
+ $(top_srcdir)/gnulib/m4/gettext.m4 \
$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
$(top_srcdir)/gnulib/m4/host-cpu-c-abi.m4 \
@@ -160,8 +161,10 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
$(top_srcdir)/gnulib/m4/memchr.m4 \
$(top_srcdir)/gnulib/m4/mmap-anon.m4 \
$(top_srcdir)/gnulib/m4/multiarch.m4 \
- $(top_srcdir)/gnulib/m4/off_t.m4 \
+ $(top_srcdir)/gnulib/m4/nls.m4 \
+ $(top_srcdir)/gnulib/m4/off_t.m4 $(top_srcdir)/gnulib/m4/po.m4 \
$(top_srcdir)/gnulib/m4/printf.m4 \
+ $(top_srcdir)/gnulib/m4/progtest.m4 \
$(top_srcdir)/gnulib/m4/rawmemchr.m4 \
$(top_srcdir)/gnulib/m4/size_max.m4 \
$(top_srcdir)/gnulib/m4/ssize_t.m4 \
@@ -357,6 +360,9 @@ ERRNO_H = @ERRNO_H@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FLOAT_H = @FLOAT_H@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
GNULIB_BTOWC = @GNULIB_BTOWC@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@
@@ -490,6 +496,7 @@ GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
GNULIB_WMEMSET = @GNULIB_WMEMSET@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
@@ -592,9 +599,12 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -602,11 +612,15 @@ LIMITS_H = @LIMITS_H@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@
@@ -652,6 +666,7 @@ PERL_EXT_CC = @PERL_EXT_CC@
PERL_EXT_CFLAGS = @PERL_EXT_CFLAGS@
PERL_EXT_CPPFLAGS = @PERL_EXT_CPPFLAGS@
PERL_EXT_LDFLAGS = @PERL_EXT_LDFLAGS@
+POSUB = @POSUB@
PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
@@ -727,11 +742,15 @@ STDDEF_H = @STDDEF_H@
STDINT_H = @STDINT_H@
STRIP = @STRIP@
UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
+USE_NLS = @USE_NLS@
VERSION = @VERSION@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
WINT_T_SUFFIX = @WINT_T_SUFFIX@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XSUBPP = @XSUBPP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -782,6 +801,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1280,7 +1300,7 @@ uninstall-am:
@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status
@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \
+@GL_GENERATE_ALLOCA_H_TRUE@ sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \
@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \
@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@
@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/alloca.in.h b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/alloca.in.h
index ec81e119a0..a581d58f83 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/alloca.in.h
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/alloca.in.h
@@ -36,6 +36,12 @@
#ifndef alloca
# ifdef __GNUC__
+ /* Some version of mingw have an <alloca.h> that causes trouble when
+ included after 'alloca' gets defined as a macro. As a workaround, include
+ this <alloca.h> first and define 'alloca' as a macro afterwards. */
+# if (defined _WIN32 && ! defined __CYGWIN__) && @HAVE_ALLOCA_H@
+# include_next <alloca.h>
+# endif
# define alloca __builtin_alloca
# elif defined _AIX
# define alloca __alloca
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/memchr.valgrind b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/memchr.valgrind
index 60f247e10d..1d60e29bac 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/memchr.valgrind
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/memchr.valgrind
@@ -1,4 +1,20 @@
# Suppress a valgrind message about use of uninitialized memory in memchr().
+
+# Copyright (C) 2009-2019 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
# POSIX states that when the character is found, memchr must not read extra
# bytes in an overestimated length (for example, where memchr is used to
# implement strnlen). However, we use a safe word read to provide a speedup.
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/rawmemchr.valgrind b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/rawmemchr.valgrind
index 6363923680..3d91a7271d 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/rawmemchr.valgrind
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/rawmemchr.valgrind
@@ -1,4 +1,20 @@
# Suppress a valgrind message about use of uninitialized memory in rawmemchr().
+
+# Copyright (C) 2008-2019 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
# This use is OK because it provides only a speedup.
{
rawmemchr-value4
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/stdio.in.h b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/stdio.in.h
index acf29c4be0..4a8aa55528 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/stdio.in.h
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/stdio.in.h
@@ -118,6 +118,13 @@
# include <unistd.h>
#endif
+/* Android 4.3 declares renameat in <sys/stat.h>, not in <stdio.h>. */
+/* But in any case avoid namespace pollution on glibc systems. */
+#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __ANDROID__ \
+ && ! defined __GLIBC__
+# include <sys/stat.h>
+#endif
+
/* MSVC declares 'perror' in <stdlib.h>, not in <stdio.h>. We must include
it before we #define perror rpl_perror. */
/* But in any case avoid namespace pollution on glibc systems. */
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/strchrnul.valgrind b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/strchrnul.valgrind
index b14fa1304d..781d037b0e 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/strchrnul.valgrind
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/strchrnul.valgrind
@@ -1,4 +1,20 @@
# Suppress a valgrind message about use of uninitialized memory in strchrnul().
+
+# Copyright (C) 2008-2019 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
# This use is OK because it provides only a speedup.
{
strchrnul-value4
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/vasnprintf.c b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/vasnprintf.c
index c475903726..b3854e3ef9 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/vasnprintf.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/vasnprintf.c
@@ -4874,6 +4874,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
&& !defined __UCLIBC__) \
|| (defined __APPLE__ && defined __MACH__) \
+ || defined __ANDROID__ \
|| (defined _WIN32 && ! defined __CYGWIN__))
fbp[1] = '%';
fbp[2] = 'n';
@@ -4895,6 +4896,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
On Mac OS X 10.13 or newer, the use of %n in format strings
in writable memory by default crashes the program, so we
should avoid it in this situation. */
+ /* On Android, we know that snprintf's return value conforms to
+ ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 and
+ gl_SNPRINTF_TRUNCATION_C99 pass.
+ Therefore we can avoid using %n in this situation.
+ Starting on 2018-03-07, the use of %n in format strings
+ produces a fatal error (see
+ <https://android.googlesource.com/platform/bionic/+/41398d03b7e8e0dfb951660ae713e682e9fc0336>),
+ so we should avoid it. */
/* On native Windows systems (such as mingw), we can avoid using
%n because:
- Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
@@ -4908,7 +4917,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
Windows Vista, the use of %n in format strings by default
crashes the program. See
<https://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
- <https://msdn.microsoft.com/en-us/library/ms175782.aspx>
+ <https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/set-printf-count-output>
So we should avoid %n in this situation. */
fbp[1] = '\0';
# endif
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/verify.h b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/verify.h
index b2e5f6446e..afdc1ad81f 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/verify.h
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/lib/verify.h
@@ -21,31 +21,37 @@
#define _GL_VERIFY_H
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
- This is supported by GCC 4.6.0 and later, in C mode, and its use
- here generates easier-to-read diagnostics when verify (R) fails.
-
- Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
- This will likely be supported by future GCC versions, in C++ mode.
-
- Use this only with GCC. If we were willing to slow 'configure'
- down we could also use it with other compilers, but since this
- affects only the quality of diagnostics, why bother? */
-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
- && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \
- && !defined __cplusplus)
-# define _GL_HAVE__STATIC_ASSERT 1
-#endif
-/* The condition (99 < __GNUC__) is temporary, until we know about the
- first G++ release that supports static_assert. */
-#if (99 < __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
+/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert (R, DIAGNOSTIC)
+ works as per C11. This is supported by GCC 4.6.0 and later, in C
+ mode.
+
+ Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as
+ per C2X, and define _GL_HAVE_STATIC_ASSERT1 if static_assert (R)
+ works as per C++17. This is supported by GCC 9.1 and later.
+
+ Support compilers claiming conformance to the relevant standard,
+ and also support GCC when not pedantic. If we were willing to slow
+ 'configure' down we could also use it with other compilers, but
+ since this affects only the quality of diagnostics, why bother? */
+#ifndef __cplusplus
+# if (201112L <= __STDC_VERSION__ \
+ || (!defined __STRICT_ANSI__ && 4 < __GNUC__ + (6 <= __GNUC_MINOR__)))
+# define _GL_HAVE__STATIC_ASSERT 1
+# endif
+# if (202000L <= __STDC_VERSION__ \
+ || (!defined __STRICT_ANSI__ && 9 <= __GNUC__))
+# define _GL_HAVE__STATIC_ASSERT1 1
+# endif
+#else
+# if 201703L <= __cplusplus || 9 <= __GNUC__
+# define _GL_HAVE_STATIC_ASSERT1 1
+# endif
#endif
/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
system headers, defines a conflicting _Static_assert that is no
better than ours; override it. */
-#ifndef _GL_HAVE_STATIC_ASSERT
+#ifndef _GL_HAVE__STATIC_ASSERT
# include <stddef.h>
# undef _Static_assert
#endif
@@ -143,9 +149,9 @@
which do not support _Static_assert, also do not warn about the
last declaration mentioned above.
- * GCC warns if -Wnested-externs is enabled and verify() is used
+ * GCC warns if -Wnested-externs is enabled and 'verify' is used
within a function body; but inside a function, you can always
- arrange to use verify_expr() instead.
+ arrange to use verify_expr instead.
* In C++, any struct definition inside sizeof is invalid.
Use a template type to work around the problem. */
@@ -197,26 +203,30 @@ template <int w>
#endif
/* Verify requirement R at compile-time, as a declaration without a
- trailing ';'. If R is false, fail at compile-time, preferably
- with a diagnostic that includes the string-literal DIAGNOSTIC.
+ trailing ';'. If R is false, fail at compile-time.
+
+ This macro requires three or more arguments but uses at most the first
+ two, so that the _Static_assert macro optionally defined below supports
+ both the C11 two-argument syntax and the C2X one-argument syntax.
Unfortunately, unlike C11, this implementation must appear as an
ordinary declaration, and cannot appear inside struct { ... }. */
-#ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
+#if defined _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC)
#else
-# define _GL_VERIFY(R, DIAGNOSTIC) \
+# define _GL_VERIFY(R, DIAGNOSTIC, ...) \
extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
[_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
#endif
/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */
#ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
+# if !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert
+# define _Static_assert(...) \
+ _GL_VERIFY (__VA_ARGS__, "static assertion failed", -)
# endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
+# if !defined _GL_HAVE_STATIC_ASSERT1 && !defined static_assert
# define static_assert _Static_assert /* C11 requires this #define. */
# endif
#endif
@@ -228,17 +238,10 @@ template <int w>
assert (R), there is no run-time overhead.
There are two macros, since no single macro can be used in all
- contexts in C. verify_true (R) is for scalar contexts, including
+ contexts in C. verify_expr (R, E) is for scalar contexts, including
integer constant expression contexts. verify (R) is for declaration
contexts, e.g., the top level. */
-/* Verify requirement R at compile-time, as an integer constant expression.
- Return 1. This is equivalent to verify_expr (R, 1).
-
- verify_true is obsolescent; please use verify_expr instead. */
-
-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
-
/* Verify requirement R at compile-time. Return the value of the
expression E. */
@@ -246,22 +249,26 @@ template <int w>
(_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
/* Verify requirement R at compile-time, as a declaration without a
- trailing ';'. */
+ trailing ';'. verify (R) acts like static_assert (R) except that
+ it is portable to C11/C++14 and earlier, it can issue better
+ diagnostics, and its name is shorter and may be more convenient. */
-#ifdef __GNUC__
-# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+#ifdef __PGI
+/* PGI barfs if R is long. */
+# define verify(R) _GL_VERIFY (R, "verify (...)", -)
#else
-/* PGI barfs if R is long. Play it safe. */
-# define verify(R) _GL_VERIFY (R, "verify (...)")
+# define verify(R) _GL_VERIFY (R, "verify (" #R ")", -)
#endif
#ifndef __has_builtin
# define __has_builtin(x) 0
#endif
-/* Assume that R always holds. This lets the compiler optimize
- accordingly. R should not have side-effects; it may or may not be
- evaluated. Behavior is undefined if R is false. */
+/* Assume that R always holds. Behavior is undefined if R is false,
+ fails to evaluate, or has side effects. Although assuming R can
+ help a compiler generate better code or diagnostics, performance
+ can suffer if R uses hard-to-optimize features such as function
+ calls not inlined by the compiler. */
#if (__has_builtin (__builtin_unreachable) \
|| 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/alloca.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/alloca.m4
index 46d60f9c8c..29bd289b02 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/alloca.m4
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/alloca.m4
@@ -1,4 +1,4 @@
-# alloca.m4 serial 14
+# alloca.m4 serial 15
dnl Copyright (C) 2002-2004, 2006-2007, 2009-2019 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -37,6 +37,13 @@ AC_DEFUN([gl_FUNC_ALLOCA],
fi
AC_SUBST([ALLOCA_H])
AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
+
+ if test $ac_cv_working_alloca_h = yes; then
+ HAVE_ALLOCA_H=1
+ else
+ HAVE_ALLOCA_H=0
+ fi
+ AC_SUBST([HAVE_ALLOCA_H])
])
# Prerequisites of lib/alloca.c.
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getdelim.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getdelim.m4
index bf17c57274..e77c37966c 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getdelim.m4
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getdelim.m4
@@ -1,4 +1,4 @@
-# getdelim.m4 serial 12
+# getdelim.m4 serial 13
dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
dnl
@@ -11,6 +11,7 @@ AC_PREREQ([2.59])
AC_DEFUN([gl_FUNC_GETDELIM],
[
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
dnl Persuade glibc <stdio.h> to declare getdelim().
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
@@ -21,9 +22,10 @@ AC_DEFUN([gl_FUNC_GETDELIM],
if test $ac_cv_func_getdelim = yes; then
HAVE_GETDELIM=1
dnl Found it in some library. Verify that it works.
- AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim],
- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ AC_CACHE_CHECK([for working getdelim function],
+ [gl_cv_func_working_getdelim],
+ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
# include <stdio.h>
# include <stdlib.h>
# include <string.h>
@@ -53,25 +55,31 @@ AC_DEFUN([gl_FUNC_GETDELIM],
fclose (in);
return 0;
}
- ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works.
- , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work.
- , dnl We're cross compiling. Assume it works on glibc2 systems.
- [AC_EGREP_CPP([Lucky GNU user],
- [
+ ]])],
+ [gl_cv_func_working_getdelim=yes],
+ [gl_cv_func_working_getdelim=no],
+ [dnl We're cross compiling.
+ dnl Guess it works on glibc2 systems and musl systems.
+ AC_EGREP_CPP([Lucky GNU user],
+ [
#include <features.h>
#ifdef __GNU_LIBRARY__
#if (__GLIBC__ >= 2) && !defined __UCLIBC__
Lucky GNU user
#endif
#endif
- ],
- [gl_cv_func_working_getdelim="guessing yes"],
- [gl_cv_func_working_getdelim="guessing no"])]
- )])
+ ],
+ [gl_cv_func_working_getdelim="guessing yes"],
+ [case "$host_os" in
+ *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
+ *) gl_cv_func_working_getdelim="guessing no" ;;
+ esac
+ ])
+ ])
+ ])
case "$gl_cv_func_working_getdelim" in
- *no)
- REPLACE_GETDELIM=1
- ;;
+ *yes) ;;
+ *) REPLACE_GETDELIM=1 ;;
esac
else
HAVE_GETDELIM=0
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getline.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getline.m4
index 5b2ead2876..32f771c10f 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getline.m4
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/getline.m4
@@ -1,4 +1,4 @@
-# getline.m4 serial 28
+# getline.m4 serial 29
dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation,
dnl Inc.
@@ -16,6 +16,7 @@ dnl to do with the function we need.
AC_DEFUN([gl_FUNC_GETLINE],
[
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
dnl Persuade glibc <stdio.h> to declare getline().
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
@@ -28,9 +29,10 @@ AC_DEFUN([gl_FUNC_GETLINE],
gl_getline_needs_run_time_check=yes],
[am_cv_func_working_getline=no])
if test $gl_getline_needs_run_time_check = yes; then
- AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline],
- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ AC_CACHE_CHECK([for working getline function],
+ [am_cv_func_working_getline],
+ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
# include <stdio.h>
# include <stdlib.h>
# include <string.h>
@@ -61,21 +63,28 @@ AC_DEFUN([gl_FUNC_GETLINE],
fclose (in);
return 0;
}
- ]])], [am_cv_func_working_getline=yes] dnl The library version works.
- , [am_cv_func_working_getline=no] dnl The library version does NOT work.
- , dnl We're cross compiling. Assume it works on glibc2 systems.
- [AC_EGREP_CPP([Lucky GNU user],
- [
+ ]])],
+ [am_cv_func_working_getline=yes],
+ [am_cv_func_working_getline=no],
+ [dnl We're cross compiling.
+ dnl Guess it works on glibc2 systems and musl systems.
+ AC_EGREP_CPP([Lucky GNU user],
+ [
#include <features.h>
#ifdef __GNU_LIBRARY__
#if (__GLIBC__ >= 2) && !defined __UCLIBC__
Lucky GNU user
#endif
#endif
- ],
- [am_cv_func_working_getline="guessing yes"],
- [am_cv_func_working_getline="guessing no"])]
- )])
+ ],
+ [am_cv_func_working_getline="guessing yes"],
+ [case "$host_os" in
+ *-musl*) am_cv_func_working_getline="guessing yes" ;;
+ *) am_cv_func_working_getline="guessing no" ;;
+ esac
+ ])
+ ])
+ ])
fi
if test $ac_cv_have_decl_getline = no; then
@@ -83,7 +92,8 @@ AC_DEFUN([gl_FUNC_GETLINE],
fi
case "$am_cv_func_working_getline" in
- *no)
+ *yes) ;;
+ *)
dnl Set REPLACE_GETLINE always: Even if we have not found the broken
dnl getline function among $LIBS, it may exist in libinet and the
dnl executable may be linked with -linet.
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gettext.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gettext.m4
new file mode 100644
index 0000000000..eef5073b32
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gettext.m4
@@ -0,0 +1,420 @@
+# gettext.m4 serial 68 (gettext-0.19.8)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl default (if it is not specified or empty) is 'no-libtool'.
+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl depending on --{enable,disable}-{shared,static} and on the presence of
+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl implementations (in libc or libintl) without the ngettext() function
+dnl will be ignored. If NEEDSYMBOL is specified and is
+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries. If empty,
+dnl the value '$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl and used.
+dnl Catalog format: GNU --> install in $(datadir)
+dnl Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl Catalog format: GNU --> install in $(datadir)
+dnl Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl Catalog format: none
+dnl Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+ dnl Argument checking.
+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+ [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+ define([gt_included_intl],
+ ifelse([$1], [external],
+ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+ [yes]))
+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+ gt_NEEDS_INIT
+ AM_GNU_GETTEXT_NEED([$2])
+
+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
+ ifelse(gt_included_intl, yes, [
+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
+ ])
+
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ dnl Ideally we would do this search only after the
+ dnl if test "$USE_NLS" = "yes"; then
+ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+ dnl the configure script would need to contain the same shell code
+ dnl again, outside any 'if'. There are two solutions:
+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+ dnl documented, we avoid it.
+ ifelse(gt_included_intl, yes, , [
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+ ])
+
+ dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
+ gt_INTL_MACOSX
+
+ dnl Set USE_NLS.
+ AC_REQUIRE([AM_NLS])
+
+ ifelse(gt_included_intl, yes, [
+ BUILD_INCLUDED_LIBINTL=no
+ USE_INCLUDED_LIBINTL=no
+ ])
+ LIBINTL=
+ LTLIBINTL=
+ POSUB=
+
+ dnl Add a version number to the cache macros.
+ case " $gt_needs " in
+ *" need-formatstring-macros "*) gt_api_version=3 ;;
+ *" need-ngettext "*) gt_api_version=2 ;;
+ *) gt_api_version=1 ;;
+ esac
+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+ dnl If we use NLS figure out what method
+ if test "$USE_NLS" = "yes"; then
+ gt_use_preinstalled_gnugettext=no
+ ifelse(gt_included_intl, yes, [
+ AC_MSG_CHECKING([whether included gettext is requested])
+ AC_ARG_WITH([included-gettext],
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+ ])
+ dnl User does not insist on using GNU NLS library. Figure out what
+ dnl to use. If GNU gettext is available we use this. Else we have
+ dnl to fall back to GNU NLS library.
+
+ if test $gt_api_version -ge 3; then
+ gt_revision_test_code='
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+'
+ else
+ gt_revision_test_code=
+ fi
+ if test $gt_api_version -ge 2; then
+ gt_expression_test_code=' + * ngettext ("", "", 0)'
+ else
+ gt_expression_test_code=
+ fi
+
+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+ ]],
+ [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+ ]])],
+ [eval "$gt_func_gnugettext_libc=yes"],
+ [eval "$gt_func_gnugettext_libc=no"])])
+
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ ifelse(gt_included_intl, yes, , [
+ AM_ICONV_LINK
+ ])
+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+ dnl even if libiconv doesn't exist.
+ AC_LIB_LINKFLAGS_BODY([intl])
+ AC_CACHE_CHECK([for GNU gettext in libintl],
+ [$gt_func_gnugettext_libintl],
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ dnl Now see whether libintl exists and does not depend on libiconv.
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+ ]],
+ [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+ ]])],
+ [eval "$gt_func_gnugettext_libintl=yes"],
+ [eval "$gt_func_gnugettext_libintl=no"])
+ dnl Now see whether libintl exists and depends on libiconv.
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <libintl.h>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
+ ]],
+ [[
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+ ]])],
+ [LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
+ ])
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ fi
+
+ dnl If an already present or preinstalled GNU gettext() is found,
+ dnl use it. But if this macro is used in GNU gettext, and GNU
+ dnl gettext is already preinstalled in libintl, we update this
+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
+ gt_use_preinstalled_gnugettext=yes
+ else
+ dnl Reset the values set by searching for libintl.
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ fi
+
+ ifelse(gt_included_intl, yes, [
+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+ dnl GNU gettext is not found in the C library.
+ dnl Fall back on included GNU gettext library.
+ nls_cv_use_gnu_gettext=yes
+ fi
+ fi
+
+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions used to generate GNU NLS library.
+ BUILD_INCLUDED_LIBINTL=yes
+ USE_INCLUDED_LIBINTL=yes
+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+ fi
+
+ CATOBJEXT=
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions to use GNU gettext tools.
+ CATOBJEXT=.gmo
+ fi
+ ])
+
+ if test -n "$INTL_MACOSX_LIBS"; then
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Some extra flags are needed during linking.
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+ fi
+ fi
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ AC_DEFINE([ENABLE_NLS], [1],
+ [Define to 1 if translation of program messages to the user's native language
+ is requested.])
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ AC_MSG_CHECKING([whether to use NLS])
+ AC_MSG_RESULT([$USE_NLS])
+ if test "$USE_NLS" = "yes"; then
+ AC_MSG_CHECKING([where the gettext function comes from])
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+ fi
+ else
+ gt_source="included intl directory"
+ fi
+ AC_MSG_RESULT([$gt_source])
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+ AC_MSG_CHECKING([how to link with libintl])
+ AC_MSG_RESULT([$LIBINTL])
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+ fi
+
+ dnl For backward compatibility. Some packages may be using this.
+ AC_DEFINE([HAVE_GETTEXT], [1],
+ [Define if the GNU gettext() function is already present or preinstalled.])
+ AC_DEFINE([HAVE_DCGETTEXT], [1],
+ [Define if the GNU dcgettext() function is already present or preinstalled.])
+ fi
+
+ dnl We need to process the po/ directory.
+ POSUB=po
+ fi
+
+ ifelse(gt_included_intl, yes, [
+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+ dnl to 'yes' because some of the testsuite requires it.
+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+ BUILD_INCLUDED_LIBINTL=yes
+ fi
+
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST([BUILD_INCLUDED_LIBINTL])
+ AC_SUBST([USE_INCLUDED_LIBINTL])
+ AC_SUBST([CATOBJEXT])
+
+ dnl For backward compatibility. Some configure.ins may be using this.
+ nls_cv_header_intl=
+ nls_cv_header_libgt=
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ DATADIRNAME=share
+ AC_SUBST([DATADIRNAME])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INSTOBJEXT=.mo
+ AC_SUBST([INSTOBJEXT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ GENCAT=gencat
+ AC_SUBST([GENCAT])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLOBJS=
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+ AC_SUBST([INTLOBJS])
+
+ dnl Enable libtool support if the surrounding package wishes it.
+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+ AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
+ ])
+
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
+ AC_SUBST([INTLLIBS])
+
+ dnl Make all documented variables known to autoconf.
+ AC_SUBST([LIBINTL])
+ AC_SUBST([LTLIBINTL])
+ AC_SUBST([POSUB])
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+ m4_divert_text([DEFAULTS], [gt_needs=])
+ m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
+
+dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gnulib-common.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gnulib-common.m4
index 7c0e3e8fa4..57b94ed532 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gnulib-common.m4
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 41
+# gnulib-common.m4 serial 44
dnl Copyright (C) 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -17,10 +17,13 @@ AC_DEFUN([gl_COMMON_BODY], [
AH_VERBATIM([_Noreturn],
[/* The _Noreturn keyword of C11. */
#ifndef _Noreturn
-# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# if (defined __cplusplus \
+ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
+ || (defined _MSC_VER && 1900 <= _MSC_VER)))
# define _Noreturn [[noreturn]]
-# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
- || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+# elif ((!defined __cplusplus || defined __clang__) \
+ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
+ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)))
/* _Noreturn works as-is. */
# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
# define _Noreturn __attribute__ ((__noreturn__))
@@ -85,6 +88,33 @@ AC_DEFUN([gl_COMMON_BODY], [
# define _GL_ATTRIBUTE_MALLOC /* empty */
#endif
])
+ AH_VERBATIM([async_safe],
+[/* The _GL_ASYNC_SAFE marker should be attached to functions that are
+ signal handlers (for signals other than SIGABRT, SIGPIPE) or can be
+ invoked from such signal handlers. Such functions have some restrictions:
+ * All functions that it calls should be marked _GL_ASYNC_SAFE as well,
+ or should be listed as async-signal-safe in POSIX
+ <http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04>
+ section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in
+ particular, are NOT async-signal-safe.
+ * All memory locations (variables and struct fields) that these functions
+ access must be marked 'volatile'. This holds for both read and write
+ accesses. Otherwise the compiler might optimize away stores to and
+ reads from such locations that occur in the program, depending on its
+ data flow analysis. For example, when the program contains a loop
+ that is intended to inspect a variable set from within a signal handler
+ while (!signal_occurred)
+ ;
+ the compiler is allowed to transform this into an endless loop if the
+ variable 'signal_occurred' is not declared 'volatile'.
+ Additionally, recall that:
+ * A signal handler should not modify errno (except if it is a handler
+ for a fatal signal and ends by raising the same signal again, thus
+ provoking the termination of the process). If it invokes a function
+ that may clobber errno, it needs to save and restore the value of
+ errno. */
+#define _GL_ASYNC_SAFE
+])
dnl Preparation for running test programs:
dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
dnl to /dev/tty, so they can be redirected to log files. Such diagnostics
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/libtool.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/libtool.m4
index a3bc337b79..ee80844b61 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/libtool.m4
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/libtool.m4
@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -2887,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3546,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4424,7 +4435,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4936,6 +4947,9 @@ m4_if([$1], [CXX], [
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4998,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5252,7 +5269,7 @@ _LT_EOF
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5773,6 +5790,7 @@ _LT_EOF
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -5794,7 +5812,7 @@ _LT_EOF
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/memchr.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/memchr.m4
index db227e7de1..0be394db4f 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/memchr.m4
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/memchr.m4
@@ -1,4 +1,4 @@
-# memchr.m4 serial 13
+# memchr.m4 serial 14
dnl Copyright (C) 2002-2004, 2009-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -29,6 +29,8 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
# memchr should not dereference overestimated length after a match
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521737
# https://sourceware.org/bugzilla/show_bug.cgi?id=10162
+ # memchr should cast the second argument to 'unsigned char'.
+ # This bug exists in Android 4.3.
# Assume that memchr works on platforms that lack mprotect.
AC_CACHE_CHECK([whether memchr works], [gl_cv_func_memchr_works],
[AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -74,15 +76,26 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
if (memchr (fence - 1, 0, 3) != fence - 1)
result |= 4;
}
+ /* Test against bug on Android 4.3. */
+ {
+ char input[3];
+ input[0] = 'a';
+ input[1] = 'b';
+ input[2] = 'c';
+ if (memchr (input, 0x789abc00 | 'b', 3) != input + 1)
+ result |= 8;
+ }
return result;
]])],
[gl_cv_func_memchr_works=yes],
[gl_cv_func_memchr_works=no],
[case "$host_os" in
- # Guess yes on native Windows.
- mingw*) gl_cv_func_memchr_works="guessing yes" ;;
- # Be pessimistic for now.
- *) gl_cv_func_memchr_works="guessing no" ;;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_memchr_works="guessing no" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_memchr_works="guessing yes" ;;
+ # Be pessimistic for now.
+ *) gl_cv_func_memchr_works="guessing no" ;;
esac
])
])
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/nls.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/nls.m4
new file mode 100644
index 0000000000..afdb9cacd0
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/nls.m4
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT([$USE_NLS])
+ AC_SUBST([USE_NLS])
+])
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/po.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/po.m4
new file mode 100644
index 0000000000..c5a2f6bf2a
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/po.m4
@@ -0,0 +1,453 @@
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.60])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+ AC_REQUIRE([AC_PROG_SED])dnl
+ AC_REQUIRE([AM_NLS])dnl
+
+ dnl Release version of the gettext macros. This is used to ensure that
+ dnl the gettext macros and po/Makefile.in.in are in sync.
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+
+ dnl Search for GNU msgfmt in the PATH.
+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+ dnl The second test excludes FreeBSD msgfmt.
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+ dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+ *) MSGFMT_015=$MSGFMT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+ *) GMSGFMT_015=$GMSGFMT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([GMSGFMT_015])
+
+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+ dnl The second test excludes FreeBSD xgettext.
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
+
+ dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+ *) XGETTEXT_015=$XGETTEXT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([XGETTEXT_015])
+
+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+ dnl Installation directories.
+ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+ dnl have to define it here, so that it can be used in po/Makefile.
+ test -n "$localedir" || localedir='${datadir}/locale'
+ AC_SUBST([localedir])
+
+ dnl Support for AM_XGETTEXT_OPTION.
+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+ AC_CONFIG_COMMANDS([po-directories], [[
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ # Treat a directory as a PO directory if and only if it has a
+ # POTFILES.in file. This allows packages to have multiple PO
+ # directories under different names or in different locations.
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+ gt_tab=`printf '\t'`
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+ POMAKEFILEDEPS="POTFILES.in"
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done]],
+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+ ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+ # When this code is run, in config.status, two variables have already been
+ # set:
+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+ # - LINGUAS is the value of the environment variable LINGUAS at configure
+ # time.
+
+changequote(,)dnl
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+
+ # Find a way to echo strings without interpreting backslash.
+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+ gt_echo='echo'
+ else
+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+ gt_echo='printf %s\n'
+ else
+ echo_func () {
+ cat <<EOT
+$*
+EOT
+ }
+ gt_echo='echo_func'
+ fi
+ fi
+
+ # A sed script that extracts the value of VARIABLE from a Makefile.
+ tab=`printf '\t'`
+ sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
+ # Seen the first line of the variable definition.
+ s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
+ ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+ # Set POTFILES to the value of the Makefile variable POTFILES.
+ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+ # Compute POTFILES_DEPS as
+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+ POTFILES_DEPS=
+ for file in $POTFILES; do
+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+ done
+ POMAKEFILEDEPS=""
+
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+ fi
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ # Compute PROPERTIESFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+ # Compute CLASSFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+ # Compute QMFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+ # Compute MSGFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+ # Compute RESOURCESDLLFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ PROPERTIESFILES=
+ CLASSFILES=
+ QMFILES=
+ MSGFILES=
+ RESOURCESDLLFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+ QMFILES="$QMFILES $srcdirpre$lang.qm"
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ JAVACATALOGS=
+ QTCATALOGS=
+ TCLCATALOGS=
+ CSHARPCATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+ QTCATALOGS="$QTCATALOGS $lang.qm"
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+ done
+ fi
+
+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+ tab=`printf '\t'`
+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+ # Add dependencies that cannot be formulated as a simple suffix rule.
+ for lang in $ALL_LINGUAS; do
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+ done
+ fi
+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+ # Add dependencies that cannot be formulated as a simple suffix rule.
+ for lang in $ALL_LINGUAS; do
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+ cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+ done
+ fi
+ if test -n "$POMAKEFILEDEPS"; then
+ cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+ fi
+ mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+ XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/printf.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/printf.m4
index 1db13bf846..6d2280ef5c 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/printf.m4
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/printf.m4
@@ -1,4 +1,4 @@
-# printf.m4 serial 59
+# printf.m4 serial 61
dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -62,6 +62,8 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
@@ -79,6 +81,8 @@ changequote(,)dnl
netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
gl_cv_func_printf_sizes_c99="guessing no";;
netbsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_sizes_c99="guessing yes";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -132,17 +136,20 @@ int main ()
[gl_cv_func_printf_long_double=yes],
[gl_cv_func_printf_long_double=no],
[case "$host_os" in
- beos*) gl_cv_func_printf_long_double="guessing no";;
- # Guess yes on MSVC, no on mingw.
- mingw*) AC_EGREP_CPP([Known], [
+ # Guess no on BeOS.
+ beos*) gl_cv_func_printf_long_double="guessing no";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_long_double="guessing yes";;
+ # Guess yes on MSVC, no on mingw.
+ mingw*) AC_EGREP_CPP([Known], [
#ifdef _MSC_VER
Known
#endif
- ],
- [gl_cv_func_printf_long_double="guessing yes"],
- [gl_cv_func_printf_long_double="guessing no"])
- ;;
- *) gl_cv_func_printf_long_double="guessing yes";;
+ ],
+ [gl_cv_func_printf_long_double="guessing yes"],
+ [gl_cv_func_printf_long_double="guessing no"])
+ ;;
+ *) gl_cv_func_printf_long_double="guessing yes";;
esac
])
])
@@ -235,6 +242,8 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_infinite="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
@@ -250,6 +259,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_printf_infinite="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_printf_infinite="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_infinite="guessing no";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -450,12 +461,16 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
# Guess yes on HP-UX >= 11.
hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";;
hpux*) gl_cv_func_printf_infinite_long_double="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_infinite_long_double="guessing no";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -566,6 +581,10 @@ int main ()
[gl_cv_func_printf_directive_a="guessing yes"],
[gl_cv_func_printf_directive_a="guessing no"])
;;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_directive_a="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_directive_a="guessing no";;
# Guess no on native Windows.
mingw*) gl_cv_func_printf_directive_a="guessing no";;
# If we don't know, assume the worst.
@@ -614,6 +633,8 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_directive_f="guessing yes";;
# Guess yes on FreeBSD >= 6.
freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
@@ -623,6 +644,8 @@ changequote(,)dnl
# Guess yes on Solaris >= 2.10.
solaris2.[1-9][0-9]*) gl_cv_func_printf_directive_f="guessing yes";;
solaris*) gl_cv_func_printf_directive_f="guessing no";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_directive_f="guessing no";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -688,9 +711,11 @@ int main ()
[gl_cv_func_printf_directive_n=yes],
[gl_cv_func_printf_directive_n=no],
[case "$host_os" in
- # Guess no on native Windows.
- mingw*) gl_cv_func_printf_directive_n="guessing no";;
- *) gl_cv_func_printf_directive_n="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_directive_n="guessing no";;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_printf_directive_n="guessing no";;
+ *) gl_cv_func_printf_directive_n="guessing yes";;
esac
])
])
@@ -766,14 +791,16 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
- irix*) gl_cv_func_printf_directive_ls="guessing no";;
- solaris*) gl_cv_func_printf_directive_ls="guessing no";;
- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
- beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_printf_directive_ls="guessing yes";;
- *) gl_cv_func_printf_directive_ls="guessing yes";;
+ openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
+ irix*) gl_cv_func_printf_directive_ls="guessing no";;
+ solaris*) gl_cv_func_printf_directive_ls="guessing no";;
+ cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
+ beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_directive_ls="guessing no";;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_printf_directive_ls="guessing yes";;
+ *) gl_cv_func_printf_directive_ls="guessing yes";;
esac
changequote([,])dnl
])
@@ -810,11 +837,13 @@ int main ()
changequote(,)dnl
case "$host_os" in
netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*)
- gl_cv_func_printf_positions="guessing no";;
- beos*) gl_cv_func_printf_positions="guessing no";;
- # Guess no on native Windows.
- mingw* | pw*) gl_cv_func_printf_positions="guessing no";;
- *) gl_cv_func_printf_positions="guessing yes";;
+ gl_cv_func_printf_positions="guessing no";;
+ beos*) gl_cv_func_printf_positions="guessing no";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_positions="guessing yes";;
+ # Guess no on native Windows.
+ mingw* | pw*) gl_cv_func_printf_positions="guessing no";;
+ *) gl_cv_func_printf_positions="guessing yes";;
esac
changequote([,])dnl
])
@@ -849,11 +878,13 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
- netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
- # Guess no on native Windows.
- mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
- *) gl_cv_func_printf_flag_grouping="guessing yes";;
+ cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
+ netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";;
+ # Guess no on native Windows.
+ mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+ *) gl_cv_func_printf_flag_grouping="guessing yes";;
esac
changequote([,])dnl
])
@@ -890,14 +921,16 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- # Guess yes on HP-UX 11.
- hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
- # Guess no on HP-UX 10 and older.
- hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";;
- # Guess yes on native Windows.
- mingw*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
- # Guess yes otherwise.
- *) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+ # Guess yes on HP-UX 11.
+ hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+ # Guess no on HP-UX 10 and older.
+ hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+ # Guess yes otherwise.
+ *) gl_cv_func_printf_flag_leftadjust="guessing yes";;
esac
changequote([,])dnl
])
@@ -935,14 +968,18 @@ int main ()
[
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
- # Guess yes on BeOS.
- beos*) gl_cv_func_printf_flag_zero="guessing yes";;
- # Guess no on native Windows.
- mingw*) gl_cv_func_printf_flag_zero="guessing no";;
- # If we don't know, assume the worst.
- *) gl_cv_func_printf_flag_zero="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_printf_flag_zero="guessing yes";;
+ # Guess yes on BeOS.
+ beos*) gl_cv_func_printf_flag_zero="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_flag_zero="guessing no";;
+ # Guess no on native Windows.
+ mingw*) gl_cv_func_printf_flag_zero="guessing no";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_printf_flag_zero="guessing no";;
esac
changequote([,])dnl
])
@@ -995,10 +1032,12 @@ int main ()
changequote(,)dnl
case "$host_os" in
# Guess no only on Solaris, native Windows, and BeOS systems.
- solaris*) gl_cv_func_printf_precision="guessing no" ;;
- mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;;
- beos*) gl_cv_func_printf_precision="guessing no" ;;
- *) gl_cv_func_printf_precision="guessing yes" ;;
+ solaris*) gl_cv_func_printf_precision="guessing no" ;;
+ mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;;
+ beos*) gl_cv_func_printf_precision="guessing no" ;;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_printf_precision="guessing yes" ;;
+ *) gl_cv_func_printf_precision="guessing yes" ;;
esac
changequote([,])dnl
])
@@ -1095,28 +1134,30 @@ changequote([,])dnl
if test "$gl_cv_func_printf_enomem" = "guessing no"; then
changequote(,)dnl
case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on Solaris.
- solaris*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on AIX.
- aix*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on HP-UX/hppa.
- hpux*) case "$host_cpu" in
- hppa*) gl_cv_func_printf_enomem="guessing yes";;
- *) gl_cv_func_printf_enomem="guessing no";;
- esac
- ;;
- # Guess yes on IRIX.
- irix*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on OSF/1.
- osf*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on BeOS.
- beos*) gl_cv_func_printf_enomem="guessing yes";;
- # Guess yes on Haiku.
- haiku*) gl_cv_func_printf_enomem="guessing yes";;
- # If we don't know, assume the worst.
- *) gl_cv_func_printf_enomem="guessing no";;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on Solaris.
+ solaris*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on AIX.
+ aix*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on HP-UX/hppa.
+ hpux*) case "$host_cpu" in
+ hppa*) gl_cv_func_printf_enomem="guessing yes";;
+ *) gl_cv_func_printf_enomem="guessing no";;
+ esac
+ ;;
+ # Guess yes on IRIX.
+ irix*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on OSF/1.
+ osf*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on BeOS.
+ beos*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess yes on Haiku.
+ haiku*) gl_cv_func_printf_enomem="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_printf_enomem="guessing no";;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_printf_enomem="guessing no";;
esac
changequote([,])dnl
fi
@@ -1177,6 +1218,8 @@ changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
@@ -1208,6 +1251,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
# Guess no on native Windows.
mingw*) gl_cv_func_snprintf_truncation_c99="guessing no";;
# If we don't know, assume the worst.
@@ -1277,6 +1322,8 @@ int main ()
changequote(,)dnl
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
@@ -1299,6 +1346,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";;
changequote([,])dnl
# Guess yes on MSVC, no on mingw.
mingw*) AC_EGREP_CPP([Known], [
@@ -1367,6 +1416,8 @@ changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_snprintf_directive_n="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
@@ -1391,6 +1442,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_snprintf_directive_n="guessing yes";;
+ # Guess no on Android.
+ linux*-android*) gl_cv_func_snprintf_directive_n="guessing no";;
# Guess no on native Windows.
mingw*) gl_cv_func_snprintf_directive_n="guessing no";;
# If we don't know, assume the worst.
@@ -1440,9 +1493,11 @@ int main()
[gl_cv_func_snprintf_size1=yes],
[gl_cv_func_snprintf_size1=no],
[case "$host_os" in
- # Guess yes on native Windows.
- mingw*) gl_cv_func_snprintf_size1="guessing yes" ;;
- *) gl_cv_func_snprintf_size1="guessing yes" ;;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_snprintf_size1="guessing yes" ;;
+ *) gl_cv_func_snprintf_size1="guessing yes" ;;
esac
])
])
@@ -1517,6 +1572,8 @@ changequote(,)dnl
case "$host_os" in
# Guess yes on glibc systems.
*-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on musl systems.
+ *-musl*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on FreeBSD >= 5.
freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
@@ -1540,6 +1597,8 @@ changequote(,)dnl
netbsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on BeOS.
beos*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ # Guess yes on Android.
+ linux*-android*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on native Windows.
mingw* | pw*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# If we don't know, assume the worst.
@@ -1626,6 +1685,7 @@ dnl NetBSD 4.0 . ? ? ? ? ? . ? . ? ? ? ? ? .
dnl NetBSD 3.0 . . . . # # . ? # # ? # . # . . . . . .
dnl Haiku . . . # # # . # . . . . . ? . . ? . . .
dnl BeOS # # . # # # . ? # . ? . # ? . . ? . . .
+dnl Android 4.3 . . # # # # # # . # . # . # . . . # . .
dnl old mingw / msvcrt # # # # # # . . # # . # # ? . # # # . .
dnl MSVC 9 # # # # # # # . # # . # # ? # # # # . .
dnl mingw 2009-2011 . # . # . . . . # # . . . ? . . . . . .
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/progtest.m4 b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/progtest.m4
new file mode 100644
index 0000000000..9ace7c3418
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/gnulib/m4/progtest.m4
@@ -0,0 +1,91 @@
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ([2.50])
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL([ac_cv_path_$1],
+[case "[$]$1" in
+ [[\\/]]* | ?:[[\\/]]*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$][$1])
+else
+ AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/install-sh b/macros/texinfo/texinfo/tp/Texinfo/XS/install-sh
index 0b0fdcbba6..8175c640fe 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/install-sh
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2018-03-11.20; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@ do
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@ do
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
@@ -324,34 +332,43 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # Note that $RANDOM variable is not portable (e.g. dash); Use it
+ # here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p' feature.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
@@ -427,8 +444,8 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -493,9 +510,9 @@ do
done
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/ltmain.sh b/macros/texinfo/texinfo/tp/Texinfo/XS/ltmain.sh
index 0f0a2da3f9..a736cf9942 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/ltmain.sh
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/ltmain.sh
@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.6
+VERSION="2.4.6 Debian-2.4.6-2"
package_revision=2.4.6
@@ -2068,12 +2068,12 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.4.6
+ version: $progname $scriptversion Debian-2.4.6-2
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
General help using GNU software: <http://www.gnu.org/gethelp/>."
exit 0
}
@@ -7272,10 +7272,13 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
+ # -fsanitize=* Clang/GCC memory and address sanitizer
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+ -specs=*|-fsanitize=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
@@ -7568,7 +7571,10 @@ func_mode_link ()
case $pass in
dlopen) libs=$dlfiles ;;
dlpreopen) libs=$dlprefiles ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test lib,dlpreopen = "$linkmode,$pass"; then
@@ -7887,19 +7893,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
elif test prog != "$linkmode" && test lib != "$linkmode"; then
func_fatal_error "'$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
@@ -8823,6 +8829,9 @@ func_mode_link ()
revision=$number_minor
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type '$version_type'"
+ ;;
esac
;;
no)
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/missing b/macros/texinfo/texinfo/tp/Texinfo/XS/missing
index f62bbae306..625aeb1189 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/missing
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@ else
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parser-5556.pm b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parser-5556.pm
index 0b1f091bcd..5b14993722 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parser-5556.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parser-5556.pm
@@ -87,7 +87,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@EXPORT = qw(
);
-$VERSION = '6.6';
+$VERSION = '6.7';
sub N__($)
{
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.c
index e538e7871a..b96050c8f6 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.c
@@ -1,5 +1,5 @@
/*
- * This file was generated automatically by ExtUtils::ParseXS version 3.39 from the
+ * This file was generated automatically by ExtUtils::ParseXS version 3.34 from the
* contents of Parsetexi.xs. Do not edit this file, edit Parsetexi.xs instead.
*
* ANY CHANGES MADE HERE WILL BE LOST!
@@ -170,8 +170,29 @@ S_croak_xs_usage(const CV *const cv, const char *const params)
#line 172 "parsetexi/Parsetexi.c"
-XS_EUPXS(XS_Parsetexi_dump_errors); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_dump_errors)
+XS_EUPXS(XS_Texinfo__Parser_init); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_init)
+{
+ dVAR; dXSARGS;
+ if (items != 2)
+ croak_xs_usage(cv, "texinfo_uninstalled, srcdir");
+ {
+ int texinfo_uninstalled = (int)SvIV(ST(0))
+;
+ char * srcdir = (char *)SvPV_nolen(ST(1))
+;
+ int RETVAL;
+ dXSTARG;
+
+ RETVAL = init(texinfo_uninstalled, srcdir);
+ XSprePUSH; PUSHi((IV)RETVAL);
+ }
+ XSRETURN(1);
+}
+
+
+XS_EUPXS(XS_Texinfo__Parser_dump_errors); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_dump_errors)
{
dVAR; dXSARGS;
if (items != 0)
@@ -187,8 +208,8 @@ XS_EUPXS(XS_Parsetexi_dump_errors)
}
-XS_EUPXS(XS_Parsetexi_wipe_errors); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_wipe_errors)
+XS_EUPXS(XS_Texinfo__Parser_wipe_errors); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_wipe_errors)
{
dVAR; dXSARGS;
if (items != 0)
@@ -201,8 +222,8 @@ XS_EUPXS(XS_Parsetexi_wipe_errors)
}
-XS_EUPXS(XS_Parsetexi_parse_file); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_parse_file)
+XS_EUPXS(XS_Texinfo__Parser_parse_file); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_parse_file)
{
dVAR; dXSARGS;
if (items != 1)
@@ -220,8 +241,8 @@ XS_EUPXS(XS_Parsetexi_parse_file)
}
-XS_EUPXS(XS_Parsetexi_parse_string); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_parse_string)
+XS_EUPXS(XS_Texinfo__Parser_parse_string); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_parse_string)
{
dVAR; dXSARGS;
if (items != 1)
@@ -236,8 +257,8 @@ XS_EUPXS(XS_Parsetexi_parse_string)
}
-XS_EUPXS(XS_Parsetexi_parse_text); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_parse_text)
+XS_EUPXS(XS_Texinfo__Parser_parse_text); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_parse_text)
{
dVAR; dXSARGS;
if (items != 1)
@@ -252,8 +273,8 @@ XS_EUPXS(XS_Parsetexi_parse_text)
}
-XS_EUPXS(XS_Parsetexi_store_value); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_store_value)
+XS_EUPXS(XS_Texinfo__Parser_store_value); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_store_value)
{
dVAR; dXSARGS;
if (items != 2)
@@ -270,8 +291,8 @@ XS_EUPXS(XS_Parsetexi_store_value)
}
-XS_EUPXS(XS_Parsetexi_wipe_values); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_wipe_values)
+XS_EUPXS(XS_Texinfo__Parser_wipe_values); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_wipe_values)
{
dVAR; dXSARGS;
if (items != 0)
@@ -284,8 +305,8 @@ XS_EUPXS(XS_Parsetexi_wipe_values)
}
-XS_EUPXS(XS_Parsetexi_reset_context_stack); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_reset_context_stack)
+XS_EUPXS(XS_Texinfo__Parser_reset_context_stack); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_reset_context_stack)
{
dVAR; dXSARGS;
if (items != 0)
@@ -298,8 +319,8 @@ XS_EUPXS(XS_Parsetexi_reset_context_stack)
}
-XS_EUPXS(XS_Parsetexi_init_index_commands); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_init_index_commands)
+XS_EUPXS(XS_Texinfo__Parser_init_index_commands); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_init_index_commands)
{
dVAR; dXSARGS;
if (items != 0)
@@ -312,8 +333,8 @@ XS_EUPXS(XS_Parsetexi_init_index_commands)
}
-XS_EUPXS(XS_Parsetexi_add_include_directory); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_add_include_directory)
+XS_EUPXS(XS_Texinfo__Parser_add_include_directory); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_add_include_directory)
{
dVAR; dXSARGS;
if (items != 1)
@@ -328,8 +349,8 @@ XS_EUPXS(XS_Parsetexi_add_include_directory)
}
-XS_EUPXS(XS_Parsetexi_build_texinfo_tree); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_build_texinfo_tree)
+XS_EUPXS(XS_Texinfo__Parser_build_texinfo_tree); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_build_texinfo_tree)
{
dVAR; dXSARGS;
if (items != 0)
@@ -349,8 +370,8 @@ XS_EUPXS(XS_Parsetexi_build_texinfo_tree)
}
-XS_EUPXS(XS_Parsetexi_build_label_list); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_build_label_list)
+XS_EUPXS(XS_Texinfo__Parser_build_label_list); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_build_label_list)
{
dVAR; dXSARGS;
if (items != 0)
@@ -370,8 +391,8 @@ XS_EUPXS(XS_Parsetexi_build_label_list)
}
-XS_EUPXS(XS_Parsetexi_build_internal_xref_list); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_build_internal_xref_list)
+XS_EUPXS(XS_Texinfo__Parser_build_internal_xref_list); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_build_internal_xref_list)
{
dVAR; dXSARGS;
if (items != 0)
@@ -391,8 +412,8 @@ XS_EUPXS(XS_Parsetexi_build_internal_xref_list)
}
-XS_EUPXS(XS_Parsetexi_build_float_list); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_build_float_list)
+XS_EUPXS(XS_Texinfo__Parser_build_float_list); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_build_float_list)
{
dVAR; dXSARGS;
if (items != 0)
@@ -412,8 +433,8 @@ XS_EUPXS(XS_Parsetexi_build_float_list)
}
-XS_EUPXS(XS_Parsetexi_build_index_data); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_build_index_data)
+XS_EUPXS(XS_Texinfo__Parser_build_index_data); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_build_index_data)
{
dVAR; dXSARGS;
if (items != 0)
@@ -433,8 +454,8 @@ XS_EUPXS(XS_Parsetexi_build_index_data)
}
-XS_EUPXS(XS_Parsetexi_build_global_info); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_build_global_info)
+XS_EUPXS(XS_Texinfo__Parser_build_global_info); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_build_global_info)
{
dVAR; dXSARGS;
if (items != 0)
@@ -454,8 +475,8 @@ XS_EUPXS(XS_Parsetexi_build_global_info)
}
-XS_EUPXS(XS_Parsetexi_build_global_info2); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_build_global_info2)
+XS_EUPXS(XS_Texinfo__Parser_build_global_info2); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_build_global_info2)
{
dVAR; dXSARGS;
if (items != 0)
@@ -475,8 +496,8 @@ XS_EUPXS(XS_Parsetexi_build_global_info2)
}
-XS_EUPXS(XS_Parsetexi_reset_parser); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_reset_parser)
+XS_EUPXS(XS_Texinfo__Parser_reset_parser); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_reset_parser)
{
dVAR; dXSARGS;
if (items != 0)
@@ -489,8 +510,8 @@ XS_EUPXS(XS_Parsetexi_reset_parser)
}
-XS_EUPXS(XS_Parsetexi_clear_expanded_formats); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_clear_expanded_formats)
+XS_EUPXS(XS_Texinfo__Parser_clear_expanded_formats); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_clear_expanded_formats)
{
dVAR; dXSARGS;
if (items != 0)
@@ -503,8 +524,8 @@ XS_EUPXS(XS_Parsetexi_clear_expanded_formats)
}
-XS_EUPXS(XS_Parsetexi_add_expanded_format); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_add_expanded_format)
+XS_EUPXS(XS_Texinfo__Parser_add_expanded_format); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_add_expanded_format)
{
dVAR; dXSARGS;
if (items != 1)
@@ -519,8 +540,8 @@ XS_EUPXS(XS_Parsetexi_add_expanded_format)
}
-XS_EUPXS(XS_Parsetexi_conf_set_show_menu); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_conf_set_show_menu)
+XS_EUPXS(XS_Texinfo__Parser_conf_set_show_menu); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_conf_set_show_menu)
{
dVAR; dXSARGS;
if (items != 1)
@@ -535,8 +556,8 @@ XS_EUPXS(XS_Parsetexi_conf_set_show_menu)
}
-XS_EUPXS(XS_Parsetexi_conf_set_CPP_LINE_DIRECTIVES); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_conf_set_CPP_LINE_DIRECTIVES)
+XS_EUPXS(XS_Texinfo__Parser_conf_set_CPP_LINE_DIRECTIVES); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_conf_set_CPP_LINE_DIRECTIVES)
{
dVAR; dXSARGS;
if (items != 1)
@@ -551,8 +572,8 @@ XS_EUPXS(XS_Parsetexi_conf_set_CPP_LINE_DIRECTIVES)
}
-XS_EUPXS(XS_Parsetexi_conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME)
+XS_EUPXS(XS_Texinfo__Parser_conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME)
{
dVAR; dXSARGS;
if (items != 1)
@@ -567,8 +588,8 @@ XS_EUPXS(XS_Parsetexi_conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME)
}
-XS_EUPXS(XS_Parsetexi_set_documentlanguage); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_set_documentlanguage)
+XS_EUPXS(XS_Texinfo__Parser_set_documentlanguage); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_set_documentlanguage)
{
dVAR; dXSARGS;
if (items != 1)
@@ -583,8 +604,8 @@ XS_EUPXS(XS_Parsetexi_set_documentlanguage)
}
-XS_EUPXS(XS_Parsetexi_set_debug); /* prototype to pass -Wmissing-prototypes */
-XS_EUPXS(XS_Parsetexi_set_debug)
+XS_EUPXS(XS_Texinfo__Parser_set_debug); /* prototype to pass -Wmissing-prototypes */
+XS_EUPXS(XS_Texinfo__Parser_set_debug)
{
dVAR; dXSARGS;
if (items != 1)
@@ -601,8 +622,8 @@ XS_EUPXS(XS_Parsetexi_set_debug)
#ifdef __cplusplus
extern "C"
#endif
-XS_EXTERNAL(boot_Parsetexi); /* prototype to pass -Wmissing-prototypes */
-XS_EXTERNAL(boot_Parsetexi)
+XS_EXTERNAL(boot_Texinfo__Parser); /* prototype to pass -Wmissing-prototypes */
+XS_EXTERNAL(boot_Texinfo__Parser)
{
#if PERL_VERSION_LE(5, 21, 5)
dVAR; dXSARGS;
@@ -626,31 +647,32 @@ XS_EXTERNAL(boot_Parsetexi)
# endif
#endif
- (void)newXSproto_portable("Parsetexi::dump_errors", XS_Parsetexi_dump_errors, file, "");
- (void)newXSproto_portable("Parsetexi::wipe_errors", XS_Parsetexi_wipe_errors, file, "");
- (void)newXSproto_portable("Parsetexi::parse_file", XS_Parsetexi_parse_file, file, "$");
- (void)newXSproto_portable("Parsetexi::parse_string", XS_Parsetexi_parse_string, file, "$");
- (void)newXSproto_portable("Parsetexi::parse_text", XS_Parsetexi_parse_text, file, "$");
- (void)newXSproto_portable("Parsetexi::store_value", XS_Parsetexi_store_value, file, "$$");
- (void)newXSproto_portable("Parsetexi::wipe_values", XS_Parsetexi_wipe_values, file, "");
- (void)newXSproto_portable("Parsetexi::reset_context_stack", XS_Parsetexi_reset_context_stack, file, "");
- (void)newXSproto_portable("Parsetexi::init_index_commands", XS_Parsetexi_init_index_commands, file, "");
- (void)newXSproto_portable("Parsetexi::add_include_directory", XS_Parsetexi_add_include_directory, file, "$");
- (void)newXSproto_portable("Parsetexi::build_texinfo_tree", XS_Parsetexi_build_texinfo_tree, file, "");
- (void)newXSproto_portable("Parsetexi::build_label_list", XS_Parsetexi_build_label_list, file, "");
- (void)newXSproto_portable("Parsetexi::build_internal_xref_list", XS_Parsetexi_build_internal_xref_list, file, "");
- (void)newXSproto_portable("Parsetexi::build_float_list", XS_Parsetexi_build_float_list, file, "");
- (void)newXSproto_portable("Parsetexi::build_index_data", XS_Parsetexi_build_index_data, file, "");
- (void)newXSproto_portable("Parsetexi::build_global_info", XS_Parsetexi_build_global_info, file, "");
- (void)newXSproto_portable("Parsetexi::build_global_info2", XS_Parsetexi_build_global_info2, file, "");
- (void)newXSproto_portable("Parsetexi::reset_parser", XS_Parsetexi_reset_parser, file, "");
- (void)newXSproto_portable("Parsetexi::clear_expanded_formats", XS_Parsetexi_clear_expanded_formats, file, "");
- (void)newXSproto_portable("Parsetexi::add_expanded_format", XS_Parsetexi_add_expanded_format, file, "$");
- (void)newXSproto_portable("Parsetexi::conf_set_show_menu", XS_Parsetexi_conf_set_show_menu, file, "$");
- (void)newXSproto_portable("Parsetexi::conf_set_CPP_LINE_DIRECTIVES", XS_Parsetexi_conf_set_CPP_LINE_DIRECTIVES, file, "$");
- (void)newXSproto_portable("Parsetexi::conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME", XS_Parsetexi_conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME, file, "$");
- (void)newXSproto_portable("Parsetexi::set_documentlanguage", XS_Parsetexi_set_documentlanguage, file, "$");
- (void)newXSproto_portable("Parsetexi::set_debug", XS_Parsetexi_set_debug, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::init", XS_Texinfo__Parser_init, file, "$$");
+ (void)newXSproto_portable("Texinfo::Parser::dump_errors", XS_Texinfo__Parser_dump_errors, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::wipe_errors", XS_Texinfo__Parser_wipe_errors, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::parse_file", XS_Texinfo__Parser_parse_file, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::parse_string", XS_Texinfo__Parser_parse_string, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::parse_text", XS_Texinfo__Parser_parse_text, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::store_value", XS_Texinfo__Parser_store_value, file, "$$");
+ (void)newXSproto_portable("Texinfo::Parser::wipe_values", XS_Texinfo__Parser_wipe_values, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::reset_context_stack", XS_Texinfo__Parser_reset_context_stack, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::init_index_commands", XS_Texinfo__Parser_init_index_commands, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::add_include_directory", XS_Texinfo__Parser_add_include_directory, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::build_texinfo_tree", XS_Texinfo__Parser_build_texinfo_tree, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::build_label_list", XS_Texinfo__Parser_build_label_list, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::build_internal_xref_list", XS_Texinfo__Parser_build_internal_xref_list, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::build_float_list", XS_Texinfo__Parser_build_float_list, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::build_index_data", XS_Texinfo__Parser_build_index_data, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::build_global_info", XS_Texinfo__Parser_build_global_info, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::build_global_info2", XS_Texinfo__Parser_build_global_info2, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::reset_parser", XS_Texinfo__Parser_reset_parser, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::clear_expanded_formats", XS_Texinfo__Parser_clear_expanded_formats, file, "");
+ (void)newXSproto_portable("Texinfo::Parser::add_expanded_format", XS_Texinfo__Parser_add_expanded_format, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::conf_set_show_menu", XS_Texinfo__Parser_conf_set_show_menu, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::conf_set_CPP_LINE_DIRECTIVES", XS_Texinfo__Parser_conf_set_CPP_LINE_DIRECTIVES, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME", XS_Texinfo__Parser_conf_set_IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::set_documentlanguage", XS_Texinfo__Parser_set_documentlanguage, file, "$");
+ (void)newXSproto_portable("Texinfo::Parser::set_debug", XS_Texinfo__Parser_set_debug, file, "$");
#if PERL_VERSION_LE(5, 21, 5)
# if PERL_VERSION_GE(5, 9, 0)
if (PL_unitcheckav)
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.pm b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.pm
index 87c9a0a0d6..5645a11c1b 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.pm
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-package Parsetexi;
+package Texinfo::Parser;
use Texinfo::XSLoader;
@@ -28,6 +28,7 @@ require Exporter;
use Texinfo::Common;
use Texinfo::Encoding;
use Texinfo::Convert::NodeNameNormalization;
+use Texinfo::Report;
our @ISA = qw(Exporter DynaLoader Texinfo::Report);
our %EXPORT_TAGS = ( 'all' => [ qw(
@@ -61,31 +62,6 @@ foreach my $tree_information ('values', 'macros', 'explained_commands', 'labels'
use Storable qw(dclone); # standard in 5.007003
-sub duplicate_parser {
- my $old_parser = shift;
-
- my $parser = dclone(\%parser_default_configuration);
-
- foreach my $key (keys(%parser_default_configuration)) {
- if ($tree_informations{$key}) {
- if (defined($old_parser->{$key})) {
- foreach my $info_key (keys(%{$old_parser->{$key}})) {
- $parser->{$key}->{$info_key}
- = $old_parser->{$key}->{$info_key};
- }
- }
- } elsif(ref($old_parser->{$key})) {
- $parser->{$key} = dclone($old_parser->{$key});
- } else {
- $parser->{$key} = $old_parser->{$key};
- }
- }
- bless $parser, ref($old_parser);
-
- $parser->Texinfo::Report::new;
- return $parser;
-}
-
sub simple_parser {
goto &parser;
}
@@ -276,13 +252,6 @@ sub parse_texi_file ($$)
############################################################
- if (defined($self->{'info'}->{'input_encoding_name'})) {
- my ($texinfo_encoding, $perl_encoding, $input_encoding)
- = Texinfo::Encoding::encoding_alias(
- $self->{'info'}->{'input_encoding_name'});
- $self->{'info'}->{'input_encoding_name'} = $input_encoding;
- }
-
my ($basename, $directories, $suffix) = fileparse($file_name);
$self->{'info'}->{'input_file_name'} = $basename;
$self->{'info'}->{'input_directory'} = $directories;
@@ -410,7 +379,7 @@ sub labels_information($)
BEGIN {
Texinfo::XSLoader::init (
"Texinfo::Parser",
- "Parsetexi",
+ "Texinfo::Parser",
"Texinfo::ParserNonXS",
"Parsetexi",
0);
@@ -420,26 +389,5 @@ END {
#reset_parser (); # for debugging memory leaks
}
-# This "use" statement is all the way down here because Texinfo::Report
-# and Texinfo::Parser both "use" each other. If we "use Texinfo::Report"
-# at the top of the file, this has the problem that the symbol table
-# for the Texinfo::Parser namespace, %Texinfo::Parser::, is a different
-# hash (i.e. it has a different address) from what it ends up with by the
-# end of this module. Once the Perl interpreter has read in a module and
-# interpreted variables in terms of a given symbol table, it does not
-# do so them again. Hence, use of subroutines in the Texinfo::Parser namespace
-# fails. This remains the case even if we arrange for the symbol table hash
-# to remain at the same address, because is empty while the file is being read.
-use Texinfo::Report;
-
-# NB Don't add more functions down here, because this can cause an error
-# with some versions of Perl, connected with the typeglob assignment just
-# above. ("Can't call mro_method_changed_in() on anonymous symbol table").
-#
-# See http://perl5.git.perl.org/perl.git/commitdiff/03d9f026ae253e9e69212a3cf6f1944437e9f070?hp=ac73ea1ec401df889d312b067f78b618f7ffecc3
-#
-# (change to Perl interpreter on 22 Oct 2011)
-
-
1;
__END__
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.xs b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.xs
index 6b96bc7edb..2995cd5cdf 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.xs
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/Parsetexi.xs
@@ -15,10 +15,15 @@
#include "indices.h"
#include "input.h"
-MODULE = Parsetexi PACKAGE = Parsetexi
+MODULE = Texinfo::Parser PACKAGE = Texinfo::Parser
PROTOTYPES: ENABLE
+int
+init (texinfo_uninstalled, srcdir)
+ int texinfo_uninstalled
+ char *srcdir
+
char *
dump_errors ()
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.c
index 81f612014b..76832a3538 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.c
@@ -25,8 +25,12 @@
#undef context
+#include <libintl.h>
+
#include <stdlib.h>
#include <stdio.h>
+#include <dirent.h>
+#include <string.h>
#include "parser.h"
#include "input.h"
@@ -36,6 +40,54 @@
ELEMENT *Root;
+
+#define LOCALEDIR DATADIR "/locale"
+
+/* Use the uninstalled locales dir.
+ NB the texinfo.mo files are not actually created here, only the
+ texinfo_document.mo files, which aren't used by parsetexi.
+ Hence, error messages will be translated only when the program is
+ installed. */
+static void
+find_locales_dir (char *builddir)
+{
+ DIR *dir;
+ char *s;
+
+ dTHX;
+
+ asprintf (&s, "%s/LocaleData", builddir);
+ dir = opendir (s);
+ if (!dir)
+ {
+ free (s);
+ fprintf (stderr, "Locales dir for document strings not found: %s\n",
+ strerror (errno));
+ }
+ else
+ {
+ bindtextdomain (PACKAGE, s);
+ free (s);
+ closedir (dir);
+ }
+}
+
+int
+init (int texinfo_uninstalled, char *builddir)
+{
+ setlocale (LC_ALL, "");
+
+ /* Use installed or uninstalled translation files for gettext. */
+ if (texinfo_uninstalled)
+ find_locales_dir (builddir);
+ else
+ bindtextdomain (PACKAGE, LOCALEDIR);
+
+ textdomain (PACKAGE);
+
+ return 1;
+}
+
static void
reset_floats ()
{
@@ -61,6 +113,7 @@ reset_parser_except_conf (void)
reset_region_stack ();
reset_floats ();
wipe_global_info ();
+ set_input_encoding ("utf-8");
reset_internal_xrefs ();
reset_labels ();
input_reset_input_stack ();
@@ -601,6 +654,7 @@ build_single_index_data (INDEX *i)
HV *hv;
AV *entries;
int j;
+ int entry_number;
dTHX;
@@ -667,6 +721,7 @@ build_single_index_data (INDEX *i)
}
#undef STORE
+ entry_number = 1;
if (i->index_number > 0)
for (j = 0; j < i->index_number; j++)
{
@@ -676,7 +731,6 @@ build_single_index_data (INDEX *i)
e = &i->index_entries[j];
entry = newHV ();
- av_push (entries, newRV_inc ((SV *)entry));
STORE2("index_name", newSVpv (i->name, 0));
STORE2("index_at_command",
@@ -685,7 +739,7 @@ build_single_index_data (INDEX *i)
newSVpv (command_name(e->index_type_command), 0));
STORE2("command",
newRV_inc ((SV *)e->command->hv));
- STORE2("number", newSViv (j + 1));
+ STORE2("number", newSViv (entry_number));
if (e->region)
{
STORE2("region", newRV_inc ((SV *)e->region->hv));
@@ -731,6 +785,15 @@ build_single_index_data (INDEX *i)
if (e->sortas)
STORE2("sortas", newSVpv (e->sortas, 0));
+ /* Skip these as these entries do not refer to the place in the document
+ where the index commands occurred. */
+ if (!lookup_extra (e->command, "seeentry")
+ && !lookup_extra (e->command, "seealso"))
+ {
+ av_push (entries, newRV_inc ((SV *)entry));
+ entry_number++;
+ }
+
/* We set this now because the index data structures don't
exist at the time that the main tree is built. */
{
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.h b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.h
index 12b52b5dda..71ca3a0725 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.h
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/api.h
@@ -1,6 +1,8 @@
/* api.h - declarations for api.c */
extern ELEMENT *Root;
+int init (int texinfo_uninstalled, char *srcdir_in);
+
void parse_text (char *);
void parse_string(char *);
int parse_file (char *filename);
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.c
index a8f840d3fe..44548f867a 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.c
@@ -279,6 +279,8 @@ COMMAND builtin_command_data[] = {
"sansserif", CF_brace, BRACE_style,
"sc", CF_brace, BRACE_style,
"section", CF_root | CF_line | CF_sectioning, LINE_line,
+"seealso", CF_brace, 1,
+"seeentry", CF_brace, 1,
"set", CF_line, LINE_special,
"setchapternewpage", CF_line | CF_global_unique, 1,
"setcontentsaftertitlepage", CF_line | CF_deprecated, LINE_skipline,
@@ -301,6 +303,7 @@ COMMAND builtin_command_data[] = {
"ss", CF_brace, 0,
"strong", CF_brace, BRACE_style,
"sub", CF_brace, BRACE_style,
+"subentry", CF_line, LINE_line,
"subheading", CF_line | CF_sectioning, LINE_line,
"subsection", CF_root | CF_line | CF_sectioning, LINE_line,
"subsubheading", CF_line | CF_sectioning, LINE_line,
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.txt b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.txt
index c3167e10bb..e2b62eb554 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.txt
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_data.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2018 Free Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
#
# This file is part of GNU Texinfo.
#
@@ -21,7 +21,7 @@
value brace
##############################################################
-# line 353 - no brace commands - single letter commands
+# no brace commands - single letter commands
* nobrace
# space
@@ -149,6 +149,8 @@ exdent line LINE_line
item_LINE line LINE_line
itemx line LINE_line
+subentry line LINE_line
+
##########################################################
#
# miscellaneous commands
@@ -285,7 +287,7 @@ strong brace BRACE_style
sub brace BRACE_style
sup brace BRACE_style
-# Regular font style commands 595
+# Regular font style commands
r brace BRACE_style
i brace BRACE_style
b brace BRACE_style
@@ -303,6 +305,8 @@ hyphenation brace,global BRACE_other
anchor brace 1
errormsg brace 1
sortas brace 1
+seeentry brace 1
+seealso brace 1
# more code style commands
indicateurl brace,code_style 1
@@ -315,7 +319,7 @@ caption brace BRACE_context
shortcaption brace BRACE_context
math brace BRACE_context
-# explained commands 624
+# explained commands
abbr brace 2
acronym brace 2
@@ -339,11 +343,8 @@ ref brace,ref 5
pxref brace,ref 5
image brace 5
-# line 660
-
##########################################################
-# line 687 - "block commands"
# def* commands
deffn block,def
@@ -391,7 +392,6 @@ deftypeivarx line,def,def_alias LINE_line
defmethodx line,def,def_alias LINE_line
deftypemethodx line,def,def_alias LINE_line
-# 760
multitable block,blockitem BLOCK_multitable
# menu commands
@@ -404,7 +404,6 @@ raggedright block
flushleft block
flushright block
-# 777
cartouche block
group block
indentedblock block
@@ -431,15 +430,12 @@ tex block,format_raw
xml block,format_raw
docbook block,format_raw
-# raw commands 811
+# raw commands
verbatim block BLOCK_raw
ignore block BLOCK_raw
macro block BLOCK_raw
rmacro block BLOCK_raw
-# line 815
-
-# line 831
table block,blockitem 1
ftable block,blockitem 1
vtable block,blockitem 1
@@ -470,7 +466,7 @@ ifcommanddefined block BLOCK_conditional
ifcommandnotdefined block BLOCK_conditional
##########################################################
-# Root commands - line 887
+# Root commands
node root,line LINE_line
top root,line,sectioning,global_unique LINE_line
chapter root,line,sectioning LINE_line
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_ids.h b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_ids.h
index 61202e10ad..23058049e9 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_ids.h
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/command_ids.h
@@ -309,6 +309,8 @@ CM_samp,
CM_sansserif,
CM_sc,
CM_section,
+CM_seealso,
+CM_seeentry,
CM_set,
CM_setchapternewpage,
CM_setcontentsaftertitlepage,
@@ -331,6 +333,7 @@ CM_sp,
CM_ss,
CM_strong,
CM_sub,
+CM_subentry,
CM_subheading,
CM_subsection,
CM_subsubheading,
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/end_line.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/end_line.c
index d16616e7af..0fd806613f 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1585,7 +1585,7 @@ end_line_misc_line (ELEMENT *current)
add_extra_string_dup (current, "input_encoding_name",
input_encoding);
- global_info.input_encoding_name = input_encoding;
+ global_info.input_encoding_name = strdup (input_encoding);
set_input_encoding (input_encoding);
}
}
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/errors.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/errors.c
index 92baf0ff98..1a57e0c8d0 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/errors.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/errors.c
@@ -14,6 +14,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+#include <libintl.h>
+
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
@@ -38,7 +40,7 @@ line_error_internal (enum error_type type, LINE_NR *cmd_line_nr,
char *format, va_list v)
{
char *message;
- vasprintf (&message, format, v);
+ vasprintf (&message, gettext(format), v);
if (!message) abort ();
if (error_number == error_space)
{
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/handle_commands.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/handle_commands.c
index d5fa0bffe6..91f43ac4b4 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -553,6 +553,39 @@ handle_line_command (ELEMENT *current, char **line_inout,
misc = new_element (ET_NONE);
misc->cmd = cmd;
misc->line_nr = line_nr;
+
+ if (cmd == CM_subentry)
+ {
+ int level = 1;
+ ELEMENT *parent = current->parent;
+
+ if (!(command_flags(parent) & CF_index_entry_command)
+ && parent->cmd != CM_subentry)
+ {
+ line_warn ("@subentry should only occur in an index entry");
+ }
+
+ add_extra_element (parent, "subentry", misc);
+
+ if (parent->cmd == CM_subentry)
+ {
+ KEY_PAIR *k = lookup_extra (parent, "level");
+ if (k && k->value)
+ level = (int) k->value + 1;
+ }
+ add_extra_integer (misc, "level", level);
+ if (level > 2)
+ {
+ line_error
+ ("no more than two levels of index subentry are allowed");
+ }
+
+ /* Do not make the @subentry element a child of the index
+ command. This means that spaces are preserved properly
+ when converting back to Texinfo. */
+ current = end_line (current);
+ }
+
add_to_element_contents (current, misc);
if (command_data(cmd).flags & CF_sectioning)
@@ -659,6 +692,8 @@ handle_line_command (ELEMENT *current, char **line_inout,
}
else if (cmd == CM_dircategory && current_node)
line_warn ("@dircategory after first node");
+ else if (cmd == CM_printindex && current_node)
+ add_extra_integer (current_node, "isindex", 1);
current = last_args_child (current);
@@ -1044,7 +1079,8 @@ handle_brace_command (ELEMENT *current, char **line_inout, enum command_id cmd)
if (cmd == CM_sortas)
{
- if (!(command_flags(current->parent) & CF_index_entry_command))
+ if (!(command_flags(current->parent) & CF_index_entry_command)
+ && current->parent->cmd != CM_subentry)
{
line_warn ("@%s should only appear in an index entry",
command_name(cmd));
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/input.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/input.c
index cad1edc475..560e637f87 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/input.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/input.c
@@ -42,7 +42,6 @@ typedef struct {
enum input_type type;
FILE *file;
- char *input_encoding;
LINE_NR line_nr;
char *text; /* Input text to be parsed as Texinfo. */
@@ -50,6 +49,15 @@ typedef struct {
into lines. */
} INPUT;
+static char *input_encoding;
+
+void
+set_input_encoding (char *encoding)
+{
+ input_encoding = encoding;
+}
+
+
static INPUT *input_stack = 0;
int input_number = 0;
int input_space = 0;
@@ -134,9 +142,9 @@ text_buffer_iconv (TEXT *buf, iconv_t iconv_state,
-/* Return conversion of S according to ENC. This function frees S. */
+/* Return conversion of S according to ENCODING. This function frees S. */
static char *
-convert_to_utf8 (char *s, char *input_encoding)
+convert_to_utf8 (char *s, char *encoding)
{
iconv_t our_iconv;
static TEXT t;
@@ -184,13 +192,13 @@ convert_to_utf8 (char *s, char *input_encoding)
}
enc = ce_latin1;
- if (!input_encoding)
+ if (!encoding)
;
- else if (!strcmp (input_encoding, "utf-8"))
+ else if (!strcmp (encoding, "utf-8"))
enc = ce_utf8;
- else if (!strcmp (input_encoding, "iso-8859-2"))
+ else if (!strcmp (encoding, "iso-8859-2"))
enc = ce_latin2;
- else if (!strcmp (input_encoding, "shift_jis"))
+ else if (!strcmp (encoding, "shift_jis"))
enc = ce_shiftjis;
switch (enc)
@@ -325,7 +333,7 @@ next_text (void)
i->line_nr.line_nr++;
line_nr = i->line_nr;
- return convert_to_utf8 (line, i->input_encoding);
+ return convert_to_utf8 (line, input_encoding);
}
free (line); line = 0;
break;
@@ -368,7 +376,6 @@ input_push (char *text, char *macro, char *filename, int line_number)
input_stack[input_number].file = 0;
input_stack[input_number].text = text;
input_stack[input_number].ptext = text;
- input_stack[input_number].input_encoding = 0;
if (!macro)
line_number--;
@@ -473,17 +480,6 @@ top_file_index (void)
return i;
}
-void
-set_input_encoding (char *encoding)
-{
- int i;
-
- /* Set encoding of top file in stack. */
- i = top_file_index ();
- if (i >= 0)
- input_stack[i].input_encoding = encoding;
-}
-
static char **include_dirs;
static size_t include_dirs_number;
@@ -578,7 +574,6 @@ input_push_file (char *filename)
input_stack[input_number].line_nr.macro = 0;
input_stack[input_number].text = 0;
input_stack[input_number].ptext = 0;
- input_stack[input_number].input_encoding = 0;
input_number++;
return 0;
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/parser.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/parser.c
index d0d661969b..8edc8a0e50 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/parser.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/parser.c
@@ -260,6 +260,7 @@ wipe_global_info (void)
global_kbdinputstyle = kbd_distinct;
free (global_info.input_perl_encoding);
+ free (global_info.input_encoding_name);
free (global_info.dircategory_direntry.contents.list);
free (global_info.footnotes.contents.list);
@@ -295,6 +296,9 @@ wipe_global_info (void)
#undef GLOBAL_CASE
memset (&global_info, 0, sizeof (global_info));
+
+ global_info.input_perl_encoding = strdup ("utf-8");
+ global_info.input_encoding_name = strdup ("utf-8");
}
@@ -671,7 +675,7 @@ isolate_last_space_internal (ELEMENT *current)
}
static void
-isolate_last_space_menu_entry_node (ELEMENT *current)
+isolate_trailing_space (ELEMENT *current, enum element_type spaces_type)
{
ELEMENT *last_elt;
char *text;
@@ -685,7 +689,7 @@ isolate_last_space_menu_entry_node (ELEMENT *current)
/* If text all whitespace */
if (text[strspn (text, whitespace_chars)] == '\0')
{
- last_elt->type = ET_space_at_end_menu_node;
+ last_elt->type = spaces_type;
}
else
{
@@ -698,7 +702,7 @@ isolate_last_space_menu_entry_node (ELEMENT *current)
i--)
trailing_spaces++;
- new_spaces = new_element (ET_space_at_end_menu_node);
+ new_spaces = new_element (spaces_type);
text_append_n (&new_spaces->text,
text + text_len - trailing_spaces,
trailing_spaces);
@@ -742,7 +746,7 @@ isolate_last_space (ELEMENT *current)
return;
if (current->type == ET_menu_entry_node)
- isolate_last_space_menu_entry_node (current);
+ isolate_trailing_space (current, ET_space_at_end_menu_node);
else
isolate_last_space_internal (current);
}
@@ -912,6 +916,7 @@ check_valid_nesting (ELEMENT *current, enum command_id cmd)
else if (cmd == CM_c
|| cmd == CM_comment
|| cmd == CM_refill
+ || cmd == CM_subentry
|| cmd == CM_columnfractions
|| cmd == CM_set
|| cmd == CM_clear
@@ -1594,7 +1599,8 @@ value_invalid:
&& cmd != CM_verbatiminclude
&& cmd != CM_set
&& cmd != CM_clear
- && cmd != CM_vskip)))
+ && cmd != CM_vskip)
+ && cmd != CM_subentry))
{
line_warn ("@%s should only appear at the beginning of a line",
command_name(cmd));
@@ -1636,6 +1642,15 @@ value_invalid:
current = end_preformatted (current, 0, 0);
}
+ if ((cmd == CM_sortas
+ || cmd == CM_seeentry
+ || cmd == CM_subentry)
+ && current->contents.number > 0
+ && last_contents_child(current)->text.end > 0)
+ {
+ isolate_trailing_space (current, ET_empty_spaces_before_argument);
+ }
+
if (cmd == CM_item && item_line_parent (current))
cmd = CM_item_LINE;
/* We could possibly have done this before check_valid_nesting. */
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/separator.c b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/separator.c
index 57946d6b17..ee58a2d6c5 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/separator.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/parsetexi/separator.c
@@ -468,7 +468,9 @@ handle_close_brace (ELEMENT *current, char **line_inout)
add_extra_element (current->parent->parent->parent,
"command_as_argument", current->parent);
}
- else if (current->parent->cmd == CM_sortas)
+ else if (current->parent->cmd == CM_sortas
+ || current->parent->cmd == CM_seeentry
+ || current->parent->cmd == CM_seealso)
{
ELEMENT *e = current->contents.list[0];
@@ -477,11 +479,13 @@ handle_close_brace (ELEMENT *current, char **line_inout)
ELEMENT *index_elt;
if (current->parent->parent
&& current->parent->parent->parent
- && (command_flags(current->parent->parent->parent)
- & CF_index_entry_command))
+ && ((command_flags(current->parent->parent->parent)
+ & CF_index_entry_command)
+ || current->parent->parent->parent->cmd == CM_subentry))
{
index_elt = current->parent->parent->parent;
- add_extra_string_dup (index_elt, "sortas",
+ add_extra_string_dup (index_elt,
+ command_name(current->parent->cmd),
e->text.text);
}
}
@@ -492,7 +496,9 @@ handle_close_brace (ELEMENT *current, char **line_inout)
|| current->parent->cmd == CM_hyphenation
|| current->parent->cmd == CM_caption
|| current->parent->cmd == CM_shortcaption
- || current->parent->cmd == CM_sortas)
+ || current->parent->cmd == CM_sortas
+ || current->parent->cmd == CM_seeentry
+ || current->parent->cmd == CM_seealso)
{
ELEMENT *e;
e = new_element (ET_empty_spaces_after_close_brace);
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/xspara.c b/macros/texinfo/texinfo/tp/Texinfo/XS/xspara.c
index 52a54ed744..ee666a1f08 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/xspara.c
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/xspara.c
@@ -239,7 +239,7 @@ iswupper (wint_t wi)
#endif
int
-xspara_init (void)
+xspara_init (int unused, char *unused2)
{
char *utf8_locale = 0;
int len;
@@ -1131,8 +1131,17 @@ xspara_add_text (char *text)
state.end_sentence = -2;
}
}
+ else if (wc == L'\b')
+ {
+ /* Code to say that a following full stop (or question or
+ exclamation mark) may be an end of sentence. */
+ xspara_allow_end_sentence ();
+ }
/*************** Word character ******************************/
- else if (width == 1)
+ /* Note: width == 0 includes accent characters which should not
+ properly increase the column count. This is not what the pure
+ Perl code does, though. */
+ else if (width == 1 || width == 0)
{
char *added_word;
added_word = malloc (char_len + 1);
@@ -1170,12 +1179,6 @@ xspara_add_text (char *text)
state.last_letter = wc;
}
}
- else if (wc == L'\b')
- {
- /* Code to say that a following full stop (or question or
- exclamation mark) may be an end of sentence. */
- xspara_allow_end_sentence ();
- }
else
{
/* Not printable, possibly a tab, or a combining character.
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XS/xspara.h b/macros/texinfo/texinfo/tp/Texinfo/XS/xspara.h
index 37de8f9797..a73346c08f 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XS/xspara.h
+++ b/macros/texinfo/texinfo/tp/Texinfo/XS/xspara.h
@@ -1,7 +1,7 @@
int xspara_new (HV *conf);
void xspara_init_state (HV *hash);
void xspara_set_state (SV *state);
-int xspara_init (void);
+int xspara_init (int, char *);
void xspara_get_state (HV *state);
char *xspara_add_next (char *, int, int transparent);
char *xspara_add_text (char *);
diff --git a/macros/texinfo/texinfo/tp/Texinfo/XSLoader.pm b/macros/texinfo/texinfo/tp/Texinfo/XSLoader.pm
index 0b55f2e141..a1002adc4c 100644
--- a/macros/texinfo/texinfo/tp/Texinfo/XSLoader.pm
+++ b/macros/texinfo/texinfo/tp/Texinfo/XSLoader.pm
@@ -1,4 +1,4 @@
-# Copyright 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
+# Copyright 2014-2019 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ use warnings;
our $TEXINFO_XS;
-our $VERSION = '6.6';
+our $VERSION = '6.7';
our $disable_XS;
@@ -221,7 +221,9 @@ LOAD:
# This makes it easier to refer to packages and symbols by name.
no strict 'refs';
- if (defined &{"${module}::init"} and !&{"${module}::init"} ()) {
+ if (defined &{"${module}::init"}
+ and !&{"${module}::init"} ($Texinfo::ModulePath::texinfo_uninstalled,
+ $Texinfo::ModulePath::builddir)) {
_fatal "$module_name: error initializing";
goto FALLBACK;
}
diff --git a/macros/texinfo/texinfo/tp/init/chm.pm b/macros/texinfo/texinfo/tp/init/chm.pm
index 1a8b05b3f5..7ec825dc46 100644
--- a/macros/texinfo/texinfo/tp/init/chm.pm
+++ b/macros/texinfo/texinfo/tp/init/chm.pm
@@ -28,9 +28,11 @@ use strict;
use File::Spec;
+# For __(
+use Texinfo::Common;
+
main::set_global_format('html');
-set_from_init_file('TOP_NODE_FILE', undef);
set_from_init_file('TOP_FILE', undef);
#$SECTION_NAVIGATION = 0; # to avoid headers in normal elements
@@ -218,7 +220,7 @@ sub chm_init($)
my $hhk_file = File::Spec->catfile($outdir, $hhk_filename);
my $hhk_fh = Texinfo::Common::open_out($self, $hhk_file);
if (!defined($hhk_fh)) {
- $self->document_error(sprintf($self->__("chm.pm: could not open %s for writing: %s\n"),
+ $self->document_error(sprintf(__("chm.pm: could not open %s for writing: %s\n"),
$hhk_file, $!));
return 0;
}
@@ -264,7 +266,7 @@ sub chm_init($)
print $hhk_fh "</BODY>\n</HTML>\n";
delete $self->{'unclosed_files'}->{$hhk_file};
if (!close ($hhk_fh)) {
- $self->document_error(sprintf($self->__("chm.pm: error on closing %s: %s"),
+ $self->document_error(sprintf(__("chm.pm: error on closing %s: %s"),
$hhk_file, $!));
return 0;
}
@@ -274,7 +276,7 @@ sub chm_init($)
my $hhc_fh = Texinfo::Common::open_out($self, $hhc_file);
# Not sure $! is still valid
if (!defined($hhc_fh)) {
- $self->document_error(sprintf($self->__("chm.pm: could not open %s for writing: %s\n"),
+ $self->document_error(sprintf(__("chm.pm: could not open %s for writing: %s\n"),
$hhc_file, $!));
return 0;
}
@@ -334,7 +336,7 @@ sub chm_init($)
print $hhc_fh "</HTML>\n</BODY>\n";
delete $self->{'unclosed_files'}->{$hhc_file};
if (!close ($hhc_fh)) {
- $self->document_error(sprintf($self->__("chm.pm: error on closing %s: %s"),
+ $self->document_error(sprintf(__("chm.pm: error on closing %s: %s"),
$hhc_file, $!));
return 0;
}
@@ -344,7 +346,7 @@ sub chm_init($)
my $hhp_fh = Texinfo::Common::open_out($self, $hhp_file);
# Not sure $! is still valid
if (!defined($hhp_fh)) {
- $self->document_error(sprintf($self->__("chm.pm: could not open %s for writing: %s\n"),
+ $self->document_error(sprintf(__("chm.pm: could not open %s for writing: %s\n"),
$hhp_file, $!));
return 0;
}
@@ -395,7 +397,7 @@ EOT
delete $self->{'unclosed_files'}->{$hhp_file};
if (!close ($hhp_fh)) {
- $self->document_error(sprintf($self->__("chm.pm: error on closing %s: %s"),
+ $self->document_error(sprintf(__("chm.pm: error on closing %s: %s"),
$hhp_file, $!));
return 0;
}
diff --git a/macros/texinfo/texinfo/tp/init/latex2html.pm b/macros/texinfo/texinfo/tp/init/latex2html.pm
index 27aa559598..6b1643f85e 100644
--- a/macros/texinfo/texinfo/tp/init/latex2html.pm
+++ b/macros/texinfo/texinfo/tp/init/latex2html.pm
@@ -31,12 +31,8 @@ use Cwd;
use File::Copy;
use File::Spec;
-my $global_cmds = get_conf('GLOBAL_COMMANDS');
-if (!defined($global_cmds)) {
- set_from_init_file('GLOBAL_COMMANDS', []);
- $global_cmds = get_conf('GLOBAL_COMMANDS');
-}
-push @$global_cmds, ('math', 'tex');
+# For __(
+use Texinfo::Common;
texinfo_register_handler('structure', \&l2h_process);
texinfo_register_handler('finish', \&l2h_finish);
@@ -144,9 +140,10 @@ my %global_count = (); # associate a command name and the
# html result array
# set $status to 1, if l2h could be initalized properly, to 0 otherwise
-sub l2h_process($)
+sub l2h_process($$)
{
my $self = shift;
+ my $document_root = shift;
%l2h_to_latex = (); # associate a latex text with the index in the
# html result array.
@l2h_to_latex = (); # array used to associate the index with
@@ -196,7 +193,7 @@ sub l2h_process($)
unless ($self->get_conf('L2H_SKIP')) {
unless (open(L2H_LATEX, ">$l2h_latex_file")) {
- $self->document_error(sprintf($self->__(
+ $self->document_error(sprintf(__(
"l2h: could not open latex file %s for writing: %s"),
$l2h_latex_file, $!));
$status = 0;
@@ -209,10 +206,15 @@ sub l2h_process($)
l2h_init_cache($self) if (!defined($self->get_conf('L2H_SKIP'))
or $self->get_conf('L2H_SKIP'));
- foreach my $command ('tex', 'math') {
- if ($self->{'extra'}->{$command}) {
+ my @replaced_commands = ('tex', 'math');
+ my $collected_commands = Texinfo::Common::collect_commands_in_tree($document_root, \@replaced_commands);
+ foreach my $command (@replaced_commands) {
+ ## we rely on @tex and @math being recorded as 'global commands'
+ #if ($self->{'extra'}->{$command}) {
+ if (scalar(@{$collected_commands->{$command}}) > 0) {
my $counter = 0;
- foreach my $root (@{$self->{'extra'}->{$command}}) {
+ #foreach my $root (@{$self->{'extra'}->{$command}}) {
+ foreach my $root (@{$collected_commands->{$command}}) {
$counter++;
my $tree;
if ($command eq 'math') {
@@ -338,12 +340,12 @@ sub l2h_to_html($)
# Check for dot in directory where dvips will work
if ($self->get_conf('L2H_TMP')) {
if ($self->get_conf('L2H_TMP') =~ /\./) {
- $self->document_warn($self->__("l2h: L2H_TMP directory contains a dot"));
+ $self->document_warn(__("l2h: L2H_TMP directory contains a dot"));
$dotbug = 1;
}
} else {
if (cwd() =~ /\./) {
- $self->document_warn($self->__("l2h: current directory contains a dot"));
+ $self->document_warn(__("l2h: current directory contains a dot"));
$dotbug = 1;
}
}
@@ -371,7 +373,7 @@ sub l2h_to_html($)
warn "# l2h: executing '$call'\n" if ($verbose);
if (system($call)) {
- $self->document_error(sprintf($self->__("l2h: command did not succeed: %s"),
+ $self->document_error(sprintf(__("l2h: command did not succeed: %s"),
$call));
return 0;
} else {
@@ -418,7 +420,7 @@ sub l2h_change_image_file_names($$)
# document extension. copying the file could result in
# overwriting an output file (almost surely if the default
# texi2html file names are used).
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"l2h: image has invalid extension: %s"), $src));
next;
}
@@ -435,7 +437,7 @@ sub l2h_change_image_file_names($$)
copy($file_src, $file_dest);
} else {
if (!rename($file_src, $file_dest)) {
- $self->document_warn(sprintf($self->__("l2h: rename %s as %s failed: %s"),
+ $self->document_warn(sprintf(__("l2h: rename %s as %s failed: %s"),
$file_src, $file_dest, $!));
}
}
@@ -457,7 +459,7 @@ sub l2h_init_from_html($)
}
if (! open(L2H_HTML, "<$l2h_html_file")) {
- $self->document_warn(sprintf($self->__("l2h: could not open %s: %s"),
+ $self->document_warn(sprintf(__("l2h: could not open %s: %s"),
$l2h_html_file, $!));
return 0;
}
@@ -500,7 +502,7 @@ sub l2h_init_from_html($)
# Not the same number of converted elements and retrieved elements
if ($latex_converted_count != $html_converted_count) {
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"latex2html.pm: processing produced %d items in HTML; expected %d, the number of items found in the document"),
$html_converted_count, $latex_converted_count));
}
@@ -531,8 +533,8 @@ sub l2h_do_tex($$)
# counter is undefined
$invalid_counter_count++;
$self->document_warn(
- sprintf($self->__("l2h: could not determine the fragment %d for \@%s",
- $counter, $cmdname)));
+ sprintf(__("l2h: could not determine the fragment %d for \@%s"),
+ $counter, $cmdname));
return ("<!-- l2h: ". __LINE__ . " undef count for ${cmdname}_$counter -->")
if ($debug);
return '';
@@ -556,7 +558,7 @@ sub l2h_do_tex($$)
} else {
# if the result is not in @l2h_from_html, there is an error somewhere.
$extract_error_count++;
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"l2h: could not extract the fragment %d for \@%s with output counter %d from HTML"),
$counter, $cmdname, $count));
# try simple (ordinary) substitution (without l2h)
@@ -618,7 +620,7 @@ sub l2h_init_cache($)
my $self = shift;
if (-r $l2h_cache_file) {
my $rdo = do "$l2h_cache_file";
- $self->document_error(sprintf($self->__("l2h: could not load %s: %s"),
+ $self->document_error(sprintf(__("l2h: could not load %s: %s"),
$l2h_cache_file, $@))
unless ($rdo);
}
@@ -631,7 +633,7 @@ sub l2h_store_cache($)
return unless $latex_count;
my ($key, $value);
unless (open(FH, ">$l2h_cache_file")) {
- $self->document_error(sprintf($self->__("l2h: could not open %s for writing: %s"),
+ $self->document_error(sprintf(__("l2h: could not open %s for writing: %s"),
$l2h_cache_file, $!));
return;
}
diff --git a/macros/texinfo/texinfo/tp/init/tex4ht.pm b/macros/texinfo/texinfo/tp/init/tex4ht.pm
index 92f334d9be..6f326b5e6c 100644
--- a/macros/texinfo/texinfo/tp/init/tex4ht.pm
+++ b/macros/texinfo/texinfo/tp/init/tex4ht.pm
@@ -33,12 +33,8 @@
use strict;
-my $global_cmds = get_conf('GLOBAL_COMMANDS');
-if (!defined($global_cmds)) {
- set_from_init_file('GLOBAL_COMMANDS', []);
- $global_cmds = get_conf('GLOBAL_COMMANDS');
-}
-push @$global_cmds, ('math', 'tex');
+# For __(
+use Texinfo::Common;
texinfo_register_handler('structure', \&tex4ht_prepare);
texinfo_register_handler('init', \&tex4ht_convert);
@@ -82,10 +78,11 @@ my %commands = ();
my $tex4ht_initial_dir;
my $tex4ht_out_dir;
-sub tex4ht_prepare($)
+sub tex4ht_prepare($$)
{
# set file names
my $self = shift;
+ my $document_root = shift;
return 1 if (defined($self->get_conf('OUTFILE'))
and $Texinfo::Common::null_device_file{$self->get_conf('OUTFILE')});
@@ -104,7 +101,9 @@ sub tex4ht_prepare($)
$commands{'tex'}->{'style'} = $Texinfo::TeX4HT::STYLE_TEX;
$commands{'math'}->{'exec'} = $Texinfo::TeX4HT::tex4ht_command_math;
$commands{'tex'}->{'exec'} = $Texinfo::TeX4HT::tex4ht_command_tex;
- foreach my $command ('math', 'tex') {
+ my @replaced_commands = sort(keys(%commands));
+ my $collected_commands = Texinfo::Common::collect_commands_in_tree($document_root, \@replaced_commands);
+ foreach my $command (@replaced_commands) {
my $style = $commands{$command}->{'style'};
$commands{$command}->{'basename'} = $tex4ht_basename . "_$command";
my $suffix = '.tex';
@@ -117,10 +116,13 @@ sub tex4ht_prepare($)
$commands{$command}->{'counter'} = 0;
$commands{$command}->{'output_counter'} = 0;
- if ($self->{'extra'}->{$command}) {
+ ## we rely on 'math' and 'tex' being recorded as global commands
+ #if ($self->{'extra'}->{$command}) {
+ if (scalar(@{$collected_commands->{$command}}) > 0) {
+
local *TEX4HT_TEXFILE;
unless (open (*TEX4HT_TEXFILE, ">$rfile")) {
- $self->document_warn(sprintf($self->__("tex4ht.pm: could not open %s: %s"),
+ $self->document_warn(sprintf(__("tex4ht.pm: could not open %s: %s"),
$rfile, $!));
return 1;
}
@@ -143,7 +145,8 @@ sub tex4ht_prepare($)
print $fh "\\csname tex4ht\\endcsname\n";
}
}
- foreach my $root (@{$self->{'extra'}->{$command}}) {
+ #foreach my $root (@{$self->{'extra'}->{$command}}) {
+ foreach my $root (@{$collected_commands->{$command}}) {
$commands{$command}->{'counter'}++;
my $counter = $commands{$command}->{'counter'};
my $tree;
@@ -216,7 +219,7 @@ sub tex4ht_convert($)
{
my $self = shift;
unless (chdir $tex4ht_out_dir) {
- $self->document_warn(sprintf($self->__("tex4ht.pm: chdir %s failed: %s"),
+ $self->document_warn(sprintf(__("tex4ht.pm: chdir %s failed: %s"),
$tex4ht_out_dir, $!));
return 0;
}
@@ -228,7 +231,7 @@ sub tex4ht_convert($)
$errors += tex4ht_process_command($self, $command);
}
unless (chdir $tex4ht_initial_dir) {
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"tex4ht.pm: unable to return to initial directory: %s"), $!));
return 0;
}
@@ -241,7 +244,7 @@ sub tex4ht_process_command($$) {
return 0 unless ($commands{$command}->{'counter'});
- $self->document_warn(sprintf($self->__("tex4ht.pm: output file missing: %s"),
+ $self->document_warn(sprintf(__("tex4ht.pm: output file missing: %s"),
$commands{$command}->{'basefile'}))
unless (-f $commands{$command}->{'basefile'});
my $style = $commands{$command}->{'style'};
@@ -256,7 +259,7 @@ sub tex4ht_process_command($$) {
my $cmd = "$commands{$command}->{'exec'} $commands{$command}->{'basefile'} $options";
print STDERR "tex4ht command: $cmd\n" if ($self->get_conf('VERBOSE'));
if (system($cmd)) {
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"tex4ht.pm: command failed: %s"), $cmd));
return 1;
}
@@ -264,7 +267,7 @@ sub tex4ht_process_command($$) {
# extract the html from the file created by tex4ht
my $html_basefile = $commands{$command}->{'html_file'};
unless (open (TEX4HT_HTMLFILE, $html_basefile)) {
- $self->document_warn(sprintf($self->__("tex4ht.pm: could not open %s: %s"),
+ $self->document_warn(sprintf(__("tex4ht.pm: could not open %s: %s"),
$html_basefile, $!));
return 1;
}
@@ -290,14 +293,14 @@ sub tex4ht_process_command($$) {
}
}
unless ($end_found) {
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"tex4ht.pm: end of \@%s item %d not found"),
$command, $count));
}
}
}
if ($got_count != $commands{$command}->{'counter'}) {
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"tex4ht.pm: processing produced %d items in HTML; expected %d, the number of items found in the document for \@%s"),
$got_count, $commands{$command}->{'counter'},
$command));
@@ -317,7 +320,7 @@ sub tex4ht_do_tex($$$$)
$commands{$cmdname}->{'output_counter'}++;
return $commands{$cmdname}->{'results'}->{$command};
} else {
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"tex4ht.pm: output has no HTML item for \@%s %s"),
$cmdname, $command));
return '';
@@ -332,7 +335,7 @@ sub tex4ht_finish($)
if ($self->get_conf('VERBOSE')) {
foreach my $command (keys(%commands)) {
if ($commands{$command}->{'output_counter'} != $commands{$command}->{'counter'}) {
- $self->document_warn(sprintf($self->__(
+ $self->document_warn(sprintf(__(
"tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of items found in the document for \@%s"),
$commands{$command}->{'output_counter'},
$commands{$command}->{'counter'}, $command));
diff --git a/macros/texinfo/texinfo/tp/maintain/language-subtag-registry b/macros/texinfo/texinfo/tp/maintain/language-subtag-registry
index 67b3705749..c970025b9d 100644
--- a/macros/texinfo/texinfo/tp/maintain/language-subtag-registry
+++ b/macros/texinfo/texinfo/tp/maintain/language-subtag-registry
@@ -1,4 +1,4 @@
-File-Date: 2018-11-30
+File-Date: 2019-09-16
%%
Type: language
Subtag: aa
@@ -2096,6 +2096,8 @@ Type: language
Subtag: ais
Description: Nataoran Amis
Added: 2009-07-29
+Deprecated: 2019-04-16
+Comments: see ami, szy
%%
Type: language
Subtag: ait
@@ -2633,6 +2635,7 @@ Added: 2009-07-29
Type: language
Subtag: ant
Description: Antakarinya
+Description: Antikarinya
Added: 2009-07-29
%%
Type: language
@@ -3094,6 +3097,8 @@ Type: language
Subtag: asd
Description: Asas
Added: 2009-07-29
+Deprecated: 2019-04-16
+Preferred-Value: snz
%%
Type: language
Subtag: ase
@@ -4135,7 +4140,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: bck
-Description: Bunaba
+Description: Bunuba
Added: 2009-07-29
%%
Type: language
@@ -6930,7 +6935,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: bym
-Description: Bidyara
+Description: Bidjara
Added: 2009-07-29
%%
Type: language
@@ -7564,6 +7569,11 @@ Description: Centúúm
Added: 2009-07-29
%%
Type: language
+Subtag: cey
+Description: Ekai Chin
+Added: 2019-04-16
+%%
+Type: language
Subtag: cfa
Description: Dijim-Bwilim
Added: 2009-07-29
@@ -9439,6 +9449,7 @@ Added: 2009-07-29
Type: language
Subtag: dif
Description: Dieri
+Description: Diyari
Added: 2009-07-29
%%
Type: language
@@ -9515,6 +9526,8 @@ Type: language
Subtag: dit
Description: Dirari
Added: 2009-07-29
+Deprecated: 2019-04-29
+Preferred-Value: dif
%%
Type: language
Subtag: diu
@@ -9560,6 +9573,7 @@ Added: 2009-07-29
Type: language
Subtag: djd
Description: Djamindjung
+Description: Ngaliwurru
Added: 2009-07-29
%%
Type: language
@@ -9603,6 +9617,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: djn
+Description: Jawoyn
Description: Djauan
Added: 2009-07-29
%%
@@ -10191,6 +10206,8 @@ Type: language
Subtag: dud
Description: Hun-Saare
Added: 2009-07-29
+Deprecated: 2019-04-16
+Comments: see uth, uss
%%
Type: language
Subtag: due
@@ -10382,6 +10399,7 @@ Added: 2009-07-29
Type: language
Subtag: dyn
Description: Dyangadi
+Description: Dhanggatti
Added: 2009-07-29
%%
Type: language
@@ -10396,6 +10414,7 @@ Added: 2005-10-16
%%
Type: language
Subtag: dyy
+Description: Djabugay
Description: Dyaabugay
Added: 2009-07-29
%%
@@ -11672,7 +11691,7 @@ Comments: see wny, wrk
%%
Type: language
Subtag: gbd
-Description: Karadjeri
+Description: Karajarri
Added: 2009-07-29
%%
Type: language
@@ -12056,7 +12075,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: gge
-Description: Guragone
+Description: Gurr-goni
Added: 2009-07-29
%%
Type: language
@@ -12169,7 +12188,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: gia
-Description: Kitja
+Description: Kija
Added: 2009-07-29
%%
Type: language
@@ -12955,7 +12974,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: gue
-Description: Gurinji
+Description: Gurindji
Added: 2009-07-29
%%
Type: language
@@ -15292,6 +15311,7 @@ Macrolanguage: ms
Type: language
Subtag: jay
Description: Yan-nhangu
+Description: Nhangu
Added: 2009-07-29
%%
Type: language
@@ -15488,6 +15508,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: jig
+Description: Jingulu
Description: Djingili
Added: 2009-07-29
%%
@@ -17222,6 +17243,7 @@ Added: 2009-07-29
Type: language
Subtag: kkp
Description: Gugubera
+Description: Koko-Bera
Added: 2009-07-29
%%
Type: language
@@ -17266,6 +17288,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: kky
+Description: Guugu Yimidhirr
Description: Guguyimidjir
Added: 2009-07-29
%%
@@ -18320,6 +18343,7 @@ Added: 2009-07-29
Type: language
Subtag: ktd
Description: Kokata
+Description: Kukatha
Added: 2009-07-29
%%
Type: language
@@ -19341,6 +19365,7 @@ Type: language
Subtag: lba
Description: Lui
Added: 2009-07-29
+Deprecated: 2019-04-16
%%
Type: language
Subtag: lbb
@@ -19396,7 +19421,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: lbn
-Description: Lamet
+Description: Rmeet
Added: 2009-07-29
%%
Type: language
@@ -19446,6 +19471,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: lby
+Description: Lamalama
Description: Lamu-Lamu
Added: 2009-07-29
%%
@@ -20162,6 +20188,8 @@ Type: language
Subtag: llo
Description: Khlor
Added: 2009-07-29
+Deprecated: 2019-04-16
+Preferred-Value: ngt
%%
Type: language
Subtag: llp
@@ -20654,6 +20682,11 @@ Added: 2009-07-29
Macrolanguage: luy
%%
Type: language
+Subtag: lsn
+Description: Tibetan Sign Language
+Added: 2019-04-16
+%%
+Type: language
Subtag: lso
Description: Laos Sign Language
Added: 2009-07-29
@@ -20680,6 +20713,11 @@ Description: Trinidad and Tobago Sign Language
Added: 2009-07-29
%%
Type: language
+Subtag: lsv
+Description: Sivia Sign Language
+Added: 2019-04-16
+%%
+Type: language
Subtag: lsy
Description: Mauritian Sign Language
Added: 2010-03-11
@@ -20848,6 +20886,11 @@ Description: Maku'a
Added: 2009-07-29
%%
Type: language
+Subtag: lvi
+Description: Lavi
+Added: 2019-04-16
+%%
+Type: language
Subtag: lvk
Description: Lavukaleve
Added: 2009-07-29
@@ -21454,7 +21497,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: mec
-Description: Mara
+Description: Marra
Added: 2009-07-29
%%
Type: language
@@ -21523,7 +21566,7 @@ Macrolanguage: ms
%%
Type: language
Subtag: mep
-Description: Miriwung
+Description: Miriwoong
Added: 2009-07-29
%%
Type: language
@@ -21660,7 +21703,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: mfr
-Description: Marithiel
+Description: Marrithiyel
Added: 2009-07-29
%%
Type: language
@@ -22853,12 +22896,13 @@ Added: 2009-07-29
%%
Type: language
Subtag: mpb
+Description: Malak Malak
Description: Mullukmulluk
Added: 2009-07-29
%%
Type: language
Subtag: mpc
-Description: Mangarayi
+Description: Mangarrayi
Added: 2009-07-29
%%
Type: language
@@ -22889,6 +22933,7 @@ Added: 2009-07-29
Type: language
Subtag: mpj
Description: Martu Wangka
+Description: Wangkajunga
Added: 2009-07-29
%%
Type: language
@@ -24015,6 +24060,8 @@ Type: language
Subtag: myd
Description: Maramba
Added: 2009-07-29
+Deprecated: 2019-04-16
+Preferred-Value: aog
%%
Type: language
Subtag: mye
@@ -24040,6 +24087,7 @@ Type: language
Subtag: myi
Description: Mina (India)
Added: 2009-07-29
+Deprecated: 2019-04-16
%%
Type: language
Subtag: myj
@@ -24375,7 +24423,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: nay
-Description: Narrinyeri
+Description: Ngarrindjeri
Added: 2009-07-29
%%
Type: language
@@ -24432,7 +24480,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: nbj
-Description: Ngarinman
+Description: Ngarinyman
Added: 2009-07-29
%%
Type: language
@@ -24467,7 +24515,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: nbr
-Description: Numana-Nunku-Gbantu-Numbu
+Description: Numana
Added: 2009-07-29
%%
Type: language
@@ -24559,7 +24607,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: nck
-Description: Nakara
+Description: Na-kara
Added: 2009-07-29
%%
Type: language
@@ -24931,7 +24979,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: ngh
-Description: NÇ€u
+Description: NÇng
Added: 2009-07-29
%%
Type: language
@@ -25176,7 +25224,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: nig
-Description: Ngalakan
+Description: Ngalakgan
Added: 2009-07-29
%%
Type: language
@@ -25798,6 +25846,8 @@ Type: language
Subtag: nns
Description: Ningye
Added: 2009-07-29
+Deprecated: 2019-04-16
+Preferred-Value: nbr
%%
Type: language
Subtag: nnt
@@ -26658,7 +26708,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: nyh
-Description: Nyigina
+Description: Nyikina
Added: 2009-07-29
%%
Type: language
@@ -26713,7 +26763,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: nys
-Description: Nyunga
+Description: Nyungar
Added: 2009-07-29
%%
Type: language
@@ -28707,6 +28757,11 @@ Description: Pannei
Added: 2009-07-29
%%
Type: language
+Subtag: pnd
+Description: Mpinda
+Added: 2019-04-16
+%%
+Type: language
Subtag: pne
Description: Western Penan
Added: 2009-07-29
@@ -28794,6 +28849,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: pnw
+Description: Banyjima
Description: Panytyima
Added: 2009-07-29
%%
@@ -29251,7 +29307,8 @@ Added: 2009-07-29
%%
Type: language
Subtag: pti
-Description: Pintiini
+Description: Pindiini
+Description: Wangkatha
Added: 2009-07-29
%%
Type: language
@@ -30133,6 +30190,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: ril
+Description: Riang Lang
Description: Riang (Myanmar)
Added: 2009-07-29
%%
@@ -30153,7 +30211,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: rit
-Description: Ritarungo
+Description: Ritharrngu
Added: 2009-07-29
%%
Type: language
@@ -30219,7 +30277,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: rmb
-Description: Rembarunga
+Description: Rembarrnga
Added: 2009-07-29
%%
Type: language
@@ -30641,6 +30699,7 @@ Added: 2013-09-10
Type: language
Subtag: rxw
Description: Karuwali
+Description: Garuwali
Added: 2013-09-10
%%
Type: language
@@ -32206,7 +32265,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: snz
-Description: Sinsauru
+Description: Kou
Added: 2009-07-29
%%
Type: language
@@ -32883,6 +32942,7 @@ Type: language
Subtag: suj
Description: Shubi
Added: 2009-07-29
+Comments: see also xsj
%%
Type: language
Subtag: suk
@@ -33312,6 +33372,11 @@ Description: Sawai
Added: 2009-07-29
%%
Type: language
+Subtag: szy
+Description: Sakizaya
+Added: 2019-04-16
+%%
+Type: language
Subtag: taa
Description: Lower Tanana
Added: 2009-07-29
@@ -33465,6 +33530,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: tbh
+Description: Dharawal
Description: Thurawal
Added: 2009-07-29
%%
@@ -33644,6 +33710,7 @@ Added: 2009-07-29
Type: language
Subtag: tcs
Description: Torres Strait Creole
+Description: Yumplatok
Added: 2009-07-29
%%
Type: language
@@ -34067,6 +34134,7 @@ Preferred-Value: tpo
%%
Type: language
Subtag: thd
+Description: Kuuk Thaayorre
Description: Thayore
Added: 2009-07-29
%%
@@ -34310,6 +34378,11 @@ Description: Northern Tujia
Added: 2009-07-29
%%
Type: language
+Subtag: tjj
+Description: Tjungundji
+Added: 2019-04-16
+%%
+Type: language
Subtag: tjl
Description: Tai Laing
Added: 2012-08-12
@@ -34330,6 +34403,11 @@ Description: Temacine Tamazight
Added: 2009-07-29
%%
Type: language
+Subtag: tjp
+Description: Tjupany
+Added: 2019-04-16
+%%
+Type: language
Subtag: tjs
Description: Southern Tujia
Added: 2009-07-29
@@ -35679,6 +35757,11 @@ Description: Sedoa
Added: 2009-07-29
%%
Type: language
+Subtag: tvx
+Description: Taivoan
+Added: 2019-04-16
+%%
+Type: language
Subtag: tvy
Description: Timor Pidgin
Added: 2009-07-29
@@ -36230,7 +36313,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: ulk
-Description: Meriam
+Description: Meriam Mir
Added: 2009-07-29
%%
Type: language
@@ -36280,6 +36363,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: umg
+Description: Morrobalama
Description: Umbuygamu
Added: 2009-07-29
%%
@@ -36550,6 +36634,11 @@ Description: Uspanteco
Added: 2009-07-29
%%
Type: language
+Subtag: uss
+Description: us-Saare
+Added: 2019-04-16
+%%
+Type: language
Subtag: usu
Description: Uya
Added: 2009-07-29
@@ -36565,6 +36654,11 @@ Description: Ute-Southern Paiute
Added: 2009-07-29
%%
Type: language
+Subtag: uth
+Description: ut-Hun
+Added: 2019-04-16
+%%
+Type: language
Subtag: utp
Description: Amba (Solomon Islands)
Added: 2009-07-29
@@ -37178,7 +37272,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: waq
-Description: Wageman
+Description: Wagiman
Added: 2009-07-29
%%
Type: language
@@ -37301,7 +37395,7 @@ Added: 2017-02-23
%%
Type: language
Subtag: wbt
-Description: Wanman
+Description: Warnman
Added: 2009-07-29
%%
Type: language
@@ -37448,6 +37542,7 @@ Added: 2010-03-11
%%
Type: language
Subtag: wgg
+Description: Wangkangurru
Description: Wangganguru
Added: 2009-07-29
%%
@@ -37521,7 +37616,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: wig
-Description: Wik-Ngathana
+Description: Wik Ngathan
Added: 2009-07-29
%%
Type: language
@@ -37625,6 +37720,11 @@ Description: Kalanadi
Added: 2009-07-29
%%
Type: language
+Subtag: wkr
+Description: Keerray-Woorroong
+Added: 2019-04-16
+%%
+Type: language
Subtag: wku
Description: Kunduvadi
Added: 2009-07-29
@@ -37857,10 +37957,12 @@ Added: 2013-09-10
Type: language
Subtag: wny
Description: Wanyi
+Description: Waanyi
Added: 2012-08-12
%%
Type: language
Subtag: woa
+Description: Kuwema
Description: Tyaraity
Added: 2009-07-29
%%
@@ -37951,6 +38053,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: wrb
+Description: Waluwarra
Description: Warluwara
Added: 2009-07-29
%%
@@ -37962,11 +38065,12 @@ Added: 2009-07-29
Type: language
Subtag: wrg
Description: Warungu
+Description: Gudjal
Added: 2009-07-29
%%
Type: language
Subtag: wrh
-Description: Wiradhuri
+Description: Wiradjuri
Added: 2009-07-29
%%
Type: language
@@ -38439,6 +38543,7 @@ Deprecated: 2016-05-30
%%
Type: language
Subtag: xby
+Description: Batjala
Description: Batyala
Added: 2013-09-10
%%
@@ -38998,7 +39103,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: xmh
-Description: Kuku-Muminh
+Description: Kugu-Muminh
Added: 2009-07-29
%%
Type: language
@@ -39423,8 +39528,7 @@ Type: language
Subtag: xsj
Description: Subi
Added: 2009-07-29
-Deprecated: 2015-02-12
-Preferred-Value: suj
+Comments: see also suj
%%
Type: language
Subtag: xsl
@@ -40258,6 +40362,7 @@ Added: 2009-07-29
%%
Type: language
Subtag: yin
+Description: Riang Lai
Description: Yinchia
Added: 2009-07-29
%%
@@ -41562,12 +41667,13 @@ Added: 2009-07-29
%%
Type: language
Subtag: zml
-Description: Madngele
+Description: Matngala
Added: 2009-07-29
%%
Type: language
Subtag: zmm
Description: Marimanindji
+Description: Marramaninyshi
Added: 2009-07-29
%%
Type: language
@@ -43008,6 +43114,7 @@ Subtag: lsg
Description: Lyons Sign Language
Added: 2009-07-29
Deprecated: 2018-03-08
+Preferred-Value: lsg
Prefix: sgn
%%
Type: extlang
@@ -43018,6 +43125,13 @@ Preferred-Value: lsl
Prefix: sgn
%%
Type: extlang
+Subtag: lsn
+Description: Tibetan Sign Language
+Added: 2019-04-16
+Preferred-Value: lsn
+Prefix: sgn
+%%
+Type: extlang
Subtag: lso
Description: Laos Sign Language
Added: 2009-07-29
@@ -43040,6 +43154,13 @@ Preferred-Value: lst
Prefix: sgn
%%
Type: extlang
+Subtag: lsv
+Description: Sivia Sign Language
+Added: 2019-04-16
+Preferred-Value: lsv
+Prefix: sgn
+%%
+Type: extlang
Subtag: lsy
Description: Mauritian Sign Language
Added: 2010-03-11
@@ -43406,6 +43527,7 @@ Subtag: rsi
Description: Rennellese Sign Language
Added: 2009-07-29
Deprecated: 2017-02-23
+Preferred-Value: rsi
Prefix: sgn
%%
Type: extlang
@@ -43760,6 +43882,7 @@ Subtag: yds
Description: Yiddish Sign Language
Added: 2009-07-29
Deprecated: 2015-02-12
+Preferred-Value: yds
Prefix: sgn
%%
Type: extlang
@@ -43963,6 +44086,11 @@ Description: Cherokee
Added: 2005-10-16
%%
Type: script
+Subtag: Chrs
+Description: Chorasmian
+Added: 2019-09-11
+%%
+Type: script
Subtag: Cirt
Description: Cirth
Added: 2005-10-16
@@ -43999,6 +44127,11 @@ Description: Nagari
Added: 2005-10-16
%%
Type: script
+Subtag: Diak
+Description: Dives Akuru
+Added: 2019-09-11
+%%
+Type: script
Subtag: Dogr
Description: Dogra
Added: 2017-01-13
@@ -44836,6 +44969,11 @@ Description: Sumero-Akkadian cuneiform
Added: 2005-10-16
%%
Type: script
+Subtag: Yezi
+Description: Yezidi
+Added: 2019-09-11
+%%
+Type: script
Subtag: Yiii
Description: Yi
Added: 2005-10-16
@@ -45680,7 +45818,7 @@ Added: 2005-10-16
%%
Type: region
Subtag: MK
-Description: The Former Yugoslav Republic of Macedonia
+Description: North Macedonia
Added: 2005-10-16
%%
Type: region
@@ -46537,16 +46675,16 @@ Subtag: arevela
Description: Eastern Armenian
Added: 2006-09-18
Deprecated: 2018-03-24
-Preferred-Value: hy
Prefix: hy
+Comments: Preferred tag is hy
%%
Type: variant
Subtag: arevmda
Description: Western Armenian
Added: 2006-09-18
Deprecated: 2018-03-24
-Preferred-Value: hyw
Prefix: hy
+Comments: Preferred tag is hyw
%%
Type: variant
Subtag: asante
@@ -46642,6 +46780,12 @@ Prefix: en
Comments: Jargon embedded in American English
%%
Type: variant
+Subtag: bornholm
+Description: Bornholmsk
+Added: 2019-03-27
+Prefix: da
+%%
+Type: variant
Subtag: cisaup
Description: Cisalpine
Added: 2018-04-22
diff --git a/macros/texinfo/texinfo/tp/t/09indices.t b/macros/texinfo/texinfo/tp/t/09indices.t
index 4340996ae8..f6832759ea 100644
--- a/macros/texinfo/texinfo/tp/t/09indices.t
+++ b/macros/texinfo/texinfo/tp/t/09indices.t
@@ -515,7 +515,37 @@ in a reuglar para @sortas{foo}. @code{inside another @sortas{command}}.
@url{and cmd @sortas{inside}}.
@printindex SK
-']
+'],
+['subentries',
+'@node Top
+@top
+
+@cindex aa
+@cindex bb @subentry cc
+@cindex ddd @subentry eee @subentry fff
+@cindex ggg @subentry hhh jjj @subentry kkk @subentry lll
+
+@printindex cp
+', {'test_formats' => ['docbook']}
+],
+['seeentry',
+'@node Top
+@top
+
+@cindex aaa @seeentry{bbb}
+@cindex @seealso{ccc} ddd
+', {'test_formats' => ['docbook']}
+],
+['subentry_and_sortas',
+'@node Top
+@top
+
+@cindex aaa @sortas{A} @subentry @sortas{B} bbb
+
+@printindex cp
+', {'test_formats' => ['plaintext', 'docbook', 'html']}
+],
+
);
sub encoding_index_text($)
diff --git a/macros/texinfo/texinfo/tp/t/18itemize.t b/macros/texinfo/texinfo/tp/t/18itemize.t
index b913545868..268606be37 100644
--- a/macros/texinfo/texinfo/tp/t/18itemize.t
+++ b/macros/texinfo/texinfo/tp/t/18itemize.t
@@ -492,6 +492,22 @@ Title
@item enum
@end enumerate
'],
+['table_in_itemize',
+'@itemize @bullet
+@item item one
+@item
+@table @asis
+@item table one
+aaaaa
+
+New para.
+@item table two
+Five
+
+New para.
+@end table
+@item item three
+@end itemize']
);
my @test_invalid = (
diff --git a/macros/texinfo/texinfo/tp/t/30sectioning.t b/macros/texinfo/texinfo/tp/t/30sectioning.t
index fddc8110f3..93b81278e8 100644
--- a/macros/texinfo/texinfo/tp/t/30sectioning.t
+++ b/macros/texinfo/texinfo/tp/t/30sectioning.t
@@ -500,7 +500,7 @@ my $character_and_spaces_in_refs_text = '@node Top
@ref{:,,,manual}
@ref{ top ,,, manual}
@ref{(texinfo)Cross References}
-@ref{node,,, ../manual/doc.texi}
+@ref{node,,, ../manual/doc}
@subheading Testing local nodes
@@ -1128,7 +1128,7 @@ $unnumbered_top_without_node_text,
@end menu
@node first
-',{'TOP_NODE_UP' => ''}
+',{},{'TOP_NODE_UP' => ''}
],
['node_up_direction_for_top_with_manual',
'@node Top,,,(dir)top
@@ -1142,7 +1142,7 @@ $unnumbered_top_without_node_text,
@end menu
@node first
-',{'TOP_NODE_UP' => 'node@@ node', 'test_split' => 'node'}
+',{'test_split' => 'node'}, {'TOP_NODE_UP' => 'node@@ node'}
],
['top_node_up_url',
'@node Top
@@ -1153,8 +1153,9 @@ $unnumbered_top_without_node_text,
@end menu
@node first
-',{'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
- 'test_split' => 'node'}, {'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
+',{'test_split' => 'node'},
+ {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
+ 'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
],
['non_automatic_top_node_up_url',
'@node Top, first, (dir), (dir)
@@ -1176,8 +1177,8 @@ $unnumbered_top_without_node_text,
@end menu
@node first, , Top, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
-',{'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
- 'test_split' => 'node'}
+',{'test_split' => 'node'},
+ {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals'}
],
['non_automatic_top_node_up_and_url',
'@node Top, first, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
@@ -1188,9 +1189,9 @@ $unnumbered_top_without_node_text,
@end menu
@node first, , Top, @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
-',{'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
- 'test_split' => 'node'},
- {'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
+',{'test_split' => 'node'},
+ {'TOP_NODE_UP' => '@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals',
+ 'TOP_NODE_UP_URL' => 'http://www.gnu.org/manual/'}
],
['protected_node_parentheses',
'
diff --git a/macros/texinfo/texinfo/tp/t/92formatting.t b/macros/texinfo/texinfo/tp/t/92formatting.t
index 5db2b2d784..18f5157f2f 100644
--- a/macros/texinfo/texinfo/tp/t/92formatting.t
+++ b/macros/texinfo/texinfo/tp/t/92formatting.t
@@ -74,13 +74,6 @@ my @test_cases = (
'test_formats' => ['file_html'],
'values' => {}}
],
-['unknown_nodes_renamed',
- undef, {'test_file' => 'unknown_nodes_renamed.texi',
- 'test_formats' => ['file_html']
- },
- {'RENAMED_NODES_FILE' => 'unknown_nodes_renamed-noderename.cnf',
- }
-],
['one_line_no_content',
undef, {'test_file' => 'one_line_no_content.texi',
},
diff --git a/macros/texinfo/texinfo/tp/t/converters_tests.t b/macros/texinfo/texinfo/tp/t/converters_tests.t
index c78ecee334..366d6f3e14 100644
--- a/macros/texinfo/texinfo/tp/t/converters_tests.t
+++ b/macros/texinfo/texinfo/tp/t/converters_tests.t
@@ -300,36 +300,59 @@ my $at_commands_in_refs_text = '@node Top
@ref{@- @{ @}}
@ref{@ @ @! @* @. @: .@: @? @@}
+
@ref{@atchar{} @lbracechar{} @rbracechar{} @backslashchar{} @hashchar{}}
+
@ref{@LaTeX{} @TeX{} @bullet{} @comma{} @copyright{} @dots{} @enddots{}}
+
@ref{@equiv{} @error{} @euro{} @exclamdown{} @expansion{} @minus{}}
@ref{@geq{} @leq{} @arrow{}}
@ref{@ordf{} @ordm{} @point{} @pounds{} @print{} @questiondown{} @registeredsymbol{}}
+
@ref{@result{} @textdegree{} a@tie{}b @today{} @aa{}}
+
@ref{@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{} @dh{} @TH{} @th{}}
+
@ref{@"{a} @~{e} @^{@dotless{i}} @^{a} @`{a} @\'e @,{c} @={e} @ringaccent{e} @H{e} @ogonek{e}}
+
@ref{@dotaccent{e} @u{e} @ubaraccent{e} @udotaccent{e} @v{e} @dotless{j} @tieaccent{ee}}
+
@ref{@dotless{i} @`{@=E} @,{@\'C}}
+
@ref{@quotedblleft{} @quotedblright{} @quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{}}
+
@ref{@guillemetleft{} @guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{} @guilsinglright{}}
+
@ref{`` \'\' --- -- ` \'}
+
@ref{@acronym{AAA, fff} @acronym{AAA} @acronym{BBB}}
+
@ifnottex
@ref{@abbr{CCC, rrr} @abbr{CCC} @abbr{DDD}}
@end ifnottex
+
@ref{@email{someone@@somewher, the someone} @email{no_explain@@there}}
+
@ifnottex
@ref{@image{f--ile1} @image{f--ile,aze,az,alt,e--xt}}
+
@ref{@verb{. @ {} . .}}
@end ifnottex
+
@ref{@cite{cite @asis{asis}} @w{in @@w @b{b}} @r{in r} @sc{sc} @strong{str} @t{t} @var{var} @dfn{dfn} @i{i}}
+
@ref{@env{env} @code{code} @option{option} @samp{samp} @command{command} @file{file} @kbd{C-x @key{ESC}}}
+
@ref{8.27@dmn{in}}
+
@ref{@sansserif{sansserif} @slanted{slanted}}
+
@ref{@indicateurl{indicateurl}}
+
@ref{@sub{g}H 3@sup{rd}}
+
@ref{@url{http://somewhere_aaa} @url{url, text} @uref{/man.cgi/1/ls,,ls}}
@bye
@@ -370,7 +393,8 @@ see @ref{a @strong{strong} ref with @sc{sc}@comma{} a i trema @"i@comma{} a dotl
'],
['at_commands_in_refs',
$at_commands_in_refs_text,
-{}, {'TEST' => 1}], # TEST => 1 triggers @today constant expansion for diffs
+ {},
+ {'TEST' => 1}], # TEST => 1 triggers @today constant expansion for diffs
['refs_formatting',
'@node chapter
@chapter chapter
@@ -974,9 +998,8 @@ undef, {'test_file' => 'sample_utf8.texi'}
'.
$at_commands_in_refs_text,
-{'todo' =>
- {'file_info' => 'different results from XS and pure Perl modules',
- }}, {'TEST' => 1}], # TEST => 1 triggers @today constant expansion for diffs
+ {},
+ {'TEST' => 1}], # TEST => 1 triggers @today constant expansion for diffs
['at_commands_in_refs_latin1',
'@setfilename at_commands_in_refs_latin1.info
@documentencoding ISO-8859-15
diff --git a/macros/texinfo/texinfo/tp/t/init/t2h_singular.init b/macros/texinfo/texinfo/tp/t/init/t2h_singular.init
index 625ea4f7e5..a0a5a04243 100644
--- a/macros/texinfo/texinfo/tp/t/init/t2h_singular.init
+++ b/macros/texinfo/texinfo/tp/t/init/t2h_singular.init
@@ -6,6 +6,8 @@
use strict;
+use vars qw($node_file_name);
+
my $T2H_BLUE_BUTTONS = 0;
# we only redefine things which ar of relevance to singular
@@ -291,4 +293,31 @@ sub t2h_sing_menu($)
return '';
}
+# We want to use EXTENSION for non node files only
+sub t2h_node_file_name($$$)
+{
+ my $self = shift;
+ my $element = shift;
+ my $filename = shift;
+
+ my $external_file_extension = '.html';
+
+ my $orig_filename = $filename;
+
+ my $extension = '';
+ $extension = '.'.$self->get_conf('EXTENSION')
+ if (defined($self->get_conf('EXTENSION'))
+ and $self->get_conf('EXTENSION') ne '');
+ if ($extension eq '') {
+ $filename .= $external_file_extension;
+ } else {
+ my $quoted_extension = quotemeta($extension);
+ $filename =~ s/${quoted_extension}$/${external_file_extension}/;
+ }
+
+ return $filename;
+}
+
+$node_file_name = \&t2h_node_file_name;
+
1; # This must be the last line
diff --git a/macros/texinfo/texinfo/tp/t/input_files/test_refs.texi b/macros/texinfo/texinfo/tp/t/input_files/test_refs.texi
index 06010fb0cc..661e96256f 100644
--- a/macros/texinfo/texinfo/tp/t/input_files/test_refs.texi
+++ b/macros/texinfo/texinfo/tp/t/input_files/test_refs.texi
@@ -36,7 +36,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
@subheading Testing manual name
-@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc.texi}@*
+@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc}@*
@example
mono : doc.html#node
split: ../doc/node.html#node
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/accent.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/accent.pl
index e6f9d5b98a..5485ce9f18 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/accent.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/accent.pl
@@ -3040,20 +3040,8 @@ $result_nodes{'accent'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'accent'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'accent'};
$result_menus{'accent'} = {
'cmdname' => 'node',
@@ -3070,79 +3058,79 @@ $result_errors{'accent'} = [];
$result_converted{'plaintext'}->{'accent'} = 'top
***
-should be e\': e` e`
+should be e\': è è
- should be e\': e\' e\'
+ should be e\': é é
- should be e^: e^ e^
+ should be e^: ê ê
- should be u": u" u"
+ should be u": ü ü
- should be i\': i` i`
+ should be i\': ì ì
- should be i\': i\' i\'
+ should be i\': í í
- should be i^: i^ i^
+ should be i^: î î
- should be u": u" u"
+ should be u": ü ü
- should be c,: c, c,
+ should be c,: ç ç
- should be n~: n~ n~
+ should be n~: ñ ñ
- should be e=: e= e=
+ should be e=: Ä“ Ä“
- should be e\'\': e\'\' e\'\'
+ should be e\'\': e̋ e̋
- should be e.: e. e.
+ should be e.: Ä— Ä—
- should be e*: e* e*
+ should be e*: eÌŠ eÌŠ
- should be ee[: ee[
+ should be ee[: ee͡
- should be e(: e( e(
+ should be e(: Ä• Ä•
- should be e_: e_ e_
+ should be e_: e̲ e̲
- should be .e: .e .e
+ should be .e: ẹ ẹ
- should be e<: e< e<
+ should be e<: Ä› Ä›
- should be a; : a; a;
+ should be a; : Ä… Ä…
- should be e; : e; e;
+ should be e; : Ä™ Ä™
- upside down: ? !
+ upside down: ¿ ¡
- A-with-circle: aa,AA
+ A-with-circle: å,Å
- AE, OE ligatures: ae AE oe OE
+ AE, OE ligatures: æ Æ œ Œ
- dotless i, j: i j
+ dotless i, j: ı j
- Polish suppressed-L: /l /L
+ Polish suppressed-L: Å‚ Å
- O-with-slash: /o /O
+ O-with-slash: ø Ø
- es-zet or sharp S: ss
+ es-zet or sharp S: ß
- pounds sterling: #
+ pounds sterling: £
- should be dotless i\': i`
+ should be dotless i\': ì
- should be dotless i\': i\'
+ should be dotless i\': í
- should be dotless i^: i^
+ should be dotless i^: î
- should be dotless i": i"
+ should be dotless i": ï
- should be dotless j\': j`
+ should be dotless j\': j̀
- should be dotless j\': j\'
+ should be dotless j\': jÌ
- should be dotless j^: j^
+ should be dotless j^: ĵ
- should be dotless j": j"
+ should be dotless j": j̈
';
@@ -3225,7 +3213,7 @@ $result_converted{'html_text'}->{'accent'} = '<span id="Top"></span><span id="to
';
-$result_converted{'xml'}->{'accent'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'accent'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<para>should be e&textlsquo;: <accent type="grave">e</accent> <accent type="grave" bracketed="off">e</accent>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/accent_with_text.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/accent_with_text.pl
index abe4251490..80d113d5d2 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/accent_with_text.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/accent_with_text.pl
@@ -222,7 +222,7 @@ $result_errors{'accent_with_text'} = [
-$result_converted{'plaintext'}->{'accent_with_text'} = '-a( -b i^ j^ -a^
+$result_converted{'plaintext'}->{'accent_with_text'} = '-ă -b î ĵ -â
';
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl
index 6c22e3fc4a..e3649cd57a 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl
@@ -3085,20 +3085,8 @@ $result_nodes{'accentenc'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'accentenc'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'accentenc'};
$result_menus{'accentenc'} = {
'cmdname' => 'node',
@@ -3273,7 +3261,7 @@ $result_converted{'html_text'}->{'accentenc'} = '
$result_converted{'xml'}->{'accentenc'} = '<documentencoding encoding="ISO-8859-1" spaces=" ">ISO-8859-1</documentencoding>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<para>should be e&textlsquo;: <accent type="grave">e</accent> <accent type="grave" bracketed="off">e</accent>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_enable_encoding.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_enable_encoding.pl
index 27492941bc..85d59a3db2 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_enable_encoding.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_enable_encoding.pl
@@ -3085,20 +3085,8 @@ $result_nodes{'accentenc_enable_encoding'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'accentenc_enable_encoding'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'accentenc_enable_encoding'};
$result_menus{'accentenc_enable_encoding'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_no_entity.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_no_entity.pl
index 51f1a15ea4..e527c1d468 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_no_entity.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/accentenc_no_entity.pl
@@ -3085,20 +3085,8 @@ $result_nodes{'accentenc_no_entity'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'accentenc_no_entity'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'accentenc_no_entity'};
$result_menus{'accentenc_no_entity'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_raw.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_raw.pl
index 141a3e91fe..ac7c2ea8ab 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -776,6 +776,7 @@ $result_trees{'at_commands_in_raw'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -999,26 +1000,16 @@ $result_sectioning{'at_commands_in_raw'} = {};
$result_nodes{'at_commands_in_raw'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'at_commands_in_raw'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'at_commands_in_raw'};
$result_menus{'at_commands_in_raw'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -1250,16 +1241,16 @@ $result_converted{'html_text'}->{'at_commands_in_raw'} = '<span id="Top"></span>
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>second footnote</p>
</div>
<hr>
';
-$result_converted{'xml'}->{'at_commands_in_raw'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'at_commands_in_raw'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<macro name="othermacro" line=" othermacro{}">Other macro
</macro>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl
index bb9039aa87..e79d09d4c6 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl
@@ -3014,6 +3014,9 @@ $result_trees{'at_commands_in_refs'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 23,
@@ -3080,7 +3083,9 @@ $result_trees{'at_commands_in_refs'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
}
@@ -9275,6 +9280,9 @@ $result_trees{'at_commands_in_refs'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 90,
@@ -9341,7 +9349,9 @@ $result_trees{'at_commands_in_refs'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
}
@@ -9393,6 +9403,9 @@ $result_trees{'at_commands_in_refs'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 92,
@@ -9459,7 +9472,9 @@ $result_trees{'at_commands_in_refs'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
}
@@ -11530,7 +11545,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11547,7 +11574,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 124,
+ 'line_nr' => 125,
'macro' => ''
},
'parent' => {}
@@ -11651,7 +11678,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11668,7 +11707,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 125,
+ 'line_nr' => 127,
'macro' => ''
},
'parent' => {}
@@ -11810,7 +11849,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11827,7 +11878,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 126,
+ 'line_nr' => 129,
'macro' => ''
},
'parent' => {}
@@ -11979,7 +12030,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 128,
+ 'line_nr' => 131,
'macro' => ''
},
'parent' => {}
@@ -12074,7 +12125,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 130,
+ 'line_nr' => 133,
'macro' => ''
},
'parent' => {}
@@ -12216,7 +12267,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12233,7 +12296,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 131,
+ 'line_nr' => 135,
'macro' => ''
},
'parent' => {}
@@ -12337,7 +12400,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12354,7 +12429,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 132,
+ 'line_nr' => 137,
'macro' => ''
},
'parent' => {}
@@ -12629,7 +12704,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12651,7 +12738,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 133,
+ 'line_nr' => 139,
'macro' => ''
},
'parent' => {}
@@ -12933,7 +13020,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12955,7 +13054,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 134,
+ 'line_nr' => 141,
'macro' => ''
},
'parent' => {}
@@ -13127,7 +13226,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13149,7 +13260,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 135,
+ 'line_nr' => 143,
'macro' => ''
},
'parent' => {}
@@ -13253,7 +13364,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13270,7 +13393,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 136,
+ 'line_nr' => 145,
'macro' => ''
},
'parent' => {}
@@ -13393,7 +13516,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13410,7 +13545,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 137,
+ 'line_nr' => 147,
'macro' => ''
},
'parent' => {}
@@ -13533,7 +13668,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13560,7 +13707,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 138,
+ 'line_nr' => 149,
'macro' => ''
},
'parent' => {}
@@ -13569,7 +13716,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13604,7 +13763,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 139,
+ 'line_nr' => 151,
'macro' => ''
},
'parent' => {}
@@ -13686,7 +13845,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13721,7 +13892,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 141,
+ 'line_nr' => 154,
'macro' => ''
},
'parent' => {}
@@ -13803,7 +13974,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13846,7 +14029,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 143,
+ 'line_nr' => 157,
'macro' => ''
},
'parent' => {}
@@ -13906,7 +14089,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13926,9 +14121,12 @@ $result_trees{'at_commands_in_refs'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 145,
+ 'line_nr' => 160,
'macro' => ''
},
'parent' => {}
@@ -13992,7 +14190,9 @@ $result_trees{'at_commands_in_refs'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
}
@@ -14021,7 +14221,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14047,7 +14259,7 @@ $result_trees{'at_commands_in_refs'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 146,
+ 'line_nr' => 162,
'macro' => ''
},
'parent' => {}
@@ -14075,7 +14287,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14105,7 +14329,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 148,
+ 'line_nr' => 165,
'macro' => ''
},
'parent' => {}
@@ -14361,7 +14585,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14383,7 +14619,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 149,
+ 'line_nr' => 167,
'macro' => ''
},
'parent' => {}
@@ -14573,7 +14809,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14599,7 +14847,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 150,
+ 'line_nr' => 169,
'macro' => ''
},
'parent' => {}
@@ -14628,7 +14876,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14650,7 +14910,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 151,
+ 'line_nr' => 171,
'macro' => ''
},
'parent' => {}
@@ -14702,7 +14962,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14724,7 +14996,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 152,
+ 'line_nr' => 173,
'macro' => ''
},
'parent' => {}
@@ -14752,7 +15024,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14774,7 +15058,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 153,
+ 'line_nr' => 175,
'macro' => ''
},
'parent' => {}
@@ -14826,7 +15110,19 @@ $result_trees{'at_commands_in_refs'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14848,7 +15144,7 @@ $result_trees{'at_commands_in_refs'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 154,
+ 'line_nr' => 177,
'macro' => ''
},
'parent' => {}
@@ -17606,120 +17902,6 @@ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[16];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -17732,13 +17914,25 @@ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[7];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[5];
@@ -17771,7 +17965,7 @@ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[9];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -17788,687 +17982,835 @@ $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[21] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[22] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[23] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[24] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[25] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[26] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[21];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[23];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[25];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[27];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[29];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[31];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[33];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[35];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[37];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[39];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[41];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[43];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[45];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[31]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[47];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[33]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[49];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[35]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[51];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[37]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[53];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[39]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[55];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'contents'}[41]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[21] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[22] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[23] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[24] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[25] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[26] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[25];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[27];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[29];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[31];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[33];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[31]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[32]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[35];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[33]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[34]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[37];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[35]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[36]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[39];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[37]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[38]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[41];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[39]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[40]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[43];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[41]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[42]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[45];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[43]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[44]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[47];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[45]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[46]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[49];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[47]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[48]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[51];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[49]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[50]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[53];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[51]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[52]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs'}{'contents'}[55];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[53]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
+$result_trees{'at_commands_in_refs'}{'contents'}[56]{'contents'}[54]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[56];
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'line_nr'} = $result_trees{'at_commands_in_refs'}{'contents'}[56]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs'}{'contents'}[56]{'parent'} = $result_trees{'at_commands_in_refs'};
$result_trees{'at_commands_in_refs'}{'contents'}[57]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs'}{'contents'}[57];
@@ -18591,32 +18933,55 @@ $result_texis{'at_commands_in_refs'} = '@node Top
@ref{@- @{ @}}
@ref{@ @ @! @* @. @: .@: @? @@}
+
@ref{@atchar{} @lbracechar{} @rbracechar{} @backslashchar{} @hashchar{}}
+
@ref{@LaTeX{} @TeX{} @bullet{} @comma{} @copyright{} @dots{} @enddots{}}
+
@ref{@equiv{} @error{} @euro{} @exclamdown{} @expansion{} @minus{}}
@ref{@geq{} @leq{} @arrow{}}
@ref{@ordf{} @ordm{} @point{} @pounds{} @print{} @questiondown{} @registeredsymbol{}}
+
@ref{@result{} @textdegree{} a@tie{}b @today{} @aa{}}
+
@ref{@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{} @dh{} @TH{} @th{}}
+
@ref{@"{a} @~{e} @^{@dotless{i}} @^{a} @`{a} @\'e @,{c} @={e} @ringaccent{e} @H{e} @ogonek{e}}
+
@ref{@dotaccent{e} @u{e} @ubaraccent{e} @udotaccent{e} @v{e} @dotless{j} @tieaccent{ee}}
+
@ref{@dotless{i} @`{@=E} @,{@\'C}}
+
@ref{@quotedblleft{} @quotedblright{} @quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{}}
+
@ref{@guillemetleft{} @guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{} @guilsinglright{}}
+
@ref{`` \'\' --- -- ` \'}
+
@ref{@acronym{AAA, fff} @acronym{AAA} @acronym{BBB}}
+
@ref{@abbr{CCC, rrr} @abbr{CCC} @abbr{DDD}}
+
@ref{@email{someone@@somewher, the someone} @email{no_explain@@there}}
+
@ref{@image{f--ile1} @image{f--ile,aze,az,alt,e--xt}}
+
@ref{@verb{. @ {} . .}}
+
@ref{@cite{cite @asis{asis}} @w{in @@w @b{b}} @r{in r} @sc{sc} @strong{str} @t{t} @var{var} @dfn{dfn} @i{i}}
+
@ref{@env{env} @code{code} @option{option} @samp{samp} @command{command} @file{file} @kbd{C-x @key{ESC}}}
+
@ref{8.27@dmn{in}}
+
@ref{@sansserif{sansserif} @slanted{slanted}}
+
@ref{@indicateurl{indicateurl}}
+
@ref{@sub{g}H 3@sup{rd}}
+
@ref{@url{http://somewhere_aaa} @url{url, text} @uref{/man.cgi/1/ls,,ls}}
@bye
@@ -18741,32 +19106,55 @@ $result_texts{'at_commands_in_refs'} = 'Top
!
. . ? @
+
@ { } \\ #
+
LaTeX TeX * , (C) ... ...
+
== error--> Euro ! ==> -
>= <= ->
a o -!- # -| ? (R)
+
=> o a b a sunny day aa
+
AA ae oe AE OE /o /O ss /l /L D d TH th
+
a" e~ i^ a^ a` e\' c, e= e* e\'\' e;
+
e. e( e_ .e e< j ee[
+
i E=` C\',
+
`` \'\' ` \' ,, ,
+
<< >> << >> < >
+
" " -- - ` \'
+
AAA (fff) AAA BBB
+
CCC (rrr) CCC DDD
+
the someone no_explain@there
+
f--ile1 f--ile
+
@ {} .
+
cite asis in @w b in r SC str t var dfn i
+
env code option samp command file C-x ESC
+
8.27in
+
sansserif slanted
+
indicateurl
+
gH 3rd
+
http://somewhere_aaa url (text) ls
';
@@ -19901,18 +20289,7 @@ $result_nodes{'at_commands_in_refs'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'at_commands_in_refs'};
@@ -19969,7 +20346,6 @@ $result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_next'}{'node_up'} = $re
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_prev'} = $result_nodes{'at_commands_in_refs'};
$result_nodes{'at_commands_in_refs'}{'menu_child'}{'node_up'} = $result_nodes{'at_commands_in_refs'};
$result_nodes{'at_commands_in_refs'}{'node_next'} = $result_nodes{'at_commands_in_refs'}{'menu_child'};
-$result_nodes{'at_commands_in_refs'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'at_commands_in_refs'};
$result_menus{'at_commands_in_refs'} = {
'cmdname' => 'node',
@@ -20375,10 +20751,10 @@ $result_errors{'at_commands_in_refs'} = [
'type' => 'warning'
},
{
- 'error_line' => ':146: warning: @verb should not appear in @ref
+ 'error_line' => ':162: warning: @verb should not appear in @ref
',
'file_name' => '',
- 'line_nr' => 146,
+ 'line_nr' => 162,
'macro' => '',
'text' => '@verb should not appear in @ref',
'type' => 'warning'
@@ -20403,35 +20779,35 @@ $result_converted{'plaintext'}->{'at_commands_in_refs'} = 'Top
4 LaTeX TeX * , (C) ... ...
***************************
-5 == error-> Euro ! ==> -
-*************************
+5 == error-> € ¡ ==> -
+**********************
-6 >= <= ->
-**********
+6 ≥ ≤ ->
+********
-7 a o -!- # -| ? (R)
+7 ª º -!- £ -| ¿ (R)
********************
-8 => o a b a sunny day aa
-*************************
+8 => ° a b a sunny day å
+************************
-9 AA ae oe AE OE /o /O ss /l /L D d TH th
-*****************************************
+9 Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ
+*****************************
-10 a" e~ i^ a^ a` e\' c, e= e* e\'\' e;
-************************************
+10 ä ẽ î â à é ç ē e̊ e̋ ę
+************************
-11 e. e( e_ .e e< j ee[
-***********************
+11 ė ĕ e̲ ẹ ě j ee͡
+*****************
-12 i E=` C\',
-************
+12 ı Ḕ Ḉ
+********
-13 `` \'\' ` \' ,, ,
-*****************
+13 “ †‘ ’ „ ‚
+**************
-14 << >> << >> < >
-******************
+14 « » « » ‹ ›
+**************
15 " " -- - \' \'
***************
@@ -20476,20 +20852,57 @@ $result_converted{'plaintext'}->{'at_commands_in_refs'} = 'Top
*note { }::
*note !
-. . ? @:: *note @ { } \\ #:: *note LaTeX TeX * , (C) ... ...:: *note ==
-error-> Euro ! ==> -::
+. . ? @::
+
+ *note @ { } \\ #::
+
+ *note LaTeX TeX * , (C) ... ...::
+
+ *note == error-> € ¡ ==> -::
+
+ *note ≥ ≤ ->::
+
+ *note ª º -!- £ -| ¿ (R)::
+
+ *note => ° a b a sunny day å::
+
+ *note Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ::
+
+ *note ä ẽ î â à é ç ē e̊ e̋ ę::
+
+ *note ė ĕ e̲ ẹ ě j ee͡::
+
+ *note ı Ḕ Ḉ::
+
+ *note “ †‘ ’ „ ‚::
+
+ *note « » « » ‹ ›::
+
+ *note `` \'\' --- -- ` \'::
+
+ *note AAA (fff) AAA BBB::
+
+ *note CCC (rrr) CCC DDD::
+
+ *note the someone <someone@somewher> <no_explain@there>::
- *note >= <= ->::
+ *note [f--ile1] Image description""\\.::
- *note a o -!- # -| ? (R):: *note => o a b a sunny day aa:: *note AA
-ae oe AE OE /o /O ss /l /L D d TH th:: *note a" e~ i^ a^ a` e\' c, e= e*
-e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
-,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
-AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <someone@somewher>
-<no_explain@there>:: *note [f--ile1] Image description""\\.:: *note @ {} . :: *note cite asis in @w b
-in r SC *str* t VAR dfn i:: *note env code option samp command file C-x
-<ESC>:: *note 8.27in:: *note sansserif slanted:: *note indicateurl::
-*note _{g}H 3^{rd}:: *note <http://somewhere_aaa> text (url) ls::
+ *note @ {} . ::
+
+ *note cite asis in @w b in r SC *str* t VAR dfn i::
+
+ *note env code option samp command file C-x <ESC>::
+
+ *note 8.27in::
+
+ *note sansserif slanted::
+
+ *note indicateurl::
+
+ *note _{g}H 3^{rd}::
+
+ *note <http://somewhere_aaa> text (url) ls::
';
@@ -20513,10 +20926,10 @@ $result_converted_errors{'plaintext'}->{'at_commands_in_refs'} = [
'type' => 'warning'
},
{
- 'error_line' => ':154: warning: @ref node name should not contain `:\'
+ 'error_line' => ':177: warning: @ref node name should not contain `:\'
',
'file_name' => '',
- 'line_nr' => 154,
+ 'line_nr' => 177,
'macro' => '',
'text' => '@ref node name should not contain `:\'',
'type' => 'warning'
@@ -20562,7 +20975,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> { }</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#-_007b-_007d" accesskey="n" rel="next"> { }</a> &nbsp; </p>
</div>
<span id="Top-1"></span><h1 class="top">Top</h1>
@@ -20815,33 +21228,56 @@ Previous: <a href="#gH-3rd" accesskey="p" rel="prev"><sub>g</sub>H 3<sup>rd</sup
<p><a href="#-_007b-_007d"> { }</a>
</p>
<p><a href="#----_0021---_002e--_002e-_003f-_0040">&nbsp; &nbsp; ! <br> . . ? @</a>
-<a href="#g_t_0040-_007b-_007d-_005c-_0023">@ { } \\ #</a>
-<a href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>
-<a href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>
+</p>
+<p><a href="#g_t_0040-_007b-_007d-_005c-_0023">@ { } \\ #</a>
+</p>
+<p><a href="#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>
+</p>
+<p><a href="#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>
</p>
<p><a href="#g_t_2265-_2264-_2192">&ge; &le; &rarr;</a>
</p>
<p><a href="#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>
-<a href="#g_t_21d2-_00b0-a-b--_00e5">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>
-<a href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>
-<a href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e\'\' &#281;</a>
-<a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">&#279; &#277; e_ &#7865; &#283; j ee[</a>
-<a href="#g_t_0131-_1e14-_1e08">i &#274;` &#262;,</a>
-<a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
-<a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>
-<a href="#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">`` \'\' --- -- ` \'</a>
-<a href="#AAA-AAA-BBB"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>
-<a href="#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
-<a href="#someone_0040somewher-no_005fexplain_0040there"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>
-<a href="#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>
-<a href="#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a>
-<a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>
-<a href="#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>
-<a href="#g_t8_002e27in">8.27in</a>
-<a href="#sansserif-slanted"><span class="sansserif">sansserif</span> <i>slanted</i></a>
-<a href="#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a>
-<a href="#gH-3rd"><sub>g</sub>H 3<sup>rd</sup></a>
-<a href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>
+</p>
+<p><a href="#g_t_21d2-_00b0-a-b--_00e5">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>
+</p>
+<p><a href="#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>
+</p>
+<p><a href="#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e\'\' &#281;</a>
+</p>
+<p><a href="#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">&#279; &#277; e_ &#7865; &#283; j ee[</a>
+</p>
+<p><a href="#g_t_0131-_1e14-_1e08">i &#274;` &#262;,</a>
+</p>
+<p><a href="#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
+</p>
+<p><a href="#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>
+</p>
+<p><a href="#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">`` \'\' --- -- ` \'</a>
+</p>
+<p><a href="#AAA-AAA-BBB"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>
+</p>
+<p><a href="#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
+</p>
+<p><a href="#someone_0040somewher-no_005fexplain_0040there"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>
+</p>
+<p><a href="#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>
+</p>
+<p><a href="#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a>
+</p>
+<p><a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>
+</p>
+<p><a href="#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>
+</p>
+<p><a href="#g_t8_002e27in">8.27in</a>
+</p>
+<p><a href="#sansserif-slanted"><span class="sansserif">sansserif</span> <i>slanted</i></a>
+</p>
+<p><a href="#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a>
+</p>
+<p><a href="#gH-3rd"><sub>g</sub>H 3<sup>rd</sup></a>
+</p>
+<p><a href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>
</p>
<hr>
@@ -20880,10 +21316,10 @@ $result_converted_errors{'html'}->{'at_commands_in_refs'} = [
'type' => 'warning'
},
{
- 'error_line' => ':145: warning: @image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'
+ 'error_line' => ':160: warning: @image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'
',
'file_name' => '',
- 'line_nr' => 145,
+ 'line_nr' => 160,
'macro' => '',
'text' => '@image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'',
'type' => 'warning'
@@ -20892,7 +21328,7 @@ $result_converted_errors{'html'}->{'at_commands_in_refs'} = [
-$result_converted{'xml'}->{'at_commands_in_refs'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">&hyphenbreak; &lbrace; &rbrace;</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'at_commands_in_refs'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">&hyphenbreak; &lbrace; &rbrace;</nodenext></node>
<top spaces=" "><sectiontitle>Top</sectiontitle>
<menu endspaces=" ">
@@ -21036,33 +21472,56 @@ $result_converted{'xml'}->{'at_commands_in_refs'} = '<node name="Top" spaces=" "
<para><ref label="-_007b-_007d"><xrefnodename>&hyphenbreak; &lbrace; &rbrace;</xrefnodename></ref>
</para>
<para><ref label="----_0021---_002e--_002e-_003f-_0040"><xrefnodename><spacecmd type="spc"/> <spacecmd type="tab"/> &eosexcl; &linebreak; &eosperiod; &noeos; .&noeos; &eosquest; &arobase;</xrefnodename></ref>
-<ref label="_0040-_007b-_007d-_005c-_0023"><xrefnodename>&atchar; &lbracechar; &rbracechar; &backslashchar; &hashchar;</xrefnodename></ref>
-<ref label="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e"><xrefnodename>&latex; &tex; &bullet; &comma; &copyright; &dots; &enddots;</xrefnodename></ref>
-<ref label="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212"><xrefnodename>&equiv; &errorglyph; &euro; &iexcl; &expansion; &minus;</xrefnodename></ref>
+</para>
+<para><ref label="_0040-_007b-_007d-_005c-_0023"><xrefnodename>&atchar; &lbracechar; &rbracechar; &backslashchar; &hashchar;</xrefnodename></ref>
+</para>
+<para><ref label="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e"><xrefnodename>&latex; &tex; &bullet; &comma; &copyright; &dots; &enddots;</xrefnodename></ref>
+</para>
+<para><ref label="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212"><xrefnodename>&equiv; &errorglyph; &euro; &iexcl; &expansion; &minus;</xrefnodename></ref>
</para>
<para><ref label="_2265-_2264-_2192"><xrefnodename>&ge; &le; &rarr;</xrefnodename></ref>
</para>
<para><ref label="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae"><xrefnodename>&ordf; &ordm; &point; &pound; &printglyph; &iquest; &registered;</xrefnodename></ref>
-<ref label="_21d2-_00b0-a-b--_00e5"><xrefnodename>&result; &deg; a&nbsp;b <today/> &aring;</xrefnodename></ref>
-<ref label="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"><xrefnodename>&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &lslash; &Lslash; &ETH; &eth; &THORN; &thorn;</xrefnodename></ref>
-<ref label="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"><xrefnodename><accent type="uml">a</accent> <accent type="tilde">e</accent> <accent type="circ"><dotless>i</dotless></accent> <accent type="circ">a</accent> <accent type="grave">a</accent> <accent type="acute" bracketed="off">e</accent> <accent type="cedil">c</accent> <accent type="macr">e</accent> <accent type="ring">e</accent> <accent type="doubleacute">e</accent> <accent type="ogon">e</accent></xrefnodename></ref>
-<ref label="_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361"><xrefnodename><accent type="dotaccent">e</accent> <accent type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent type="caron">e</accent> <dotless>j</dotless> <accent type="tieaccent">ee</accent></xrefnodename></ref>
-<ref label="_0131-_1e14-_1e08"><xrefnodename><dotless>i</dotless> <accent type="grave"><accent type="macr" bracketed="off">E</accent></accent> <accent type="cedil"><accent type="acute" bracketed="off">C</accent></accent></xrefnodename></ref>
-<ref label="_201c-_201d-_2018-_2019-_201e-_201a"><xrefnodename>&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</xrefnodename></ref>
-<ref label="_00ab-_00bb-_00ab-_00bb-_2039-_203a"><xrefnodename>&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</xrefnodename></ref>
-<ref label="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"><xrefnodename>`` \'\' --- -- ` \'</xrefnodename></ref>
-<ref label="AAA-AAA-BBB"><xrefnodename><acronym><acronymword>AAA</acronymword><acronymdesc spaces=" ">fff</acronymdesc></acronym> <acronym><acronymword>AAA</acronymword></acronym> <acronym><acronymword>BBB</acronymword></acronym></xrefnodename></ref>
-<ref label="CCC-CCC-DDD"><xrefnodename><abbr><abbrword>CCC</abbrword><abbrdesc spaces=" ">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr> <abbr><abbrword>DDD</abbrword></abbr></xrefnodename></ref>
-<ref label="someone_0040somewher-no_005fexplain_0040there"><xrefnodename><email><emailaddress>someone&arobase;somewher</emailaddress><emailname spaces=" ">the someone</emailname></email> <email><emailaddress>no_explain&arobase;there</emailaddress></email></xrefnodename></ref>
-<ref label="f_002d_002dile1-f_002d_002dile"><xrefnodename><image where="inline"><imagefile>f--ile1</imagefile></image> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></xrefnodename></ref>
-<ref label="-_0040-_007b_007d-_002e-"><xrefnodename><verb delimiter="."> @ {} . </verb></xrefnodename></ref>
-<ref label="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><xrefnodename><cite>cite <asis>asis</asis></cite> <w>in &arobase;w <b>b</b></w> <r>in r</r> <sc>sc</sc> <strong>str</strong> <t>t</t> <var>var</var> <dfn>dfn</dfn> <i>i</i></xrefnodename></ref>
-<ref label="env-code-option-samp-command-file-C_002dx-ESC"><xrefnodename><env>env</env> <code>code</code> <option>option</option> <samp>samp</samp> <command>command</command> <file>file</file> <kbd>C-x <key>ESC</key></kbd></xrefnodename></ref>
-<ref label="8_002e27in"><xrefnodename>8.27<dmn>in</dmn></xrefnodename></ref>
-<ref label="sansserif-slanted"><xrefnodename><sansserif>sansserif</sansserif> <slanted>slanted</slanted></xrefnodename></ref>
-<ref label="indicateurl"><xrefnodename><indicateurl>indicateurl</indicateurl></xrefnodename></ref>
-<ref label="gH-3rd"><xrefnodename><sub>g</sub>H 3<sup>rd</sup></xrefnodename></ref>
-<ref label="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><xrefnodename><url><urefurl>http://somewhere_aaa</urefurl></url> <url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url> <uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></xrefnodename></ref>
+</para>
+<para><ref label="_21d2-_00b0-a-b--_00e5"><xrefnodename>&result; &deg; a&nbsp;b <today/> &aring;</xrefnodename></ref>
+</para>
+<para><ref label="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"><xrefnodename>&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &lslash; &Lslash; &ETH; &eth; &THORN; &thorn;</xrefnodename></ref>
+</para>
+<para><ref label="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"><xrefnodename><accent type="uml">a</accent> <accent type="tilde">e</accent> <accent type="circ"><dotless>i</dotless></accent> <accent type="circ">a</accent> <accent type="grave">a</accent> <accent type="acute" bracketed="off">e</accent> <accent type="cedil">c</accent> <accent type="macr">e</accent> <accent type="ring">e</accent> <accent type="doubleacute">e</accent> <accent type="ogon">e</accent></xrefnodename></ref>
+</para>
+<para><ref label="_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361"><xrefnodename><accent type="dotaccent">e</accent> <accent type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent type="caron">e</accent> <dotless>j</dotless> <accent type="tieaccent">ee</accent></xrefnodename></ref>
+</para>
+<para><ref label="_0131-_1e14-_1e08"><xrefnodename><dotless>i</dotless> <accent type="grave"><accent type="macr" bracketed="off">E</accent></accent> <accent type="cedil"><accent type="acute" bracketed="off">C</accent></accent></xrefnodename></ref>
+</para>
+<para><ref label="_201c-_201d-_2018-_2019-_201e-_201a"><xrefnodename>&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</xrefnodename></ref>
+</para>
+<para><ref label="_00ab-_00bb-_00ab-_00bb-_2039-_203a"><xrefnodename>&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</xrefnodename></ref>
+</para>
+<para><ref label="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"><xrefnodename>`` \'\' --- -- ` \'</xrefnodename></ref>
+</para>
+<para><ref label="AAA-AAA-BBB"><xrefnodename><acronym><acronymword>AAA</acronymword><acronymdesc spaces=" ">fff</acronymdesc></acronym> <acronym><acronymword>AAA</acronymword></acronym> <acronym><acronymword>BBB</acronymword></acronym></xrefnodename></ref>
+</para>
+<para><ref label="CCC-CCC-DDD"><xrefnodename><abbr><abbrword>CCC</abbrword><abbrdesc spaces=" ">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr> <abbr><abbrword>DDD</abbrword></abbr></xrefnodename></ref>
+</para>
+<para><ref label="someone_0040somewher-no_005fexplain_0040there"><xrefnodename><email><emailaddress>someone&arobase;somewher</emailaddress><emailname spaces=" ">the someone</emailname></email> <email><emailaddress>no_explain&arobase;there</emailaddress></email></xrefnodename></ref>
+</para>
+<para><ref label="f_002d_002dile1-f_002d_002dile"><xrefnodename><image where="inline"><imagefile>f--ile1</imagefile></image> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></xrefnodename></ref>
+</para>
+<para><ref label="-_0040-_007b_007d-_002e-"><xrefnodename><verb delimiter="."> @ {} . </verb></xrefnodename></ref>
+</para>
+<para><ref label="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><xrefnodename><cite>cite <asis>asis</asis></cite> <w>in &arobase;w <b>b</b></w> <r>in r</r> <sc>sc</sc> <strong>str</strong> <t>t</t> <var>var</var> <dfn>dfn</dfn> <i>i</i></xrefnodename></ref>
+</para>
+<para><ref label="env-code-option-samp-command-file-C_002dx-ESC"><xrefnodename><env>env</env> <code>code</code> <option>option</option> <samp>samp</samp> <command>command</command> <file>file</file> <kbd>C-x <key>ESC</key></kbd></xrefnodename></ref>
+</para>
+<para><ref label="8_002e27in"><xrefnodename>8.27<dmn>in</dmn></xrefnodename></ref>
+</para>
+<para><ref label="sansserif-slanted"><xrefnodename><sansserif>sansserif</sansserif> <slanted>slanted</slanted></xrefnodename></ref>
+</para>
+<para><ref label="indicateurl"><xrefnodename><indicateurl>indicateurl</indicateurl></xrefnodename></ref>
+</para>
+<para><ref label="gH-3rd"><xrefnodename><sub>g</sub>H 3<sup>rd</sup></xrefnodename></ref>
+</para>
+<para><ref label="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><xrefnodename><url><urefurl>http://somewhere_aaa</urefurl></url> <url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url> <uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></xrefnodename></ref>
</para>
</chapter>
<bye></bye>
@@ -21186,33 +21645,56 @@ $result_converted{'docbook'}->{'at_commands_in_refs'} = '<chapter label="" id="T
</para>
<para><link linkend="----_0021---_002e--_002e-_003f-_0040">&#160; &#160; !
. . ? @</link>
-<link linkend="_0040-_007b-_007d-_005c-_0023">&#64; &#123; &#125; &#92; &#35;</link>
-<link linkend="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">&latex; &tex; &#8226; &#44; &#169; &#8230; ...</link>
-<link linkend="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">&#8801; error&#8594; &#8364; &#161; &#8614; &#8722;</link>
+</para>
+<para><link linkend="_0040-_007b-_007d-_005c-_0023">&#64; &#123; &#125; &#92; &#35;</link>
+</para>
+<para><link linkend="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">&latex; &tex; &#8226; &#44; &#169; &#8230; ...</link>
+</para>
+<para><link linkend="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">&#8801; error&#8594; &#8364; &#161; &#8614; &#8722;</link>
</para>
<para><link linkend="_2265-_2264-_2192">&#8805; &#8804; &#8594;</link>
</para>
<para><link linkend="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">&#170; &#186; &#9733; &#163; &#8867; &#191; &#174;</link>
-<link linkend="_21d2-_00b0-a-b--_00e5">&#8658; &#176; a&#160;b a sunny day &#229;</link>
-<link linkend="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&#197; &#230; &#339; &#198; &#338; &#248; &#216; &#223; &#322; &#321; &#208; &#240; &#222; &#254;</link>
-<link linkend="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&#228; &#7869; &#238; &#226; &#224; &#233; &#231; &#275; e* e\'\' &#281;</link>
-<link linkend="_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">&#279; &#277; e_ &#7865; &#283; j ee[</link>
-<link linkend="_0131-_1e14-_1e08">i &#274;` &#262;,</link>
-<link linkend="_201c-_201d-_2018-_2019-_201e-_201a">&#8220; &#8221; &#8216; &#8217; &#8222; &#8218;</link>
-<link linkend="_00ab-_00bb-_00ab-_00bb-_2039-_203a">&#171; &#187; &#171; &#187; &#8249; &#8250;</link>
-<link linkend="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">&#8220; &#8221; &#8212; &#8211; &#8216; &#8217;</link>
-<link linkend="AAA-AAA-BBB"><acronym>AAA</acronym> (fff) <acronym>AAA</acronym> <acronym>BBB</acronym></link>
-<link linkend="CCC-CCC-DDD"><abbrev>CCC</abbrev> (rrr) <abbrev>CCC</abbrev> <abbrev>DDD</abbrev></link>
-<link linkend="someone_0040somewher-no_005fexplain_0040there"><ulink url="mailto:someone@somewher">the someone</ulink> <email>no_explain@there</email></link>
-<link linkend="f_002d_002dile1-f_002d_002dile"><inlinemediaobject><imageobject><imagedata fileref="f--ile1.jpg" format="JPG"></imagedata></imageobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>Image description&quot;&quot;\\.</literallayout></textobject></inlinemediaobject></link>
-<link linkend="-_0040-_007b_007d-_002e-"><literal> @ {} . </literal></link>
-<link linkend="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><citetitle>cite asis</citetitle> in @w <emphasis role="bold">b</emphasis><!-- /@w --> in r SC <emphasis role="bold">str</emphasis> <literal>t</literal> <replaceable>var</replaceable> <firstterm>dfn</firstterm> <emphasis>i</emphasis></link>
-<link linkend="env-code-option-samp-command-file-C_002dx-ESC"><envar>env</envar> <literal>code</literal> <option>option</option> &#8216;<literal>samp</literal>&#8217; <command>command</command> <filename>file</filename> <userinput>C-x <keycap>ESC</keycap></userinput></link>
-<link linkend="8_002e27in">8.27in</link>
-<link linkend="sansserif-slanted">sansserif slanted</link>
-<link linkend="indicateurl"><literal>indicateurl</literal></link>
-<link linkend="gH-3rd"><subscript>g</subscript>H 3<superscript>rd</superscript></link>
-<link linkend="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><ulink url="http://somewhere_aaa">http://somewhere_aaa</ulink> <ulink url="url">text</ulink> <ulink url="/man.cgi/1/ls">ls</ulink></link>
+</para>
+<para><link linkend="_21d2-_00b0-a-b--_00e5">&#8658; &#176; a&#160;b a sunny day &#229;</link>
+</para>
+<para><link linkend="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&#197; &#230; &#339; &#198; &#338; &#248; &#216; &#223; &#322; &#321; &#208; &#240; &#222; &#254;</link>
+</para>
+<para><link linkend="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&#228; &#7869; &#238; &#226; &#224; &#233; &#231; &#275; e* e\'\' &#281;</link>
+</para>
+<para><link linkend="_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">&#279; &#277; e_ &#7865; &#283; j ee[</link>
+</para>
+<para><link linkend="_0131-_1e14-_1e08">i &#274;` &#262;,</link>
+</para>
+<para><link linkend="_201c-_201d-_2018-_2019-_201e-_201a">&#8220; &#8221; &#8216; &#8217; &#8222; &#8218;</link>
+</para>
+<para><link linkend="_00ab-_00bb-_00ab-_00bb-_2039-_203a">&#171; &#187; &#171; &#187; &#8249; &#8250;</link>
+</para>
+<para><link linkend="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">&#8220; &#8221; &#8212; &#8211; &#8216; &#8217;</link>
+</para>
+<para><link linkend="AAA-AAA-BBB"><acronym>AAA</acronym> (fff) <acronym>AAA</acronym> <acronym>BBB</acronym></link>
+</para>
+<para><link linkend="CCC-CCC-DDD"><abbrev>CCC</abbrev> (rrr) <abbrev>CCC</abbrev> <abbrev>DDD</abbrev></link>
+</para>
+<para><link linkend="someone_0040somewher-no_005fexplain_0040there"><ulink url="mailto:someone@somewher">the someone</ulink> <email>no_explain@there</email></link>
+</para>
+<para><link linkend="f_002d_002dile1-f_002d_002dile"><inlinemediaobject><imageobject><imagedata fileref="f--ile1.jpg" format="JPG"></imagedata></imageobject></inlinemediaobject> <inlinemediaobject><imageobject><imagedata fileref="f--ile.png" format="PNG"></imagedata></imageobject><textobject><literallayout>Image description&quot;&quot;\\.</literallayout></textobject></inlinemediaobject></link>
+</para>
+<para><link linkend="-_0040-_007b_007d-_002e-"><literal> @ {} . </literal></link>
+</para>
+<para><link linkend="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><citetitle>cite asis</citetitle> in @w <emphasis role="bold">b</emphasis><!-- /@w --> in r SC <emphasis role="bold">str</emphasis> <literal>t</literal> <replaceable>var</replaceable> <firstterm>dfn</firstterm> <emphasis>i</emphasis></link>
+</para>
+<para><link linkend="env-code-option-samp-command-file-C_002dx-ESC"><envar>env</envar> <literal>code</literal> <option>option</option> &#8216;<literal>samp</literal>&#8217; <command>command</command> <filename>file</filename> <userinput>C-x <keycap>ESC</keycap></userinput></link>
+</para>
+<para><link linkend="8_002e27in">8.27in</link>
+</para>
+<para><link linkend="sansserif-slanted">sansserif slanted</link>
+</para>
+<para><link linkend="indicateurl"><literal>indicateurl</literal></link>
+</para>
+<para><link linkend="gH-3rd"><subscript>g</subscript>H 3<superscript>rd</superscript></link>
+</para>
+<para><link linkend="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><ulink url="http://somewhere_aaa">http://somewhere_aaa</ulink> <ulink url="url">text</ulink> <ulink url="/man.cgi/1/ls">ls</ulink></link>
</para>
</chapter>
';
@@ -21228,10 +21710,10 @@ $result_converted_errors{'docbook'}->{'at_commands_in_refs'} = [
'type' => 'warning'
},
{
- 'error_line' => ':145: warning: @image file `f--ile1\' not found, using `f--ile1.jpg\'
+ 'error_line' => ':160: warning: @image file `f--ile1\' not found, using `f--ile1.jpg\'
',
'file_name' => '',
- 'line_nr' => 145,
+ 'line_nr' => 160,
'macro' => '',
'text' => '@image file `f--ile1\' not found, using `f--ile1.jpg\'',
'type' => 'warning'
@@ -21255,16 +21737,16 @@ Top
. . ? @::
* @ { } \\ #::
* LaTeX TeX * , (C) ... ...::
-* == error-> Euro ! ==> -::
-* >= <= ->::
-* a o -!- # -| ? (R)::
-* => o a b a sunny day aa::
-* AA ae oe AE OE /o /O ss /l /L D d TH th::
-* a" e~ i^ a^ a` e\' c, e= e* e\'\' e;::
-* e. e( e_ .e e< j ee[::
-* i E=` C\',::
-* `` \'\' ` \' ,, ,::
-* << >> << >> < >::
+* == error-> € ¡ ==> -::
+* ≥ ≤ ->::
+* ª º -!- £ -| ¿ (R)::
+* => ° a b a sunny day å::
+* Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ::
+* ä ẽ î â à é ç ē e̊ e̋ ę::
+* ė ĕ e̲ ẹ ě j ee͡::
+* ı Ḕ Ḉ::
+* “ †‘ ’ „ ‚::
+* « » « » ‹ ›::
* `` \'\' --- -- ` \'::
* AAA (fff) AAA BBB::
* CCC (rrr) CCC DDD::
@@ -21302,73 +21784,73 @@ File: , Node: @ { } \\ #, Next: LaTeX TeX * , (C) ... ..., Prev: !
***********

-File: , Node: LaTeX TeX * , (C) ... ..., Next: == error-> Euro ! ==> -, Prev: @ { } \\ #, Up: Top
+File: , Node: LaTeX TeX * , (C) ... ..., Next: == error-> € ¡ ==> -, Prev: @ { } \\ #, Up: Top
4 LaTeX TeX * , (C) ... ...
***************************

-File: , Node: == error-> Euro ! ==> -, Next: >= <= ->, Prev: LaTeX TeX * , (C) ... ..., Up: Top
+File: , Node: == error-> € ¡ ==> -, Next: ≥ ≤ ->, Prev: LaTeX TeX * , (C) ... ..., Up: Top
-5 == error-> Euro ! ==> -
-*************************
+5 == error-> € ¡ ==> -
+**********************

-File: , Node: >= <= ->, Next: a o -!- # -| ? (R), Prev: == error-> Euro ! ==> -, Up: Top
+File: , Node: ≥ ≤ ->, Next: ª º -!- £ -| ¿ (R), Prev: == error-> € ¡ ==> -, Up: Top
-6 >= <= ->
-**********
+6 ≥ ≤ ->
+********

-File: , Node: a o -!- # -| ? (R), Next: => o a b a sunny day aa, Prev: >= <= ->, Up: Top
+File: , Node: ª º -!- £ -| ¿ (R), Next: => ° a b a sunny day å, Prev: ≥ ≤ ->, Up: Top
-7 a o -!- # -| ? (R)
+7 ª º -!- £ -| ¿ (R)
********************

-File: , Node: => o a b a sunny day aa, Next: AA ae oe AE OE /o /O ss /l /L D d TH th, Prev: a o -!- # -| ? (R), Up: Top
+File: , Node: => ° a b a sunny day å, Next: Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ, Prev: ª º -!- £ -| ¿ (R), Up: Top
-8 => o a b a sunny day aa
-*************************
+8 => ° a b a sunny day å
+************************

-File: , Node: AA ae oe AE OE /o /O ss /l /L D d TH th, Next: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;, Prev: => o a b a sunny day aa, Up: Top
+File: , Node: Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ, Next: ä ẽ î â à é ç ē e̊ e̋ ę, Prev: => ° a b a sunny day å, Up: Top
-9 AA ae oe AE OE /o /O ss /l /L D d TH th
-*****************************************
+9 Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ
+*****************************

-File: , Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;, Next: e. e( e_ .e e< j ee[, Prev: AA ae oe AE OE /o /O ss /l /L D d TH th, Up: Top
+File: , Node: ä ẽ î â à é ç ē e̊ e̋ ę, Next: ė ĕ e̲ ẹ ě j ee͡, Prev: Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ, Up: Top
-10 a" e~ i^ a^ a` e\' c, e= e* e\'\' e;
-************************************
+10 ä ẽ î â à é ç ē e̊ e̋ ę
+************************

-File: , Node: e. e( e_ .e e< j ee[, Next: i E=` C\',, Prev: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;, Up: Top
+File: , Node: ė ĕ e̲ ẹ ě j ee͡, Next: ı Ḕ Ḉ, Prev: ä ẽ î â à é ç ē e̊ e̋ ę, Up: Top
-11 e. e( e_ .e e< j ee[
-***********************
+11 ė ĕ e̲ ẹ ě j ee͡
+*****************

-File: , Node: i E=` C\',, Next: `` \'\' ` \' ,, ,, Prev: e. e( e_ .e e< j ee[, Up: Top
+File: , Node: ı Ḕ Ḉ, Next: “ †‘ ’ „ ‚, Prev: ė ĕ e̲ ẹ ě j ee͡, Up: Top
-12 i E=` C\',
-************
+12 ı Ḕ Ḉ
+********

-File: , Node: `` \'\' ` \' ,, ,, Next: << >> << >> < >, Prev: i E=` C\',, Up: Top
+File: , Node: “ †‘ ’ „ ‚, Next: « » « » ‹ ›, Prev: ı Ḕ Ḉ, Up: Top
-13 `` \'\' ` \' ,, ,
-*****************
+13 “ †‘ ’ „ ‚
+**************

-File: , Node: << >> << >> < >, Next: `` \'\' --- -- ` \', Prev: `` \'\' ` \' ,, ,, Up: Top
+File: , Node: « » « » ‹ ›, Next: `` \'\' --- -- ` \', Prev: “ †‘ ’ „ ‚, Up: Top
-14 << >> << >> < >
-******************
+14 « » « » ‹ ›
+**************

-File: , Node: `` \'\' --- -- ` \', Next: AAA (fff) AAA BBB, Prev: << >> << >> < >, Up: Top
+File: , Node: `` \'\' --- -- ` \', Next: AAA (fff) AAA BBB, Prev: « » « » ‹ ›, Up: Top
15 " " -- - \' \'
***************
@@ -21449,55 +21931,97 @@ File: , Node: <http://somewhere_aaa> text (url) ls, Prev: _{g}H 3^{rd}, Up: T
*note { }::
*note !
-. . ? @:: *note @ { } \\ #:: *note LaTeX TeX * , (C) ... ...:: *note ==
-error-> Euro ! ==> -::
+. . ? @::
+
+ *note @ { } \\ #::
+
+ *note LaTeX TeX * , (C) ... ...::
+
+ *note == error-> € ¡ ==> -::
+
+ *note ≥ ≤ ->::
+
+ *note ª º -!- £ -| ¿ (R)::
+
+ *note => ° a b a sunny day å::
- *note >= <= ->::
+ *note Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ::
- *note a o -!- # -| ? (R):: *note => o a b a sunny day aa:: *note AA
-ae oe AE OE /o /O ss /l /L D d TH th:: *note a" e~ i^ a^ a` e\' c, e= e*
-e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
-,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
-AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <someone@somewher>
-<no_explain@there>:: *note [f--ile1]
-in r SC *str* t VAR dfn i:: *note env code option samp command file C-x
-<ESC>:: *note 8.27in:: *note sansserif slanted:: *note indicateurl::
-*note _{g}H 3^{rd}:: *note <http://somewhere_aaa> text (url) ls::
+ *note ä ẽ î â à é ç ē e̊ e̋ ę::
+
+ *note ė ĕ e̲ ẹ ě j ee͡::
+
+ *note ı Ḕ Ḉ::
+
+ *note “ †‘ ’ „ ‚::
+
+ *note « » « » ‹ ›::
+
+ *note `` \'\' --- -- ` \'::
+
+ *note AAA (fff) AAA BBB::
+
+ *note CCC (rrr) CCC DDD::
+
+ *note the someone <someone@somewher> <no_explain@there>::
+
+ *note [f--ile1]
+
+ *note @ {} . ::
+
+ *note cite asis in @w b in r SC *str* t VAR dfn i::
+
+ *note env code option samp command file C-x <ESC>::
+
+ *note 8.27in::
+
+ *note sansserif slanted::
+
+ *note indicateurl::
+
+ *note _{g}H 3^{rd}::
+
+ *note <http://somewhere_aaa> text (url) ls::

Tag Table:
Node: Top27
-Node: { }838
+Node: { }866
Node: !
-. . ? @917
-Node: @ { } \\ #1022
-Node: LaTeX TeX * , (C) ... ...1141
-Node: == error-> Euro ! ==> -1302
-Node: >= <= ->1458
-Node: a o -!- # -| ? (R)1577
-Node: => o a b a sunny day aa1716
-Node: AA ae oe AE OE /o /O ss /l /L D d TH th1896
-Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;2123
-Node: e. e( e_ .e e< j ee[2337
-Node: i E=` C\',2495
-Node: `` \'\' ` \' ,, ,2612
-Node: << >> << >> < >2734
-Node: `` \'\' --- -- ` \'2865
-Node: AAA (fff) AAA BBB2993
-Node: CCC (rrr) CCC DDD3133
-Node: the someone <someone@somewher> <no_explain@there>3306
-Node: [f--ile1]
-Node: @ {} . 3956
-Node: cite asis in @w b in r SC *str* t VAR dfn i4159
-Node: env code option samp command file C-x <ESC>4403
-Node: 8.27in4665
-Node: sansserif slanted4799
-Node: indicateurl4923
-Node: _{g}H 3^{rd}5045
-Node: <http://somewhere_aaa> text (url) ls5184
+. . ? @945
+Node: @ { } \\ #1050
+Node: LaTeX TeX * , (C) ... ...1169
+Node: == error-> € ¡ ==> -1330
+Node: ≥ ≤ ->1485
+Node: ª º -!- £ -| ¿ (R)1610
+Node: => ° a b a sunny day å1760
+Node: Å æ œ Æ Œ ø Ø ß ł Šà ð Þ þ1947
+Node: ä ẽ î â à é ç ē e̊ e̋ ę2169
+Node: ė ĕ e̲ ẹ ě j ee͡2380
+Node: ı Ḕ Ḉ2541
+Node: “ †‘ ’ „ ‚2668
+Node: « » « » ‹ ›2810
+Node: `` \'\' --- -- ` \'2954
+Node: AAA (fff) AAA BBB3086
+Node: CCC (rrr) CCC DDD3226
+Node: the someone <someone@somewher> <no_explain@there>3399
+Node: [f--ile1]
+Node: @ {} . 4049
+Node: cite asis in @w b in r SC *str* t VAR dfn i4252
+Node: env code option samp command file C-x <ESC>4496
+Node: 8.27in4758
+Node: sansserif slanted4892
+Node: indicateurl5016
+Node: _{g}H 3^{rd}5138
+Node: <http://somewhere_aaa> text (url) ls5277

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
@@ -21529,33 +22053,6 @@ $result_converted_errors{'info'}->{'at_commands_in_refs'} = [
'type' => 'warning'
},
{
- 'error_line' => ':61: warning: @node name should not contain `,\': a" e~ i^ a^ a` e\' c, e= e* e\'\' e;
-',
- 'file_name' => '',
- 'line_nr' => 61,
- 'macro' => '',
- 'text' => '@node name should not contain `,\': a" e~ i^ a^ a` e\' c, e= e* e\'\' e;',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':67: warning: @node name should not contain `,\': i E=` C\',
-',
- 'file_name' => '',
- 'line_nr' => 67,
- 'macro' => '',
- 'text' => '@node name should not contain `,\': i E=` C\',',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':70: warning: @node name should not contain `,\': `` \'\' ` \' ,, ,
-',
- 'file_name' => '',
- 'line_nr' => 70,
- 'macro' => '',
- 'text' => '@node name should not contain `,\': `` \'\' ` \' ,, ,',
- 'type' => 'warning'
- },
- {
'error_line' => ':90: warning: could not find @image file `f--ile1.txt\' nor alternate text
',
'file_name' => '',
@@ -21583,10 +22080,10 @@ $result_converted_errors{'info'}->{'at_commands_in_refs'} = [
'type' => 'warning'
},
{
- 'error_line' => ':154: warning: @ref node name should not contain `:\'
+ 'error_line' => ':177: warning: @ref node name should not contain `:\'
',
'file_name' => '',
- 'line_nr' => 154,
+ 'line_nr' => 177,
'macro' => '',
'text' => '@ref node name should not contain `:\'',
'type' => 'warning'
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
index c697c56c58..37d6173974 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl
@@ -11612,7 +11612,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11629,7 +11641,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 127,
+ 'line_nr' => 128,
'macro' => ''
},
'parent' => {}
@@ -11733,7 +11745,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11750,7 +11774,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 128,
+ 'line_nr' => 130,
'macro' => ''
},
'parent' => {}
@@ -11892,7 +11916,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11909,7 +11945,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 129,
+ 'line_nr' => 132,
'macro' => ''
},
'parent' => {}
@@ -12061,7 +12097,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 131,
+ 'line_nr' => 134,
'macro' => ''
},
'parent' => {}
@@ -12156,7 +12192,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 133,
+ 'line_nr' => 136,
'macro' => ''
},
'parent' => {}
@@ -12298,7 +12334,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12315,7 +12363,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 134,
+ 'line_nr' => 138,
'macro' => ''
},
'parent' => {}
@@ -12419,7 +12467,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12436,7 +12496,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 135,
+ 'line_nr' => 140,
'macro' => ''
},
'parent' => {}
@@ -12711,7 +12771,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12733,7 +12805,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 136,
+ 'line_nr' => 142,
'macro' => ''
},
'parent' => {}
@@ -13015,7 +13087,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13037,7 +13121,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 137,
+ 'line_nr' => 144,
'macro' => ''
},
'parent' => {}
@@ -13209,7 +13293,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13231,7 +13327,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 138,
+ 'line_nr' => 146,
'macro' => ''
},
'parent' => {}
@@ -13335,7 +13431,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13352,7 +13460,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 139,
+ 'line_nr' => 148,
'macro' => ''
},
'parent' => {}
@@ -13475,7 +13583,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13492,7 +13612,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 140,
+ 'line_nr' => 150,
'macro' => ''
},
'parent' => {}
@@ -13615,7 +13735,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13642,7 +13774,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 141,
+ 'line_nr' => 152,
'macro' => ''
},
'parent' => {}
@@ -13651,7 +13783,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13686,7 +13830,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 142,
+ 'line_nr' => 154,
'macro' => ''
},
'parent' => {}
@@ -13768,7 +13912,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13803,7 +13959,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 144,
+ 'line_nr' => 157,
'macro' => ''
},
'parent' => {}
@@ -13885,7 +14041,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13928,7 +14096,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 146,
+ 'line_nr' => 160,
'macro' => ''
},
'parent' => {}
@@ -13988,7 +14156,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14013,7 +14193,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 148,
+ 'line_nr' => 163,
'macro' => ''
},
'parent' => {}
@@ -14108,7 +14288,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14134,7 +14326,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 149,
+ 'line_nr' => 165,
'macro' => ''
},
'parent' => {}
@@ -14162,7 +14354,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14192,7 +14396,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 151,
+ 'line_nr' => 168,
'macro' => ''
},
'parent' => {}
@@ -14448,7 +14652,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14470,7 +14686,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 152,
+ 'line_nr' => 170,
'macro' => ''
},
'parent' => {}
@@ -14660,7 +14876,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14686,7 +14914,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 153,
+ 'line_nr' => 172,
'macro' => ''
},
'parent' => {}
@@ -14715,7 +14943,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14737,7 +14977,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 154,
+ 'line_nr' => 174,
'macro' => ''
},
'parent' => {}
@@ -14789,7 +15029,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14811,7 +15063,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 155,
+ 'line_nr' => 176,
'macro' => ''
},
'parent' => {}
@@ -14839,7 +15091,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14861,7 +15125,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 156,
+ 'line_nr' => 178,
'macro' => ''
},
'parent' => {}
@@ -14913,7 +15177,19 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14935,7 +15211,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 157,
+ 'line_nr' => 180,
'macro' => ''
},
'parent' => {}
@@ -17700,120 +17976,6 @@ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'cont
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[16];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -17826,13 +17988,25 @@ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'cont
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[7];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[5];
@@ -17865,7 +18039,7 @@ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'cont
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[9];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -17882,687 +18056,835 @@ $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'cont
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[21] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[22] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[23] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[24] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[25] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[26] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[23];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[31];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[39];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[41];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[43];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[45];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[31]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[47];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[33]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[49];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[35]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[51];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[37]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[53];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[39]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'contents'}[41]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[21] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[22] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[23] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[24] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[25] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[26] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[21];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[23];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[25];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[27];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[29];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[31];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[33];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[31]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[32]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[35];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[33]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[34]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[37];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[35]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[36]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[39];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[37]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[38]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[41];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[39]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[40]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[43];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[41]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[42]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[45];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[43]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[44]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[47];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[45]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[46]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[49];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[47]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[48]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[51];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[49]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[50]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[53];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[51]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[52]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[55];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[53]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'contents'}[54]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56];
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'line_nr'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[56]{'parent'} = $result_trees{'at_commands_in_refs_latin1'};
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[57]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[57];
@@ -18688,32 +19010,55 @@ $result_texis{'at_commands_in_refs_latin1'} = '@setfilename at_commands_in_refs_
@ref{@- @{ @}}
@ref{@ @ @! @* @. @: .@: @? @@}
+
@ref{@atchar{} @lbracechar{} @rbracechar{} @backslashchar{} @hashchar{}}
+
@ref{@LaTeX{} @TeX{} @bullet{} @comma{} @copyright{} @dots{} @enddots{}}
+
@ref{@equiv{} @error{} @euro{} @exclamdown{} @expansion{} @minus{}}
@ref{@geq{} @leq{} @arrow{}}
@ref{@ordf{} @ordm{} @point{} @pounds{} @print{} @questiondown{} @registeredsymbol{}}
+
@ref{@result{} @textdegree{} a@tie{}b @today{} @aa{}}
+
@ref{@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{} @dh{} @TH{} @th{}}
+
@ref{@"{a} @~{e} @^{@dotless{i}} @^{a} @`{a} @\'e @,{c} @={e} @ringaccent{e} @H{e} @ogonek{e}}
+
@ref{@dotaccent{e} @u{e} @ubaraccent{e} @udotaccent{e} @v{e} @dotless{j} @tieaccent{ee}}
+
@ref{@dotless{i} @`{@=E} @,{@\'C}}
+
@ref{@quotedblleft{} @quotedblright{} @quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{}}
+
@ref{@guillemetleft{} @guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{} @guilsinglright{}}
+
@ref{`` \'\' --- -- ` \'}
+
@ref{@acronym{AAA, fff} @acronym{AAA} @acronym{BBB}}
+
@ref{@abbr{CCC, rrr} @abbr{CCC} @abbr{DDD}}
+
@ref{@email{someone@@somewher, the someone} @email{no_explain@@there}}
+
@ref{@image{f--ile1} @image{f--ile,aze,az,alt,e--xt}}
+
@ref{@verb{. @ {} . .}}
+
@ref{@cite{cite @asis{asis}} @w{in @@w @b{b}} @r{in r} @sc{sc} @strong{str} @t{t} @var{var} @dfn{dfn} @i{i}}
+
@ref{@env{env} @code{code} @option{option} @samp{samp} @command{command} @file{file} @kbd{C-x @key{ESC}}}
+
@ref{8.27@dmn{in}}
+
@ref{@sansserif{sansserif} @slanted{slanted}}
+
@ref{@indicateurl{indicateurl}}
+
@ref{@sub{g}H 3@sup{rd}}
+
@ref{@url{http://somewhere_aaa} @url{url, text} @uref{/man.cgi/1/ls,,ls}}
@bye
@@ -18839,32 +19184,55 @@ Top
!
. . ? @
+
@ { } \\ #
+
LaTeX TeX * , (C) ... ...
+
== error--> Euro ! ==> -
>= <= ->
a o -!- # -| ? (R)
+
=> o a b a sunny day aa
+
AA ae oe AE OE /o /O ss /l /L D d TH th
+
a" e~ i^ a^ a` e\' c, e= e* e\'\' e;
+
e. e( e_ .e e< j ee[
+
i E=` C\',
+
`` \'\' ` \' ,, ,
+
<< >> << >> < >
+
" " -- - ` \'
+
AAA (fff) AAA BBB
+
CCC (rrr) CCC DDD
+
the someone no_explain@there
+
f--ile1 f--ile
+
@ {} .
+
cite asis in @w b in r SC str t var dfn i
+
env code option samp command file C-x ESC
+
8.27in
+
sansserif slanted
+
indicateurl
+
gH 3rd
+
http://somewhere_aaa url (text) ls
';
@@ -19999,18 +20367,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'at_commands_in_refs_latin1'};
@@ -20067,7 +20424,6 @@ $result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_next'}{'node_up'
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_prev'} = $result_nodes{'at_commands_in_refs_latin1'};
$result_nodes{'at_commands_in_refs_latin1'}{'menu_child'}{'node_up'} = $result_nodes{'at_commands_in_refs_latin1'};
$result_nodes{'at_commands_in_refs_latin1'}{'node_next'} = $result_nodes{'at_commands_in_refs_latin1'}{'menu_child'};
-$result_nodes{'at_commands_in_refs_latin1'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'at_commands_in_refs_latin1'};
$result_menus{'at_commands_in_refs_latin1'} = {
'cmdname' => 'node',
@@ -20473,10 +20829,10 @@ $result_errors{'at_commands_in_refs_latin1'} = [
'type' => 'warning'
},
{
- 'error_line' => ':149: warning: @verb should not appear in @ref
+ 'error_line' => ':165: warning: @verb should not appear in @ref
',
'file_name' => '',
- 'line_nr' => 149,
+ 'line_nr' => 165,
'macro' => '',
'text' => '@verb should not appear in @ref',
'type' => 'warning'
@@ -20513,10 +20869,10 @@ $result_converted_errors{'file_html'}->{'at_commands_in_refs_latin1'} = [
'type' => 'warning'
},
{
- 'error_line' => ':148: warning: @image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'
+ 'error_line' => ':163: warning: @image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'
',
'file_name' => '',
- 'line_nr' => 148,
+ 'line_nr' => 163,
'macro' => '',
'text' => '@image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'',
'type' => 'warning'
@@ -20598,10 +20954,10 @@ $result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
'type' => 'warning'
},
{
- 'error_line' => ':157: warning: @ref node name should not contain `:\'
+ 'error_line' => ':180: warning: @ref node name should not contain `:\'
',
'file_name' => '',
- 'line_nr' => 157,
+ 'line_nr' => 180,
'macro' => '',
'text' => '@ref node name should not contain `:\'',
'type' => 'warning'
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
index 230f5968ac..5a827b2a49 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/----_0021---_002e--_002e-_003f-_0040.html
@@ -12,10 +12,10 @@
. . ? @ (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" rel="next" title="@ { } \ #">
-<link href="-_007b-_007d.html#-_007b-_007d" rel="prev" title=" { }">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_0040-_007b-_007d-_005c-_0023.html" rel="next" title="@ { } \ #">
+<link href="-_007b-_007d.html" rel="prev" title=" { }">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -41,7 +41,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="----_0021---_002e--_002e-_003f-_0040"></span><div class="header">
<p>
-Next: <a href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" accesskey="n" rel="next">@ { } \ #</a>, Previous: <a href="-_007b-_007d.html#-_007b-_007d" accesskey="p" rel="prev"> { }</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="n" rel="next">@ { } \ #</a>, Previous: <a href="-_007b-_007d.html" accesskey="p" rel="prev"> { }</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="----_0021---_002e--_002e-_003f-_0040-1"></span><h2 class="chapter">2 &nbsp; &nbsp; ! <br> . . ? @</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
index 8e5d19d124..85c0f52df2 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_0040-_007b_007d-_002e-.html
@@ -9,10 +9,10 @@
<meta name="keywords" content=" @ {} . (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" rel="next" title="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i">
-<link href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile" rel="prev" title="f--ile1 f--ile">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" rel="next" title="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i">
+<link href="f_002d_002dile1-f_002d_002dile.html" rel="prev" title="f--ile1 f--ile">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="-_0040-_007b_007d-_002e-"></span><div class="header">
<p>
-Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="n" rel="next"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile" accesskey="p" rel="prev"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" accesskey="n" rel="next"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a href="f_002d_002dile1-f_002d_002dile.html" accesskey="p" rel="prev"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="-_0040-_007b_007d-_002e--1"></span><h2 class="chapter">20 <tt> @ {} . </tt></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
index 1545562897..051a7f8e95 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/-_007b-_007d.html
@@ -9,11 +9,11 @@
<meta name="keywords" content=" { } (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" rel="next" title="&nbsp; &nbsp; !
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="----_0021---_002e--_002e-_003f-_0040.html" rel="next" title="&nbsp; &nbsp; !
. . ? @">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="-_007b-_007d"></span><div class="header">
<p>
-Next: <a href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" accesskey="n" rel="next">&nbsp; &nbsp; ! <br> . . ? @</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="n" rel="next">&nbsp; &nbsp; ! <br> . . ? @</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="-_007b-_007d-1"></span><h2 class="chapter">1 { }</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html
index 925b6e1fa2..4c3303e093 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="8.27in (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="sansserif-slanted.html#sansserif-slanted" rel="next" title="sansserif slanted">
-<link href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC" rel="prev" title="env code option samp command file C-x ESC">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="sansserif-slanted.html" rel="next" title="sansserif slanted">
+<link href="env-code-option-samp-command-file-C_002dx-ESC.html" rel="prev" title="env code option samp command file C-x ESC">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t8_002e27in"></span><div class="header">
<p>
-Next: <a href="sansserif-slanted.html#sansserif-slanted" accesskey="n" rel="next"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC" accesskey="p" rel="prev"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="sansserif-slanted.html" accesskey="n" rel="next"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" accesskey="p" rel="prev"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t8_002e27in-1"></span><h2 class="chapter">23 8.27in</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index 2c7dba7717..742bf0d8b3 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" rel="next" title="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
-<link href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" rel="prev" title="&rArr; &deg; a&nbsp;b a sunny day &aring;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="next" title="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
+<link href="_21d2-_00b0-a-b--aa.html" rel="prev" title="&rArr; &deg; a&nbsp;b a sunny day &aring;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"></span><div class="header">
<p>
-Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" accesskey="p" rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th"></span><h2 class="chapter">9 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
index dacd11ffd7..c933c8d0c5 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/AAA-AAA-BBB.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="AAA (fff) AAA BBB (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="CCC-CCC-DDD.html#CCC-CCC-DDD" rel="next" title="CCC (rrr) CCC DDD">
-<link href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" rel="prev" title="`` '' --- -- ` '">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="CCC-CCC-DDD.html" rel="next" title="CCC (rrr) CCC DDD">
+<link href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" rel="prev" title="`` '' --- -- ` '">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="AAA-AAA-BBB"></span><div class="header">
<p>
-Next: <a href="CCC-CCC-DDD.html#CCC-CCC-DDD" accesskey="n" rel="next"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, Previous: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" accesskey="p" rel="prev">`` '' --- -- ` '</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="CCC-CCC-DDD.html" accesskey="n" rel="next"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, Previous: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" accesskey="p" rel="prev">`` '' --- -- ` '</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="AAA-AAA-BBB-1"></span><h2 class="chapter">16 <acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
index 683dc82427..3ee8769848 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/CCC-CCC-DDD.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="CCC (rrr) CCC DDD (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there" rel="next" title="someone@somewher (the someone) no_explain@there (no_explain@there)">
-<link href="AAA-AAA-BBB.html#AAA-AAA-BBB" rel="prev" title="AAA (fff) AAA BBB">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="someone_0040somewher-no_005fexplain_0040there.html" rel="next" title="someone@somewher (the someone) no_explain@there (no_explain@there)">
+<link href="AAA-AAA-BBB.html" rel="prev" title="AAA (fff) AAA BBB">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="CCC-CCC-DDD"></span><div class="header">
<p>
-Next: <a href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there" accesskey="n" rel="next"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>, Previous: <a href="AAA-AAA-BBB.html#AAA-AAA-BBB" accesskey="p" rel="prev"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="n" rel="next"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>, Previous: <a href="AAA-AAA-BBB.html" accesskey="p" rel="prev"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="CCC-CCC-DDD-1"></span><h2 class="chapter">17 <abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
index 6c34105397..cbf206fd96 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="LaTeX TeX &bull; , &copy; &hellip; ... (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" rel="next" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
-<link href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" rel="prev" title="@ { } \ #">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" rel="next" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
+<link href="_0040-_007b-_007d-_005c-_0023.html" rel="prev" title="@ { } \ #">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e"></span><div class="header">
<p>
-Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Previous: <a href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" accesskey="p" rel="prev">@ { } \ #</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1"></span><h2 class="chapter">4 LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
index d040544918..1afb59dc33 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0040-_007b-_007d-_005c-_0023.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="@ { } \ # (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" rel="next" title="LaTeX TeX &bull; , &copy; &hellip; ...">
-<link href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" rel="prev" title="&nbsp; &nbsp; !
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" rel="next" title="LaTeX TeX &bull; , &copy; &hellip; ...">
+<link href="----_0021---_002e--_002e-_003f-_0040.html" rel="prev" title="&nbsp; &nbsp; !
. . ? @">
<style type="text/css">
<!--
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0040-_007b-_007d-_005c-_0023"></span><div class="header">
<p>
-Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Previous: <a href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" accesskey="p" rel="prev">&nbsp; &nbsp; ! <br> . . ? @</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Previous: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="p" rel="prev">&nbsp; &nbsp; ! <br> . . ? @</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_0040-_007b-_007d-_005c-_0023-1"></span><h2 class="chapter">3 @ { } \ #</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
index 65e91d5a02..5963b4c0c0 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="`` '' --- -- ` ' (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="AAA-AAA-BBB.html#AAA-AAA-BBB" rel="next" title="AAA (fff) AAA BBB">
-<link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" rel="prev" title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="AAA-AAA-BBB.html" rel="next" title="AAA (fff) AAA BBB">
+<link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" rel="prev" title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"></span><div class="header">
<p>
-Next: <a href="AAA-AAA-BBB.html#AAA-AAA-BBB" accesskey="n" rel="next"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Previous: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="p" rel="prev">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="AAA-AAA-BBB.html" accesskey="n" rel="next"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Previous: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="p" rel="prev">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027-1"></span><h2 class="chapter">15 &ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
index ab1aba742e..fe76a31eca 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" rel="next" title="&rArr; &deg; a&nbsp;b a sunny day &aring;">
-<link href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" rel="prev" title="&ge; &le; &rarr;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_21d2-_00b0-a-b--aa.html" rel="next" title="&rArr; &deg; a&nbsp;b a sunny day &aring;">
+<link href="_2265-_2264-_2192.html" rel="prev" title="&ge; &le; &rarr;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae"></span><div class="header">
<p>
-Next: <a href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" accesskey="n" rel="next">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_21d2-_00b0-a-b--aa.html" accesskey="n" rel="next">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1"></span><h2 class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
index f94ad7ac51..49d2ceec91 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" rel="next" title="`` '' --- -- ` '">
-<link href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a" rel="prev" title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" rel="next" title="`` '' --- -- ` '">
+<link href="_201c-_201d-_2018-_2019-_201e-_201a.html" rel="prev" title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a"></span><div class="header">
<p>
-Next: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" accesskey="n" rel="next">`` '' --- -- ` '</a>, Previous: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="p" rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" accesskey="n" rel="next">`` '' --- -- ` '</a>, Previous: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="p" rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1"></span><h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index 8b17baeb59..9a789bce89 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" rel="next" title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
-<link href="i-E-C.html#g_t_0131-_1e14-_1e08" rel="prev" title="i &#274;` &#262;,">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" rel="next" title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
+<link href="i-E-C.html" rel="prev" title="i &#274;` &#262;,">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a"></span><div class="header">
<p>
-Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="n" rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a href="i-E-C.html#g_t_0131-_1e14-_1e08" accesskey="p" rel="prev">i &#274;` &#262;,</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a href="i-E-C.html" accesskey="p" rel="prev">i &#274;` &#262;,</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
index a6c3e7add2..244b33ddd4 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_21d2-_00b0-a-b--aa.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&rArr; &deg; a&nbsp;b a sunny day &aring; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" rel="next" title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;">
-<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" rel="prev" title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="next" title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;">
+<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" rel="prev" title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_21d2-_00b0-a-b--_00e5"></span><div class="header">
<p>
-Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" accesskey="n" rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="p" rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="n" rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="p" rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_21d2-_00b0-a-b--aa"></span><h2 class="chapter">8 &rArr; &deg; a&nbsp;b a sunny day &aring;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
index 1dfcec426b..1e88b4c3b6 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&equiv; error&rarr; &euro; &iexcl; &rarr; - (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" rel="next" title="&ge; &le; &rarr;">
-<link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" rel="prev" title="LaTeX TeX &bull; , &copy; &hellip; ...">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_2265-_2264-_2192.html" rel="next" title="&ge; &le; &rarr;">
+<link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" rel="prev" title="LaTeX TeX &bull; , &copy; &hellip; ...">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212"></span><div class="header">
<p>
-Next: <a href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" accesskey="n" rel="next">&ge; &le; &rarr;</a>, Previous: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="p" rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_2265-_2264-_2192.html" accesskey="n" rel="next">&ge; &le; &rarr;</a>, Previous: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="p" rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1"></span><h2 class="chapter">5 &equiv; error&rarr; &euro; &iexcl; &rarr; -</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
index d34e148f01..4612adc594 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/_2265-_2264-_2192.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&ge; &le; &rarr; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" rel="next" title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
-<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" rel="prev" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" rel="next" title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
+<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" rel="prev" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_2265-_2264-_2192"></span><div class="header">
<p>
-Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="n" rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="p" rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_2265-_2264-_2192-1"></span><h2 class="chapter">6 &ge; &le; &rarr;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index 1ac260d043..3e548f89ec 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" rel="next" title="&#279; &#277; e_ &#7865; &#283; j ee[">
-<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" rel="prev" title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e_ &#7865; &#283; j ee[">
+<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="prev" title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"></span><div class="header">
<p>
-Next: <a href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" accesskey="n" rel="next">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Previous: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Previous: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index 0cce70ca85..f517975561 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC" rel="next" title="env code option samp command file C-x ESC">
-<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" rel="prev" title=" @ {} . ">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="env-code-option-samp-command-file-C_002dx-ESC.html" rel="next" title="env code option samp command file C-x ESC">
+<link href="-_0040-_007b_007d-_002e-.html" rel="prev" title=" @ {} . ">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></span><div class="header">
<p>
-Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" rel="next"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Previous: <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="p" rel="prev"><tt> @ {} . </tt></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" accesskey="n" rel="next"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Previous: <a href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><tt> @ {} . </tt></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></span><h2 class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
index 0ea5eee48f..c814d5bce2 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/e-e-e-e-e-j-ee.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&#279; &#277; e_ &#7865; &#283; j ee[ (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="i-E-C.html#g_t_0131-_1e14-_1e08" rel="next" title="i &#274;` &#262;,">
-<link href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" rel="prev" title="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="i-E-C.html" rel="next" title="i &#274;` &#262;,">
+<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="prev" title="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361"></span><div class="header">
<p>
-Next: <a href="i-E-C.html#g_t_0131-_1e14-_1e08" accesskey="n" rel="next">i &#274;` &#262;,</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;` &#262;,</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
index e54763a1af..81ec22ef26 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="env code option samp command file C-x ESC (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="8_002e27in.html#g_t8_002e27in" rel="next" title="8.27in">
-<link href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" rel="prev" title="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="8_002e27in.html" rel="next" title="8.27in">
+<link href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" rel="prev" title="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="env-code-option-samp-command-file-C_002dx-ESC"></span><div class="header">
<p>
-Next: <a href="8_002e27in.html#g_t8_002e27in" accesskey="n" rel="next">8.27in</a>, Previous: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="p" rel="prev"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="8_002e27in.html" accesskey="n" rel="next">8.27in</a>, Previous: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" accesskey="p" rel="prev"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="env-code-option-samp-command-file-C_002dx-ESC-1"></span><h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
index 3c19950885..90a692e7eb 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/f_002d_002dile1-f_002d_002dile.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="f--ile1 f--ile (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" rel="next" title=" @ {} . ">
-<link href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there" rel="prev" title="someone@somewher (the someone) no_explain@there (no_explain@there)">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="-_0040-_007b_007d-_002e-.html" rel="next" title=" @ {} . ">
+<link href="someone_0040somewher-no_005fexplain_0040there.html" rel="prev" title="someone@somewher (the someone) no_explain@there (no_explain@there)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="f_002d_002dile1-f_002d_002dile"></span><div class="header">
<p>
-Next: <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="n" rel="next"><tt> @ {} . </tt></a>, Previous: <a href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there" accesskey="p" rel="prev"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><tt> @ {} . </tt></a>, Previous: <a href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" rel="prev"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="f_002d_002dile1-f_002d_002dile-1"></span><h2 class="chapter">19 <img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html
index 46f539309f..bb3b39fed6 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/gH-3rd.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="gH 3rd (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls" rel="next" title="http://somewhere_aaa (http://somewhere_aaa) text (url) ls (/man.cgi/1/ls)">
-<link href="indicateurl.html#indicateurl" rel="prev" title="&lsquo;indicateurl&rsquo;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html" rel="next" title="http://somewhere_aaa (http://somewhere_aaa) text (url) ls (/man.cgi/1/ls)">
+<link href="indicateurl.html" rel="prev" title="&lsquo;indicateurl&rsquo;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="gH-3rd"></span><div class="header">
<p>
-Next: <a href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls" accesskey="n" rel="next"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>, Previous: <a href="indicateurl.html#indicateurl" accesskey="p" rel="prev">&lsquo;<code>indicateurl</code>&rsquo;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html" accesskey="n" rel="next"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>, Previous: <a href="indicateurl.html" accesskey="p" rel="prev">&lsquo;<code>indicateurl</code>&rsquo;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="gH-3rd-1"></span><h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 1b7c64b4e6..8c73b03492 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -9,9 +9,9 @@
<meta name="keywords" content="http://somewhere_aaa (http://somewhere_aaa) text (url) ls (/man.cgi/1/ls) (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="gH-3rd.html#gH-3rd" rel="prev" title="gH 3rd">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="gH-3rd.html" rel="prev" title="gH 3rd">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -37,41 +37,64 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"></span><div class="header">
<p>
-Previous: <a href="gH-3rd.html#gH-3rd" accesskey="p" rel="prev"><sub>g</sub>H 3<sup>rd</sup></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub>g</sub>H 3<sup>rd</sup></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls-1"></span><h2 class="chapter">27 <a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></h2>
-<p><a href="-_007b-_007d.html#-_007b-_007d"> { }</a>
-</p>
-<p><a href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040">&nbsp; &nbsp; ! <br> . . ? @</a>
-<a href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023">@ { } \ #</a>
-<a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>
-<a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>
-</p>
-<p><a href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192">&ge; &le; &rarr;</a>
-</p>
-<p><a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>
-<a href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>
-<a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>
-<a href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>
-<a href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">&#279; &#277; e_ &#7865; &#283; j ee[</a>
-<a href="i-E-C.html#g_t_0131-_1e14-_1e08">i &#274;` &#262;,</a>
-<a href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
-<a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>
-<a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">`` '' --- -- ` '</a>
-<a href="AAA-AAA-BBB.html#AAA-AAA-BBB"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>
-<a href="CCC-CCC-DDD.html#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
-<a href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>
-<a href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>
-<a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a>
-<a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>
-<a href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>
-<a href="8_002e27in.html#g_t8_002e27in">8.27in</a>
-<a href="sansserif-slanted.html#sansserif-slanted"><span class="sansserif">sansserif</span> <i>slanted</i></a>
-<a href="indicateurl.html#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a>
-<a href="gH-3rd.html#gH-3rd"><sub>g</sub>H 3<sup>rd</sup></a>
-<a href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>
+<p><a href="-_007b-_007d.html"> { }</a>
+</p>
+<p><a href="----_0021---_002e--_002e-_003f-_0040.html">&nbsp; &nbsp; ! <br> . . ? @</a>
+</p>
+<p><a href="_0040-_007b-_007d-_005c-_0023.html">@ { } \ #</a>
+</p>
+<p><a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>
+</p>
+<p><a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>
+</p>
+<p><a href="_2265-_2264-_2192.html">&ge; &le; &rarr;</a>
+</p>
+<p><a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>
+</p>
+<p><a href="_21d2-_00b0-a-b--aa.html">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>
+</p>
+<p><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>
+</p>
+<p><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>
+</p>
+<p><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e_ &#7865; &#283; j ee[</a>
+</p>
+<p><a href="i-E-C.html">i &#274;` &#262;,</a>
+</p>
+<p><a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
+</p>
+<p><a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>
+</p>
+<p><a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html">`` '' --- -- ` '</a>
+</p>
+<p><a href="AAA-AAA-BBB.html"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>
+</p>
+<p><a href="CCC-CCC-DDD.html"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
+</p>
+<p><a href="someone_0040somewher-no_005fexplain_0040there.html"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>
+</p>
+<p><a href="f_002d_002dile1-f_002d_002dile.html"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>
+</p>
+<p><a href="-_0040-_007b_007d-_002e-.html"><tt> @ {} . </tt></a>
+</p>
+<p><a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>
+</p>
+<p><a href="env-code-option-samp-command-file-C_002dx-ESC.html"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>
+</p>
+<p><a href="8_002e27in.html">8.27in</a>
+</p>
+<p><a href="sansserif-slanted.html"><span class="sansserif">sansserif</span> <i>slanted</i></a>
+</p>
+<p><a href="indicateurl.html">&lsquo;<code>indicateurl</code>&rsquo;</a>
+</p>
+<p><a href="gH-3rd.html"><sub>g</sub>H 3<sup>rd</sup></a>
+</p>
+<p><a href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>
</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
index 006302a0e3..fe1dd0ed73 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/i-E-C.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="i &#274;` &#262;, (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a" rel="next" title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
-<link href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" rel="prev" title="&#279; &#277; e_ &#7865; &#283; j ee[">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_201c-_201d-_2018-_2019-_201e-_201a.html" rel="next" title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
+<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e_ &#7865; &#283; j ee[">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0131-_1e14-_1e08"></span><div class="header">
<p>
-Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="n" rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" accesskey="p" rel="prev">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
index 2d8beeb768..291f1236bf 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
@@ -10,8 +10,7 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="-_007b-_007d.html#-_007b-_007d" rel="next" title=" { }">
+<link href="-_007b-_007d.html" rel="next" title=" { }">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,72 +37,72 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="-_007b-_007d.html#-_007b-_007d" accesskey="n" rel="next"> { }</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
</div>
<hr>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="-_007b-_007d.html#-_007b-_007d" accesskey="1">{ }</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="-_007b-_007d.html" accesskey="1">{ }</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" accesskey="2">&nbsp; &nbsp; ! <br> . . ? @</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="2">&nbsp; &nbsp; ! <br> . . ? @</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" accesskey="3">@ { } \ #</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="3">@ { } \ #</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" accesskey="6">&ge; &le; &rarr;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_2265-_2264-_2192.html" accesskey="6">&ge; &le; &rarr;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" accesskey="8">&rArr; &deg; a&nbsp;b a sunny day &aring;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_21d2-_00b0-a-b--aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a sunny day &aring;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" accesskey="9">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="9">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">&#279; &#277; e_ &#7865; &#283; j ee[</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="e-e-e-e-e-j-ee.html">&#279; &#277; e_ &#7865; &#283; j ee[</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="i-E-C.html#g_t_0131-_1e14-_1e08">i &#274;` &#262;,</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="i-E-C.html">i &#274;` &#262;,</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">`` '' --- -- ` '</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html">`` '' --- -- ` '</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="AAA-AAA-BBB.html#AAA-AAA-BBB"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="AAA-AAA-BBB.html"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="CCC-CCC-DDD.html#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="CCC-CCC-DDD.html"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="someone_0040somewher-no_005fexplain_0040there.html"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="f_002d_002dile1-f_002d_002dile.html"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="-_0040-_007b_007d-_002e-.html"><tt> @ {} . </tt></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="env-code-option-samp-command-file-C_002dx-ESC.html"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="8_002e27in.html#g_t8_002e27in">8.27in</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="8_002e27in.html">8.27in</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="sansserif-slanted.html#sansserif-slanted"><span class="sansserif">sansserif</span> <i>slanted</i></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="sansserif-slanted.html"><span class="sansserif">sansserif</span> <i>slanted</i></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="indicateurl.html#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="indicateurl.html">&lsquo;<code>indicateurl</code>&rsquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="gH-3rd.html#gH-3rd"><sub>g</sub>H 3<sup>rd</sup></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="gH-3rd.html"><sub>g</sub>H 3<sup>rd</sup></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<div class="header">
<p>
-Next: <a href="-_007b-_007d.html#-_007b-_007d" accesskey="n" rel="next"> { }</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html
index 553484ec72..929f325b08 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/indicateurl.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&lsquo;indicateurl&rsquo; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="gH-3rd.html#gH-3rd" rel="next" title="gH 3rd">
-<link href="sansserif-slanted.html#sansserif-slanted" rel="prev" title="sansserif slanted">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="gH-3rd.html" rel="next" title="gH 3rd">
+<link href="sansserif-slanted.html" rel="prev" title="sansserif slanted">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="indicateurl"></span><div class="header">
<p>
-Next: <a href="gH-3rd.html#gH-3rd" accesskey="n" rel="next"><sub>g</sub>H 3<sup>rd</sup></a>, Previous: <a href="sansserif-slanted.html#sansserif-slanted" accesskey="p" rel="prev"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="gH-3rd.html" accesskey="n" rel="next"><sub>g</sub>H 3<sup>rd</sup></a>, Previous: <a href="sansserif-slanted.html" accesskey="p" rel="prev"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="indicateurl-1"></span><h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
index 8452775e32..3ab47fd854 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/sansserif-slanted.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="sansserif slanted (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="indicateurl.html#indicateurl" rel="next" title="&lsquo;indicateurl&rsquo;">
-<link href="8_002e27in.html#g_t8_002e27in" rel="prev" title="8.27in">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="indicateurl.html" rel="next" title="&lsquo;indicateurl&rsquo;">
+<link href="8_002e27in.html" rel="prev" title="8.27in">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="sansserif-slanted"></span><div class="header">
<p>
-Next: <a href="indicateurl.html#indicateurl" accesskey="n" rel="next">&lsquo;<code>indicateurl</code>&rsquo;</a>, Previous: <a href="8_002e27in.html#g_t8_002e27in" accesskey="p" rel="prev">8.27in</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="indicateurl.html" accesskey="n" rel="next">&lsquo;<code>indicateurl</code>&rsquo;</a>, Previous: <a href="8_002e27in.html" accesskey="p" rel="prev">8.27in</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="sansserif-slanted-1"></span><h2 class="chapter">24 <span class="sansserif">sansserif</span> <i>slanted</i></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
index 4d2545fa3f..97feded690 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/someone_0040somewher-no_005fexplain_0040there.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="someone@somewher (the someone) no_explain@there (no_explain@there) (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile" rel="next" title="f--ile1 f--ile">
-<link href="CCC-CCC-DDD.html#CCC-CCC-DDD" rel="prev" title="CCC (rrr) CCC DDD">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="f_002d_002dile1-f_002d_002dile.html" rel="next" title="f--ile1 f--ile">
+<link href="CCC-CCC-DDD.html" rel="prev" title="CCC (rrr) CCC DDD">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="someone_0040somewher-no_005fexplain_0040there"></span><div class="header">
<p>
-Next: <a href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile" accesskey="n" rel="next"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Previous: <a href="CCC-CCC-DDD.html#CCC-CCC-DDD" accesskey="p" rel="prev"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="f_002d_002dile1-f_002d_002dile.html" accesskey="n" rel="next"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Previous: <a href="CCC-CCC-DDD.html" accesskey="p" rel="prev"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="someone_0040somewher-no_005fexplain_0040there-1"></span><h2 class="chapter">18 <a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
index 861f355182..de81125133 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
index c32be4c988..f144f296b3 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl
@@ -11612,7 +11612,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11629,7 +11641,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 127,
+ 'line_nr' => 128,
'macro' => ''
},
'parent' => {}
@@ -11733,7 +11745,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11750,7 +11774,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 128,
+ 'line_nr' => 130,
'macro' => ''
},
'parent' => {}
@@ -11892,7 +11916,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -11909,7 +11945,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 129,
+ 'line_nr' => 132,
'macro' => ''
},
'parent' => {}
@@ -12061,7 +12097,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 131,
+ 'line_nr' => 134,
'macro' => ''
},
'parent' => {}
@@ -12156,7 +12192,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 133,
+ 'line_nr' => 136,
'macro' => ''
},
'parent' => {}
@@ -12298,7 +12334,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12315,7 +12363,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 134,
+ 'line_nr' => 138,
'macro' => ''
},
'parent' => {}
@@ -12419,7 +12467,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12436,7 +12496,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 135,
+ 'line_nr' => 140,
'macro' => ''
},
'parent' => {}
@@ -12711,7 +12771,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -12733,7 +12805,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 136,
+ 'line_nr' => 142,
'macro' => ''
},
'parent' => {}
@@ -13015,7 +13087,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13037,7 +13121,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 137,
+ 'line_nr' => 144,
'macro' => ''
},
'parent' => {}
@@ -13209,7 +13293,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13231,7 +13327,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 138,
+ 'line_nr' => 146,
'macro' => ''
},
'parent' => {}
@@ -13335,7 +13431,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13352,7 +13460,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 139,
+ 'line_nr' => 148,
'macro' => ''
},
'parent' => {}
@@ -13475,7 +13583,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13492,7 +13612,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 140,
+ 'line_nr' => 150,
'macro' => ''
},
'parent' => {}
@@ -13615,7 +13735,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13642,7 +13774,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 141,
+ 'line_nr' => 152,
'macro' => ''
},
'parent' => {}
@@ -13651,7 +13783,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13686,7 +13830,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 142,
+ 'line_nr' => 154,
'macro' => ''
},
'parent' => {}
@@ -13768,7 +13912,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13803,7 +13959,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 144,
+ 'line_nr' => 157,
'macro' => ''
},
'parent' => {}
@@ -13885,7 +14041,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -13928,7 +14096,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 146,
+ 'line_nr' => 160,
'macro' => ''
},
'parent' => {}
@@ -13988,7 +14156,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14013,7 +14193,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 148,
+ 'line_nr' => 163,
'macro' => ''
},
'parent' => {}
@@ -14108,7 +14288,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14134,7 +14326,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 149,
+ 'line_nr' => 165,
'macro' => ''
},
'parent' => {}
@@ -14162,7 +14354,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14192,7 +14396,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 151,
+ 'line_nr' => 168,
'macro' => ''
},
'parent' => {}
@@ -14448,7 +14652,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14470,7 +14686,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 152,
+ 'line_nr' => 170,
'macro' => ''
},
'parent' => {}
@@ -14660,7 +14876,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14686,7 +14914,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 153,
+ 'line_nr' => 172,
'macro' => ''
},
'parent' => {}
@@ -14715,7 +14943,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14737,7 +14977,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 154,
+ 'line_nr' => 174,
'macro' => ''
},
'parent' => {}
@@ -14789,7 +15029,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14811,7 +15063,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 155,
+ 'line_nr' => 176,
'macro' => ''
},
'parent' => {}
@@ -14839,7 +15091,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14861,7 +15125,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 156,
+ 'line_nr' => 178,
'macro' => ''
},
'parent' => {}
@@ -14913,7 +15177,19 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'parent' => {},
'text' => '
'
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -14935,7 +15211,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
'contents' => [],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 157,
+ 'line_nr' => 180,
'macro' => ''
},
'parent' => {}
@@ -17700,120 +17976,6 @@ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'conten
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[16];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -17826,13 +17988,25 @@ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'conten
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[7];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[8];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[5];
@@ -17865,7 +18039,7 @@ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'conten
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[9];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
@@ -17882,687 +18056,835 @@ $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'conten
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[21] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[21];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[22] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[22];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[23] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[23];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[24] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[24];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[25] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[25];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[26] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[26];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[17];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[19];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[23];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[31];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[39];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[41];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[43];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[13];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[14];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[15];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[16];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[45];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[5];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[6];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[8];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[9];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[10];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[11];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[12];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[31]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[47];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[32]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[33]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[49];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[34]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[35]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[51];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[36]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[37]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[53];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[38]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[39]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[2];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[3];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[4];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'args'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[40]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'contents'}[41]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[21] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[21];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[22] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[22];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[23] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[23];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[24] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[24];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[25] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[25];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[26] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[26];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[21];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[17] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[17];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[18] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[18];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[19] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[20] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[20];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[19]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[20]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[23];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[21]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[22]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[25];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[23]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[24]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[27];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[25]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[26]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[29];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[27]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[28]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[31];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[29]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[30]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[33];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[31]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[32]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'explanation_contents'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[35];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[33]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[34]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[37];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[35]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[36]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[39];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[37]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[38]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[41];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[39]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[40]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[43];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[13] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[13];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[14] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[14];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[15] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[15];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[16] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[16];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[41]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[42]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[45];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[5] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[6] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[7] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[8] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[8];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[9] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[10] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[10];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[11] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[11];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[12] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[12];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[43]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[44]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[47];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[45]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[46]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[49];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[47]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[48]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[51];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[49]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[50]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[53];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[51]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[52]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'args'}[2]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'label'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[55];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[1] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[2] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[3] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[4] = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'contents'}[1]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[53]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
+$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'contents'}[54]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56];
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'line_nr'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[56]{'parent'} = $result_trees{'at_commands_in_refs_utf8'};
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[57]{'args'}[0]{'parent'} = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[57];
@@ -18688,32 +19010,55 @@ $result_texis{'at_commands_in_refs_utf8'} = '@setfilename at_commands_in_refs_ut
@ref{@- @{ @}}
@ref{@ @ @! @* @. @: .@: @? @@}
+
@ref{@atchar{} @lbracechar{} @rbracechar{} @backslashchar{} @hashchar{}}
+
@ref{@LaTeX{} @TeX{} @bullet{} @comma{} @copyright{} @dots{} @enddots{}}
+
@ref{@equiv{} @error{} @euro{} @exclamdown{} @expansion{} @minus{}}
@ref{@geq{} @leq{} @arrow{}}
@ref{@ordf{} @ordm{} @point{} @pounds{} @print{} @questiondown{} @registeredsymbol{}}
+
@ref{@result{} @textdegree{} a@tie{}b @today{} @aa{}}
+
@ref{@AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{} @dh{} @TH{} @th{}}
+
@ref{@"{a} @~{e} @^{@dotless{i}} @^{a} @`{a} @\'e @,{c} @={e} @ringaccent{e} @H{e} @ogonek{e}}
+
@ref{@dotaccent{e} @u{e} @ubaraccent{e} @udotaccent{e} @v{e} @dotless{j} @tieaccent{ee}}
+
@ref{@dotless{i} @`{@=E} @,{@\'C}}
+
@ref{@quotedblleft{} @quotedblright{} @quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{}}
+
@ref{@guillemetleft{} @guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{} @guilsinglright{}}
+
@ref{`` \'\' --- -- ` \'}
+
@ref{@acronym{AAA, fff} @acronym{AAA} @acronym{BBB}}
+
@ref{@abbr{CCC, rrr} @abbr{CCC} @abbr{DDD}}
+
@ref{@email{someone@@somewher, the someone} @email{no_explain@@there}}
+
@ref{@image{f--ile1} @image{f--ile,aze,az,alt,e--xt}}
+
@ref{@verb{. @ {} . .}}
+
@ref{@cite{cite @asis{asis}} @w{in @@w @b{b}} @r{in r} @sc{sc} @strong{str} @t{t} @var{var} @dfn{dfn} @i{i}}
+
@ref{@env{env} @code{code} @option{option} @samp{samp} @command{command} @file{file} @kbd{C-x @key{ESC}}}
+
@ref{8.27@dmn{in}}
+
@ref{@sansserif{sansserif} @slanted{slanted}}
+
@ref{@indicateurl{indicateurl}}
+
@ref{@sub{g}H 3@sup{rd}}
+
@ref{@url{http://somewhere_aaa} @url{url, text} @uref{/man.cgi/1/ls,,ls}}
@bye
@@ -18839,32 +19184,55 @@ Top
!
. . ? @
+
@ { } \\ #
+
LaTeX TeX * , (C) ... ...
+
== error--> Euro ! ==> -
>= <= ->
a o -!- # -| ? (R)
+
=> o a b a sunny day aa
+
AA ae oe AE OE /o /O ss /l /L D d TH th
+
a" e~ i^ a^ a` e\' c, e= e* e\'\' e;
+
e. e( e_ .e e< j ee[
+
i E=` C\',
+
`` \'\' ` \' ,, ,
+
<< >> << >> < >
+
" " -- - ` \'
+
AAA (fff) AAA BBB
+
CCC (rrr) CCC DDD
+
the someone no_explain@there
+
f--ile1 f--ile
+
@ {} .
+
cite asis in @w b in r SC str t var dfn i
+
env code option samp command file C-x ESC
+
8.27in
+
sansserif slanted
+
indicateurl
+
gH 3rd
+
http://somewhere_aaa url (text) ls
';
@@ -19999,18 +20367,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'};
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'at_commands_in_refs_utf8'};
@@ -20067,7 +20424,6 @@ $result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_next'}{'node_up'}
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_prev'} = $result_nodes{'at_commands_in_refs_utf8'};
$result_nodes{'at_commands_in_refs_utf8'}{'menu_child'}{'node_up'} = $result_nodes{'at_commands_in_refs_utf8'};
$result_nodes{'at_commands_in_refs_utf8'}{'node_next'} = $result_nodes{'at_commands_in_refs_utf8'}{'menu_child'};
-$result_nodes{'at_commands_in_refs_utf8'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'at_commands_in_refs_utf8'};
$result_menus{'at_commands_in_refs_utf8'} = {
'cmdname' => 'node',
@@ -20473,10 +20829,10 @@ $result_errors{'at_commands_in_refs_utf8'} = [
'type' => 'warning'
},
{
- 'error_line' => ':149: warning: @verb should not appear in @ref
+ 'error_line' => ':165: warning: @verb should not appear in @ref
',
'file_name' => '',
- 'line_nr' => 149,
+ 'line_nr' => 165,
'macro' => '',
'text' => '@verb should not appear in @ref',
'type' => 'warning'
@@ -20513,10 +20869,10 @@ $result_converted_errors{'file_html'}->{'at_commands_in_refs_utf8'} = [
'type' => 'warning'
},
{
- 'error_line' => ':148: warning: @image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'
+ 'error_line' => ':163: warning: @image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'
',
'file_name' => '',
- 'line_nr' => 148,
+ 'line_nr' => 163,
'macro' => '',
'text' => '@image file `f--ile1\' (for HTML) not found, using `f--ile1.jpg\'',
'type' => 'warning'
@@ -20580,10 +20936,10 @@ $result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
'type' => 'warning'
},
{
- 'error_line' => ':157: warning: @ref node name should not contain `:\'
+ 'error_line' => ':180: warning: @ref node name should not contain `:\'
',
'file_name' => '',
- 'line_nr' => 157,
+ 'line_nr' => 180,
'macro' => '',
'text' => '@ref node name should not contain `:\'',
'type' => 'warning'
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
index db2f4320ff..48ed6dfec6 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/----_0021---_002e--_002e-_003f-_0040.html
@@ -12,10 +12,10 @@
. . ? @ (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" rel="next" title="@ { } \ #">
-<link href="-_007b-_007d.html#-_007b-_007d" rel="prev" title=" { }">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_0040-_007b-_007d-_005c-_0023.html" rel="next" title="@ { } \ #">
+<link href="-_007b-_007d.html" rel="prev" title=" { }">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -41,7 +41,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="----_0021---_002e--_002e-_003f-_0040"></span><div class="header">
<p>
-Next: <a href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" accesskey="n" rel="next">@ { } \ #</a>, Previous: <a href="-_007b-_007d.html#-_007b-_007d" accesskey="p" rel="prev"> { }</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="n" rel="next">@ { } \ #</a>, Previous: <a href="-_007b-_007d.html" accesskey="p" rel="prev"> { }</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="----_0021---_002e--_002e-_003f-_0040-1"></span><h2 class="chapter">2 &nbsp; &nbsp; ! <br> . . ? @</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
index e7d271da21..9b3a92650b 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_0040-_007b_007d-_002e-.html
@@ -9,10 +9,10 @@
<meta name="keywords" content=" @ {} . (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" rel="next" title="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i">
-<link href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile" rel="prev" title="f--ile1 f--ile">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" rel="next" title="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i">
+<link href="f_002d_002dile1-f_002d_002dile.html" rel="prev" title="f--ile1 f--ile">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="-_0040-_007b_007d-_002e-"></span><div class="header">
<p>
-Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="n" rel="next"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile" accesskey="p" rel="prev"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" accesskey="n" rel="next"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Previous: <a href="f_002d_002dile1-f_002d_002dile.html" accesskey="p" rel="prev"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="-_0040-_007b_007d-_002e--1"></span><h2 class="chapter">20 <tt> @ {} . </tt></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
index f948adc0b5..9243750206 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/-_007b-_007d.html
@@ -9,11 +9,11 @@
<meta name="keywords" content=" { } (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" rel="next" title="&nbsp; &nbsp; !
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="----_0021---_002e--_002e-_003f-_0040.html" rel="next" title="&nbsp; &nbsp; !
. . ? @">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="-_007b-_007d"></span><div class="header">
<p>
-Next: <a href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" accesskey="n" rel="next">&nbsp; &nbsp; ! <br> . . ? @</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="n" rel="next">&nbsp; &nbsp; ! <br> . . ? @</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="-_007b-_007d-1"></span><h2 class="chapter">1 { }</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html
index 9710c3d28a..499e231096 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="8.27in (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="sansserif-slanted.html#sansserif-slanted" rel="next" title="sansserif slanted">
-<link href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC" rel="prev" title="env code option samp command file C-x ESC">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="sansserif-slanted.html" rel="next" title="sansserif slanted">
+<link href="env-code-option-samp-command-file-C_002dx-ESC.html" rel="prev" title="env code option samp command file C-x ESC">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t8_002e27in"></span><div class="header">
<p>
-Next: <a href="sansserif-slanted.html#sansserif-slanted" accesskey="n" rel="next"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC" accesskey="p" rel="prev"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="sansserif-slanted.html" accesskey="n" rel="next"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" accesskey="p" rel="prev"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t8_002e27in-1"></span><h2 class="chapter">23 8.27in</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
index 3ca59c9d68..61fdb786e1 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" rel="next" title="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
-<link href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" rel="prev" title="&rArr; &deg; a&nbsp;b a sunny day &aring;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="next" title="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
+<link href="_21d2-_00b0-a-b--aa.html" rel="prev" title="&rArr; &deg; a&nbsp;b a sunny day &aring;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"></span><div class="header">
<p>
-Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" accesskey="p" rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="n" rel="next">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, Previous: <a href="_21d2-_00b0-a-b--aa.html" accesskey="p" rel="prev">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th"></span><h2 class="chapter">9 &Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
index 6b45bba13c..9e4444086e 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/AAA-AAA-BBB.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="AAA (fff) AAA BBB (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="CCC-CCC-DDD.html#CCC-CCC-DDD" rel="next" title="CCC (rrr) CCC DDD">
-<link href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" rel="prev" title="`` '' --- -- ` '">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="CCC-CCC-DDD.html" rel="next" title="CCC (rrr) CCC DDD">
+<link href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" rel="prev" title="`` '' --- -- ` '">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="AAA-AAA-BBB"></span><div class="header">
<p>
-Next: <a href="CCC-CCC-DDD.html#CCC-CCC-DDD" accesskey="n" rel="next"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, Previous: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" accesskey="p" rel="prev">`` '' --- -- ` '</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="CCC-CCC-DDD.html" accesskey="n" rel="next"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, Previous: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" accesskey="p" rel="prev">`` '' --- -- ` '</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="AAA-AAA-BBB-1"></span><h2 class="chapter">16 <acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
index a00b33909f..0187262c4c 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/CCC-CCC-DDD.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="CCC (rrr) CCC DDD (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there" rel="next" title="someone@somewher (the someone) no_explain@there (no_explain@there)">
-<link href="AAA-AAA-BBB.html#AAA-AAA-BBB" rel="prev" title="AAA (fff) AAA BBB">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="someone_0040somewher-no_005fexplain_0040there.html" rel="next" title="someone@somewher (the someone) no_explain@there (no_explain@there)">
+<link href="AAA-AAA-BBB.html" rel="prev" title="AAA (fff) AAA BBB">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="CCC-CCC-DDD"></span><div class="header">
<p>
-Next: <a href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there" accesskey="n" rel="next"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>, Previous: <a href="AAA-AAA-BBB.html#AAA-AAA-BBB" accesskey="p" rel="prev"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="n" rel="next"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>, Previous: <a href="AAA-AAA-BBB.html" accesskey="p" rel="prev"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="CCC-CCC-DDD-1"></span><h2 class="chapter">17 <abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
index 3b81488f19..0fdb29009e 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="LaTeX TeX &bull; , &copy; &hellip; ... (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" rel="next" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
-<link href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" rel="prev" title="@ { } \ #">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" rel="next" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
+<link href="_0040-_007b-_007d-_005c-_0023.html" rel="prev" title="@ { } \ #">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e"></span><div class="header">
<p>
-Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Previous: <a href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" accesskey="p" rel="prev">@ { } \ #</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="n" rel="next">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Previous: <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="p" rel="prev">@ { } \ #</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e-1"></span><h2 class="chapter">4 LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
index abc32ee567..91b8eb978c 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0040-_007b-_007d-_005c-_0023.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="@ { } \ # (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" rel="next" title="LaTeX TeX &bull; , &copy; &hellip; ...">
-<link href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" rel="prev" title="&nbsp; &nbsp; !
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" rel="next" title="LaTeX TeX &bull; , &copy; &hellip; ...">
+<link href="----_0021---_002e--_002e-_003f-_0040.html" rel="prev" title="&nbsp; &nbsp; !
. . ? @">
<style type="text/css">
<!--
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0040-_007b-_007d-_005c-_0023"></span><div class="header">
<p>
-Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Previous: <a href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" accesskey="p" rel="prev">&nbsp; &nbsp; ! <br> . . ? @</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="n" rel="next">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Previous: <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="p" rel="prev">&nbsp; &nbsp; ! <br> . . ? @</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_0040-_007b-_007d-_005c-_0023-1"></span><h2 class="chapter">3 @ { } \ #</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
index e7979279cf..7315c99b68 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="`` '' --- -- ` ' (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="AAA-AAA-BBB.html#AAA-AAA-BBB" rel="next" title="AAA (fff) AAA BBB">
-<link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" rel="prev" title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="AAA-AAA-BBB.html" rel="next" title="AAA (fff) AAA BBB">
+<link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" rel="prev" title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"></span><div class="header">
<p>
-Next: <a href="AAA-AAA-BBB.html#AAA-AAA-BBB" accesskey="n" rel="next"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Previous: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="p" rel="prev">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="AAA-AAA-BBB.html" accesskey="n" rel="next"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>, Previous: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="p" rel="prev">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027-1"></span><h2 class="chapter">15 &ldquo; &rdquo; &mdash; &ndash; &lsquo; &rsquo;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
index 7bb14965bd..d7bde3f641 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" rel="next" title="&rArr; &deg; a&nbsp;b a sunny day &aring;">
-<link href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" rel="prev" title="&ge; &le; &rarr;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_21d2-_00b0-a-b--aa.html" rel="next" title="&rArr; &deg; a&nbsp;b a sunny day &aring;">
+<link href="_2265-_2264-_2192.html" rel="prev" title="&ge; &le; &rarr;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae"></span><div class="header">
<p>
-Next: <a href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" accesskey="n" rel="next">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_21d2-_00b0-a-b--aa.html" accesskey="n" rel="next">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>, Previous: <a href="_2265-_2264-_2192.html" accesskey="p" rel="prev">&ge; &le; &rarr;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae-1"></span><h2 class="chapter">7 &ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
index 7645efc189..2b9a10cd78 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_00ab-_00bb-_00ab-_00bb-_2039-_203a.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" rel="next" title="`` '' --- -- ` '">
-<link href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a" rel="prev" title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" rel="next" title="`` '' --- -- ` '">
+<link href="_201c-_201d-_2018-_2019-_201e-_201a.html" rel="prev" title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a"></span><div class="header">
<p>
-Next: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027" accesskey="n" rel="next">`` '' --- -- ` '</a>, Previous: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="p" rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html" accesskey="n" rel="next">`` '' --- -- ` '</a>, Previous: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="p" rel="prev">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a-1"></span><h2 class="chapter">14 &laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
index 04e5eb6f1e..f7341aeae6 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_201c-_201d-_2018-_2019-_201e-_201a.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" rel="next" title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
-<link href="i-E-C.html#g_t_0131-_1e14-_1e08" rel="prev" title="i &#274;` &#262;,">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" rel="next" title="&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;">
+<link href="i-E-C.html" rel="prev" title="i &#274;` &#262;,">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a"></span><div class="header">
<p>
-Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a" accesskey="n" rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a href="i-E-C.html#g_t_0131-_1e14-_1e08" accesskey="p" rel="prev">i &#274;` &#262;,</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html" accesskey="n" rel="next">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>, Previous: <a href="i-E-C.html" accesskey="p" rel="prev">i &#274;` &#262;,</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_201c-_201d-_2018-_2019-_201e-_201a-1"></span><h2 class="chapter">13 &ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
index 2e5ae4ce5d..f2bb61e689 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_21d2-_00b0-a-b--aa.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&rArr; &deg; a&nbsp;b a sunny day &aring; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" rel="next" title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;">
-<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" rel="prev" title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="next" title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;">
+<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" rel="prev" title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_21d2-_00b0-a-b--_00e5"></span><div class="header">
<p>
-Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" accesskey="n" rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="p" rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="n" rel="next">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Previous: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="p" rel="prev">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_21d2-_00b0-a-b--aa"></span><h2 class="chapter">8 &rArr; &deg; a&nbsp;b a sunny day &aring;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
index 795c5f9e28..cc0ed8dcec 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&equiv; error&rarr; &euro; &iexcl; &rarr; - (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" rel="next" title="&ge; &le; &rarr;">
-<link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" rel="prev" title="LaTeX TeX &bull; , &copy; &hellip; ...">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_2265-_2264-_2192.html" rel="next" title="&ge; &le; &rarr;">
+<link href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" rel="prev" title="LaTeX TeX &bull; , &copy; &hellip; ...">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212"></span><div class="header">
<p>
-Next: <a href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" accesskey="n" rel="next">&ge; &le; &rarr;</a>, Previous: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="p" rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_2265-_2264-_2192.html" accesskey="n" rel="next">&ge; &le; &rarr;</a>, Previous: <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="p" rel="prev">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212-1"></span><h2 class="chapter">5 &equiv; error&rarr; &euro; &iexcl; &rarr; -</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
index 3f3a22c2de..8d4db639d9 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/_2265-_2264-_2192.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&ge; &le; &rarr; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" rel="next" title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
-<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" rel="prev" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" rel="next" title="&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;">
+<link href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" rel="prev" title="&equiv; error&rarr; &euro; &iexcl; &rarr; -">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_2265-_2264-_2192"></span><div class="header">
<p>
-Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="n" rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="p" rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="n" rel="next">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>, Previous: <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="p" rel="prev">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="g_t_2265-_2264-_2192-1"></span><h2 class="chapter">6 &ge; &le; &rarr;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
index 74b11a6597..8765a231df 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/a-e-i-a-a-e-c-e-e-e-e.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" rel="next" title="&#279; &#277; e_ &#7865; &#283; j ee[">
-<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" rel="prev" title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="e-e-e-e-e-j-ee.html" rel="next" title="&#279; &#277; e_ &#7865; &#283; j ee[">
+<link href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" rel="prev" title="&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"></span><div class="header">
<p>
-Next: <a href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" accesskey="n" rel="next">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Previous: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="e-e-e-e-e-j-ee.html" accesskey="n" rel="next">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Previous: <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="p" rel="prev">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="a-e-i-a-a-e-c-e-e-e-e"></span><h2 class="chapter">10 &auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
index eee05758a9..c75b3f7cbc 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC" rel="next" title="env code option samp command file C-x ESC">
-<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" rel="prev" title=" @ {} . ">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="env-code-option-samp-command-file-C_002dx-ESC.html" rel="next" title="env code option samp command file C-x ESC">
+<link href="-_0040-_007b_007d-_002e-.html" rel="prev" title=" @ {} . ">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></span><div class="header">
<p>
-Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" rel="next"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Previous: <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="p" rel="prev"><tt> @ {} . </tt></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="env-code-option-samp-command-file-C_002dx-ESC.html" accesskey="n" rel="next"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Previous: <a href="-_0040-_007b_007d-_002e-.html" accesskey="p" rel="prev"><tt> @ {} . </tt></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></span><h2 class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
index d4107ca0f1..44405ef895 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/e-e-e-e-e-j-ee.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&#279; &#277; e_ &#7865; &#283; j ee[ (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="i-E-C.html#g_t_0131-_1e14-_1e08" rel="next" title="i &#274;` &#262;,">
-<link href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" rel="prev" title="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="i-E-C.html" rel="next" title="i &#274;` &#262;,">
+<link href="a-e-i-a-a-e-c-e-e-e-e.html" rel="prev" title="&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361"></span><div class="header">
<p>
-Next: <a href="i-E-C.html#g_t_0131-_1e14-_1e08" accesskey="n" rel="next">i &#274;` &#262;,</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119" accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="i-E-C.html" accesskey="n" rel="next">i &#274;` &#262;,</a>, Previous: <a href="a-e-i-a-a-e-c-e-e-e-e.html" accesskey="p" rel="prev">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="e-e-e-e-e-j-ee"></span><h2 class="chapter">11 &#279; &#277; e_ &#7865; &#283; j ee[</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
index 79775ce29b..ca60181a3a 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="env code option samp command file C-x ESC (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="8_002e27in.html#g_t8_002e27in" rel="next" title="8.27in">
-<link href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" rel="prev" title="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="8_002e27in.html" rel="next" title="8.27in">
+<link href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" rel="prev" title="cite asis in&nbsp;@w&nbsp;b in r SC str t var dfn i">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="env-code-option-samp-command-file-C_002dx-ESC"></span><div class="header">
<p>
-Next: <a href="8_002e27in.html#g_t8_002e27in" accesskey="n" rel="next">8.27in</a>, Previous: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="p" rel="prev"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="8_002e27in.html" accesskey="n" rel="next">8.27in</a>, Previous: <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html" accesskey="p" rel="prev"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="env-code-option-samp-command-file-C_002dx-ESC-1"></span><h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
index 37b0ffa459..494164f811 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/f_002d_002dile1-f_002d_002dile.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="f--ile1 f--ile (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" rel="next" title=" @ {} . ">
-<link href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there" rel="prev" title="someone@somewher (the someone) no_explain@there (no_explain@there)">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="-_0040-_007b_007d-_002e-.html" rel="next" title=" @ {} . ">
+<link href="someone_0040somewher-no_005fexplain_0040there.html" rel="prev" title="someone@somewher (the someone) no_explain@there (no_explain@there)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="f_002d_002dile1-f_002d_002dile"></span><div class="header">
<p>
-Next: <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="n" rel="next"><tt> @ {} . </tt></a>, Previous: <a href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there" accesskey="p" rel="prev"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="-_0040-_007b_007d-_002e-.html" accesskey="n" rel="next"><tt> @ {} . </tt></a>, Previous: <a href="someone_0040somewher-no_005fexplain_0040there.html" accesskey="p" rel="prev"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="f_002d_002dile1-f_002d_002dile-1"></span><h2 class="chapter">19 <img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html
index 9ab98b6b6b..ce68ac373f 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/gH-3rd.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="gH 3rd (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls" rel="next" title="http://somewhere_aaa (http://somewhere_aaa) text (url) ls (/man.cgi/1/ls)">
-<link href="indicateurl.html#indicateurl" rel="prev" title="&lsquo;indicateurl&rsquo;">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html" rel="next" title="http://somewhere_aaa (http://somewhere_aaa) text (url) ls (/man.cgi/1/ls)">
+<link href="indicateurl.html" rel="prev" title="&lsquo;indicateurl&rsquo;">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="gH-3rd"></span><div class="header">
<p>
-Next: <a href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls" accesskey="n" rel="next"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>, Previous: <a href="indicateurl.html#indicateurl" accesskey="p" rel="prev">&lsquo;<code>indicateurl</code>&rsquo;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html" accesskey="n" rel="next"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>, Previous: <a href="indicateurl.html" accesskey="p" rel="prev">&lsquo;<code>indicateurl</code>&rsquo;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="gH-3rd-1"></span><h2 class="chapter">26 <sub>g</sub>H 3<sup>rd</sup></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
index 9247eb85b2..4e3451d006 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
@@ -9,9 +9,9 @@
<meta name="keywords" content="http://somewhere_aaa (http://somewhere_aaa) text (url) ls (/man.cgi/1/ls) (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="gH-3rd.html#gH-3rd" rel="prev" title="gH 3rd">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="gH-3rd.html" rel="prev" title="gH 3rd">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -37,41 +37,64 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"></span><div class="header">
<p>
-Previous: <a href="gH-3rd.html#gH-3rd" accesskey="p" rel="prev"><sub>g</sub>H 3<sup>rd</sup></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Previous: <a href="gH-3rd.html" accesskey="p" rel="prev"><sub>g</sub>H 3<sup>rd</sup></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls-1"></span><h2 class="chapter">27 <a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></h2>
-<p><a href="-_007b-_007d.html#-_007b-_007d"> { }</a>
-</p>
-<p><a href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040">&nbsp; &nbsp; ! <br> . . ? @</a>
-<a href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023">@ { } \ #</a>
-<a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>
-<a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>
-</p>
-<p><a href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192">&ge; &le; &rarr;</a>
-</p>
-<p><a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>
-<a href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>
-<a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>
-<a href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>
-<a href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">&#279; &#277; e_ &#7865; &#283; j ee[</a>
-<a href="i-E-C.html#g_t_0131-_1e14-_1e08">i &#274;` &#262;,</a>
-<a href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
-<a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>
-<a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">`` '' --- -- ` '</a>
-<a href="AAA-AAA-BBB.html#AAA-AAA-BBB"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>
-<a href="CCC-CCC-DDD.html#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
-<a href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>
-<a href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>
-<a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a>
-<a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>
-<a href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>
-<a href="8_002e27in.html#g_t8_002e27in">8.27in</a>
-<a href="sansserif-slanted.html#sansserif-slanted"><span class="sansserif">sansserif</span> <i>slanted</i></a>
-<a href="indicateurl.html#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a>
-<a href="gH-3rd.html#gH-3rd"><sub>g</sub>H 3<sup>rd</sup></a>
-<a href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>
+<p><a href="-_007b-_007d.html"> { }</a>
+</p>
+<p><a href="----_0021---_002e--_002e-_003f-_0040.html">&nbsp; &nbsp; ! <br> . . ? @</a>
+</p>
+<p><a href="_0040-_007b-_007d-_005c-_0023.html">@ { } \ #</a>
+</p>
+<p><a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a>
+</p>
+<p><a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a>
+</p>
+<p><a href="_2265-_2264-_2192.html">&ge; &le; &rarr;</a>
+</p>
+<p><a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a>
+</p>
+<p><a href="_21d2-_00b0-a-b--aa.html">&rArr; &deg; a&nbsp;b a sunny day &aring;</a>
+</p>
+<p><a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a>
+</p>
+<p><a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a>
+</p>
+<p><a href="e-e-e-e-e-j-ee.html">&#279; &#277; e_ &#7865; &#283; j ee[</a>
+</p>
+<p><a href="i-E-C.html">i &#274;` &#262;,</a>
+</p>
+<p><a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>
+</p>
+<p><a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a>
+</p>
+<p><a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html">`` '' --- -- ` '</a>
+</p>
+<p><a href="AAA-AAA-BBB.html"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a>
+</p>
+<p><a href="CCC-CCC-DDD.html"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>
+</p>
+<p><a href="someone_0040somewher-no_005fexplain_0040there.html"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a>
+</p>
+<p><a href="f_002d_002dile1-f_002d_002dile.html"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>
+</p>
+<p><a href="-_0040-_007b_007d-_002e-.html"><tt> @ {} . </tt></a>
+</p>
+<p><a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>
+</p>
+<p><a href="env-code-option-samp-command-file-C_002dx-ESC.html"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>
+</p>
+<p><a href="8_002e27in.html">8.27in</a>
+</p>
+<p><a href="sansserif-slanted.html"><span class="sansserif">sansserif</span> <i>slanted</i></a>
+</p>
+<p><a href="indicateurl.html">&lsquo;<code>indicateurl</code>&rsquo;</a>
+</p>
+<p><a href="gH-3rd.html"><sub>g</sub>H 3<sup>rd</sup></a>
+</p>
+<p><a href="#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a>
</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
index e1f5d3a4db..cc7f34c7a7 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/i-E-C.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="i &#274;` &#262;, (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a" rel="next" title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
-<link href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" rel="prev" title="&#279; &#277; e_ &#7865; &#283; j ee[">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_201c-_201d-_2018-_2019-_201e-_201a.html" rel="next" title="&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;">
+<link href="e-e-e-e-e-j-ee.html" rel="prev" title="&#279; &#277; e_ &#7865; &#283; j ee[">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0131-_1e14-_1e08"></span><div class="header">
<p>
-Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a" accesskey="n" rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" accesskey="p" rel="prev">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_201c-_201d-_2018-_2019-_201e-_201a.html" accesskey="n" rel="next">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a>, Previous: <a href="e-e-e-e-e-j-ee.html" accesskey="p" rel="prev">&#279; &#277; e_ &#7865; &#283; j ee[</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="i-E-C"></span><h2 class="chapter">12 i &#274;` &#262;,</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
index 945b47007a..a45cb89753 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
@@ -10,8 +10,7 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="-_007b-_007d.html#-_007b-_007d" rel="next" title=" { }">
+<link href="-_007b-_007d.html" rel="next" title=" { }">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,72 +37,72 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="-_007b-_007d.html#-_007b-_007d" accesskey="n" rel="next"> { }</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
</div>
<hr>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="-_007b-_007d.html#-_007b-_007d" accesskey="1">{ }</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="-_007b-_007d.html" accesskey="1">{ }</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="----_0021---_002e--_002e-_003f-_0040.html#----_0021---_002e--_002e-_003f-_0040" accesskey="2">&nbsp; &nbsp; ! <br> . . ? @</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="----_0021---_002e--_002e-_003f-_0040.html" accesskey="2">&nbsp; &nbsp; ! <br> . . ? @</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_0040-_007b-_007d-_005c-_0023.html#g_t_0040-_007b-_007d-_005c-_0023" accesskey="3">@ { } \ #</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_0040-_007b-_007d-_005c-_0023.html" accesskey="3">@ { } \ #</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html#LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e" accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e.html" accesskey="4">LaTeX TeX &bull; , &copy; &hellip; <small class="enddots">...</small></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html#g_t_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212" accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212.html" accesskey="5">&equiv; error&rarr; &euro; &iexcl; &rarr; -</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_2265-_2264-_2192.html#g_t_2265-_2264-_2192" accesskey="6">&ge; &le; &rarr;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_2265-_2264-_2192.html" accesskey="6">&ge; &le; &rarr;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html#g_t_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae" accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae.html" accesskey="7">&ordf; &ordm; &lowast; &pound; -| &iquest; &reg;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_21d2-_00b0-a-b--aa.html#g_t_21d2-_00b0-a-b--_00e5" accesskey="8">&rArr; &deg; a&nbsp;b a sunny day &aring;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_21d2-_00b0-a-b--aa.html" accesskey="8">&rArr; &deg; a&nbsp;b a sunny day &aring;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html#g_t_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe" accesskey="9">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="AA-ae-oe-AE-OE-o-O-ss-l-L-D-d-TH-th.html" accesskey="9">&Aring; &aelig; &oelig; &AElig; &OElig; &oslash; &Oslash; &szlig; &#322; &#321; &ETH; &eth; &THORN; &thorn;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="a-e-i-a-a-e-c-e-e-e-e.html#g_t_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-e-i-a-a-e-c-e-e-e-e.html">&auml; &#7869; &icirc; &acirc; &agrave; &eacute; &ccedil; &#275; e* e'' &#281;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="e-e-e-e-e-j-ee.html#g_t_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361">&#279; &#277; e_ &#7865; &#283; j ee[</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="e-e-e-e-e-j-ee.html">&#279; &#277; e_ &#7865; &#283; j ee[</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="i-E-C.html#g_t_0131-_1e14-_1e08">i &#274;` &#262;,</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="i-E-C.html">i &#274;` &#262;,</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_201c-_201d-_2018-_2019-_201e-_201a.html#g_t_201c-_201d-_2018-_2019-_201e-_201a">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_201c-_201d-_2018-_2019-_201e-_201a.html">&ldquo; &rdquo; &lsquo; &rsquo; &bdquo; &sbquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html#g_t_00ab-_00bb-_00ab-_00bb-_2039-_203a">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_00ab-_00bb-_00ab-_00bb-_2039-_203a.html">&laquo; &raquo; &laquo; &raquo; &lsaquo; &rsaquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html#g_t_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027">`` '' --- -- ` '</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027.html">`` '' --- -- ` '</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="AAA-AAA-BBB.html#AAA-AAA-BBB"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="AAA-AAA-BBB.html"><acronym title="fff">AAA</acronym> (fff) <acronym title="fff">AAA</acronym> <acronym>BBB</acronym></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="CCC-CCC-DDD.html#CCC-CCC-DDD"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="CCC-CCC-DDD.html"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="someone_0040somewher-no_005fexplain_0040there.html#someone_0040somewher-no_005fexplain_0040there"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="someone_0040somewher-no_005fexplain_0040there.html"><a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="f_002d_002dile1-f_002d_002dile.html"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="-_0040-_007b_007d-_002e-.html"><tt> @ {} . </tt></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="env-code-option-samp-command-file-C_002dx-ESC.html"><code>env</code> <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="8_002e27in.html#g_t8_002e27in">8.27in</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="8_002e27in.html">8.27in</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="sansserif-slanted.html#sansserif-slanted"><span class="sansserif">sansserif</span> <i>slanted</i></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="sansserif-slanted.html"><span class="sansserif">sansserif</span> <i>slanted</i></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="indicateurl.html#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="indicateurl.html">&lsquo;<code>indicateurl</code>&rsquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="gH-3rd.html#gH-3rd"><sub>g</sub>H 3<sup>rd</sup></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="gH-3rd.html"><sub>g</sub>H 3<sup>rd</sup></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html#http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html"><a href="http://somewhere_aaa">http://somewhere_aaa</a> <a href="url">text</a> <a href="/man.cgi/1/ls">ls</a></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<div class="header">
<p>
-Next: <a href="-_007b-_007d.html#-_007b-_007d" accesskey="n" rel="next"> { }</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="-_007b-_007d.html" accesskey="n" rel="next"> { }</a> &nbsp; </p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html
index 896b05808c..9a431e897c 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/indicateurl.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&lsquo;indicateurl&rsquo; (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="gH-3rd.html#gH-3rd" rel="next" title="gH 3rd">
-<link href="sansserif-slanted.html#sansserif-slanted" rel="prev" title="sansserif slanted">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="gH-3rd.html" rel="next" title="gH 3rd">
+<link href="sansserif-slanted.html" rel="prev" title="sansserif slanted">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="indicateurl"></span><div class="header">
<p>
-Next: <a href="gH-3rd.html#gH-3rd" accesskey="n" rel="next"><sub>g</sub>H 3<sup>rd</sup></a>, Previous: <a href="sansserif-slanted.html#sansserif-slanted" accesskey="p" rel="prev"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="gH-3rd.html" accesskey="n" rel="next"><sub>g</sub>H 3<sup>rd</sup></a>, Previous: <a href="sansserif-slanted.html" accesskey="p" rel="prev"><span class="sansserif">sansserif</span> <i>slanted</i></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="indicateurl-1"></span><h2 class="chapter">25 &lsquo;<code>indicateurl</code>&rsquo;</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
index 728aac8249..0c491d21fe 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/sansserif-slanted.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="sansserif slanted (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="indicateurl.html#indicateurl" rel="next" title="&lsquo;indicateurl&rsquo;">
-<link href="8_002e27in.html#g_t8_002e27in" rel="prev" title="8.27in">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="indicateurl.html" rel="next" title="&lsquo;indicateurl&rsquo;">
+<link href="8_002e27in.html" rel="prev" title="8.27in">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="sansserif-slanted"></span><div class="header">
<p>
-Next: <a href="indicateurl.html#indicateurl" accesskey="n" rel="next">&lsquo;<code>indicateurl</code>&rsquo;</a>, Previous: <a href="8_002e27in.html#g_t8_002e27in" accesskey="p" rel="prev">8.27in</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="indicateurl.html" accesskey="n" rel="next">&lsquo;<code>indicateurl</code>&rsquo;</a>, Previous: <a href="8_002e27in.html" accesskey="p" rel="prev">8.27in</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="sansserif-slanted-1"></span><h2 class="chapter">24 <span class="sansserif">sansserif</span> <i>slanted</i></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
index 3c11fc743f..fe5a010121 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/someone_0040somewher-no_005fexplain_0040there.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="someone@somewher (the someone) no_explain@there (no_explain@there) (Top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile" rel="next" title="f--ile1 f--ile">
-<link href="CCC-CCC-DDD.html#CCC-CCC-DDD" rel="prev" title="CCC (rrr) CCC DDD">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="f_002d_002dile1-f_002d_002dile.html" rel="next" title="f--ile1 f--ile">
+<link href="CCC-CCC-DDD.html" rel="prev" title="CCC (rrr) CCC DDD">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="someone_0040somewher-no_005fexplain_0040there"></span><div class="header">
<p>
-Next: <a href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile" accesskey="n" rel="next"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Previous: <a href="CCC-CCC-DDD.html#CCC-CCC-DDD" accesskey="p" rel="prev"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="f_002d_002dile1-f_002d_002dile.html" accesskey="n" rel="next"><img src="f--ile1.jpg" alt="f--ile1"> <img src="f--ile.png" alt="alt"></a>, Previous: <a href="CCC-CCC-DDD.html" accesskey="p" rel="prev"><abbr title="rrr">CCC</abbr> (rrr) <abbr title="rrr">CCC</abbr> <abbr>DDD</abbr></a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="someone_0040somewher-no_005fexplain_0040there-1"></span><h2 class="chapter">18 <a href="mailto:someone@somewher">the someone</a> <a href="mailto:no_explain@there">no_explain@there</a></h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
index d929e58b68..1a4b743d57 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl
index 3504a744ad..84415c9614 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl
@@ -129,6 +129,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1713,6 +1714,7 @@ $result_sectioning{'char_latin1_latin1_in_refs'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -1851,6 +1853,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -1954,18 +1957,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'char_latin1_latin1_in_refs'};
@@ -1978,11 +1970,11 @@ $result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_next'}{'node_up'
$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_prev'} = $result_nodes{'char_latin1_latin1_in_refs'};
$result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'}{'node_up'} = $result_nodes{'char_latin1_latin1_in_refs'};
$result_nodes{'char_latin1_latin1_in_refs'}{'node_next'} = $result_nodes{'char_latin1_latin1_in_refs'}{'menu_child'};
-$result_nodes{'char_latin1_latin1_in_refs'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'char_latin1_latin1_in_refs'};
$result_menus{'char_latin1_latin1_in_refs'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
index 480b24f91c..7ee0269a88 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
@@ -9,11 +9,11 @@
<meta name="keywords" content="â ê î ô û Â Ê Î Ô Û (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="c.html#g_t_00e7" rel="next" title="ç">
-<link href="a-e-u.html#g_t_00e0-_00e8-_00f9" rel="prev" title="à è ù">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="c.html" rel="next" title="ç">
+<link href="a-e-u.html" rel="prev" title="à è ù">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"></span><div class="header">
<p>
-Next: <a href="c.html#g_t_00e7" accesskey="n" rel="next">ç</a>, Previous: <a href="a-e-u.html#g_t_00e0-_00e8-_00f9" accesskey="p" rel="prev">à è ù</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="c.html" accesskey="n" rel="next">ç</a>, Previous: <a href="a-e-u.html" accesskey="p" rel="prev">à è ù</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="a-e-i-o-u-A-E-I-O-U"></span><h2 class="chapter">4 â ê î ô û Â Ê Î Ô Û</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index 075db5cade..c3c70f7f8b 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -9,11 +9,11 @@
<meta name="keywords" content="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="e.html#g_t_00e9" rel="next" title="é">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="e.html" rel="next" title="é">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"></span><div class="header">
<p>
-Next: <a href="e.html#g_t_00e9" accesskey="n" rel="next">é</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="e.html" accesskey="n" rel="next">é</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="a-e-i-o-u-y-A-E-I-O-U"></span><h2 class="chapter">1 ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html
index 1583122727..0d2438c8da 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/a-e-u.html
@@ -9,11 +9,11 @@
<meta name="keywords" content="à è ù (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" rel="next" title="â ê î ô û Â Ê Î Ô Û">
-<link href="e.html#g_t_00e9" rel="prev" title="é">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="a-e-i-o-u-A-E-I-O-U.html" rel="next" title="â ê î ô û Â Ê Î Ô Û">
+<link href="e.html" rel="prev" title="é">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e0-_00e8-_00f9"></span><div class="header">
<p>
-Next: <a href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" accesskey="n" rel="next">â ê î ô û Â Ê Î Ô Û</a>, Previous: <a href="e.html#g_t_00e9" accesskey="p" rel="prev">é</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">â ê î ô û Â Ê Î Ô Û</a>, Previous: <a href="e.html" accesskey="p" rel="prev">é</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="a-e-u"></span><h2 class="chapter">3 à è ù</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html
index 42ceb6f8ad..f42540c5ac 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/c.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="ç (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" rel="prev" title="â ê î ô û Â Ê Î Ô Û">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="a-e-i-o-u-A-E-I-O-U.html" rel="prev" title="â ê î ô û Â Ê Î Ô Û">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,15 +38,15 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e7"></span><div class="header">
<p>
-Previous: <a href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" accesskey="p" rel="prev">â ê î ô û Â Ê Î Ô Û</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">â ê î ô û Â Ê Î Ô Û</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="c"></span><h2 class="chapter">5 ç</h2>
-<p><a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>
-<a href="e.html#g_t_00e9">é</a>
-<a href="a-e-u.html#g_t_00e0-_00e8-_00f9">à è ù</a>
-<a href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">â ê î ô û Â Ê Î Ô Û</a>
+<p><a href="a-e-i-o-u-y-A-E-I-O-U.html">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>
+<a href="e.html">é</a>
+<a href="a-e-u.html">à è ù</a>
+<a href="a-e-i-o-u-A-E-I-O-U.html">â ê î ô û Â Ê Î Ô Û</a>
<a href="#g_t_00e7">ç</a>
</p>
<span id="index-a-e-i-o-u-y"></span>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html
index 79e9b53ca9..ad8aaadc35 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/e.html
@@ -9,11 +9,11 @@
<meta name="keywords" content="é (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="a-e-u.html#g_t_00e0-_00e8-_00f9" rel="next" title="à è ù">
-<link href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" rel="prev" title="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="a-e-u.html" rel="next" title="à è ù">
+<link href="a-e-i-o-u-y-A-E-I-O-U.html" rel="prev" title="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e9"></span><div class="header">
<p>
-Next: <a href="a-e-u.html#g_t_00e0-_00e8-_00f9" accesskey="n" rel="next">à è ù</a>, Previous: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-u.html" accesskey="n" rel="next">à è ù</a>, Previous: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="e"></span><h2 class="chapter">2 é</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html
index 1ad7d3ea9e..11157d0ef4 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_html/index.html
@@ -11,8 +11,7 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" rel="next" title="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü">
+<link href="a-e-i-o-u-y-A-E-I-O-U.html" rel="next" title="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -40,7 +39,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="top"></span><h1 class="top">top</h1>
@@ -60,20 +59,20 @@ Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-Â">Â</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-a-e-i-o-u-A-E-I-O-U">â ê î ô û Â Ê Î Ô Û</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-a-e-i-o-u-A-E-I-O-U">â ê î ô û Â Ê Î Ô Û</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-Ä">Ä</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-A-E-I-O-U">Ä Ë Ï Ö Ü</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-a-e-i-o-u-y">ä ë ï ö ü ÿ</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-A-E-I-O-U">Ä Ë Ï Ö Ü</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-a-e-i-o-u-y">ä ë ï ö ü ÿ</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-Ç">Ç</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-c">ç</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-c">ç</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-È">È</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-e-1">è</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-e-1">è</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-É">É</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-e">é</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-e">é</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_letter-Â"><b>Â</b></a>
@@ -89,22 +88,22 @@ Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" accesskey="1">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="1">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="e.html#g_t_00e9" accesskey="2">é</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="e.html" accesskey="2">é</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="a-e-u.html#g_t_00e0-_00e8-_00f9" accesskey="3">à è ù</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-e-u.html" accesskey="3">à è ù</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" accesskey="4">â ê î ô û Â Ê Î Ô Û</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="4">â ê î ô û Â Ê Î Ô Û</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="c.html#g_t_00e7" accesskey="5">ç</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="c.html" accesskey="5">ç</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<div class="header">
<p>
-Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml
index 7395fc943b..ae831f0efa 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml
@@ -8,7 +8,7 @@
<documentencoding encoding="iso-8859-1" spaces=" ">iso-8859-1</documentencoding>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<printindex value="cp" line="cp"></printindex>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl
index 76885d4372..5925b0f956 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl
@@ -129,6 +129,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1713,6 +1714,7 @@ $result_sectioning{'char_latin1_utf8_in_refs'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -1851,6 +1853,7 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -1954,18 +1957,7 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'char_latin1_utf8_in_refs'};
@@ -1978,11 +1970,11 @@ $result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_next'}{'node_up'}
$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_prev'} = $result_nodes{'char_latin1_utf8_in_refs'};
$result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'}{'node_up'} = $result_nodes{'char_latin1_utf8_in_refs'};
$result_nodes{'char_latin1_utf8_in_refs'}{'node_next'} = $result_nodes{'char_latin1_utf8_in_refs'}{'menu_child'};
-$result_nodes{'char_latin1_utf8_in_refs'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'char_latin1_utf8_in_refs'};
$result_menus{'char_latin1_utf8_in_refs'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
index f06efa8e94..c83f1378a4 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
@@ -9,11 +9,11 @@
<meta name="keywords" content="â ê î ô û Â Ê Î Ô Û (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="c.html#g_t_00e7" rel="next" title="ç">
-<link href="a-e-u.html#g_t_00e0-_00e8-_00f9" rel="prev" title="à è ù">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="c.html" rel="next" title="ç">
+<link href="a-e-u.html" rel="prev" title="à è ù">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"></span><div class="header">
<p>
-Next: <a href="c.html#g_t_00e7" accesskey="n" rel="next">ç</a>, Previous: <a href="a-e-u.html#g_t_00e0-_00e8-_00f9" accesskey="p" rel="prev">à è ù</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="c.html" accesskey="n" rel="next">ç</a>, Previous: <a href="a-e-u.html" accesskey="p" rel="prev">à è ù</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="a-e-i-o-u-A-E-I-O-U"></span><h2 class="chapter">4 â ê î ô û Â Ê Î Ô Û</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index 9ddd94f423..973cf6b79d 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -9,11 +9,11 @@
<meta name="keywords" content="ä ë ï ö ü ÿ Ä Ë à Ö Ü (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="e.html#g_t_00e9" rel="next" title="é">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="e.html" rel="next" title="é">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"></span><div class="header">
<p>
-Next: <a href="e.html#g_t_00e9" accesskey="n" rel="next">é</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="e.html" accesskey="n" rel="next">é</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="a-e-i-o-u-y-A-E-I-O-U"></span><h2 class="chapter">1 ä ë ï ö ü ÿ Ä Ë à Ö Ü</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html
index d86001b549..19097ad639 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/a-e-u.html
@@ -9,11 +9,11 @@
<meta name="keywords" content="à è ù (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" rel="next" title="â ê î ô û Â Ê Î Ô Û">
-<link href="e.html#g_t_00e9" rel="prev" title="é">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="a-e-i-o-u-A-E-I-O-U.html" rel="next" title="â ê î ô û Â Ê Î Ô Û">
+<link href="e.html" rel="prev" title="é">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e0-_00e8-_00f9"></span><div class="header">
<p>
-Next: <a href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" accesskey="n" rel="next">â ê î ô û Â Ê Î Ô Û</a>, Previous: <a href="e.html#g_t_00e9" accesskey="p" rel="prev">é</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">â ê î ô û Â Ê Î Ô Û</a>, Previous: <a href="e.html" accesskey="p" rel="prev">é</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="a-e-u"></span><h2 class="chapter">3 à è ù</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html
index a8b360be0f..d0306c2efb 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/c.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="ç (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" rel="prev" title="â ê î ô û Â Ê Î Ô Û">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="a-e-i-o-u-A-E-I-O-U.html" rel="prev" title="â ê î ô û Â Ê Î Ô Û">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,15 +38,15 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e7"></span><div class="header">
<p>
-Previous: <a href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" accesskey="p" rel="prev">â ê î ô û Â Ê Î Ô Û</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">â ê î ô û Â Ê Î Ô Û</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="c"></span><h2 class="chapter">5 ç</h2>
-<p><a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a>
-<a href="e.html#g_t_00e9">é</a>
-<a href="a-e-u.html#g_t_00e0-_00e8-_00f9">à è ù</a>
-<a href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">â ê î ô û Â Ê Î Ô Û</a>
+<p><a href="a-e-i-o-u-y-A-E-I-O-U.html">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a>
+<a href="e.html">é</a>
+<a href="a-e-u.html">à è ù</a>
+<a href="a-e-i-o-u-A-E-I-O-U.html">â ê î ô û Â Ê Î Ô Û</a>
<a href="#g_t_00e7">ç</a>
</p>
<span id="index-a-e-i-o-u-y"></span>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html
index 0b5ee52428..2cd3081251 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/e.html
@@ -9,11 +9,11 @@
<meta name="keywords" content="é (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="a-e-u.html#g_t_00e0-_00e8-_00f9" rel="next" title="à è ù">
-<link href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" rel="prev" title="ä ë ï ö ü ÿ Ä Ë à Ö Ü">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="a-e-u.html" rel="next" title="à è ù">
+<link href="a-e-i-o-u-y-A-E-I-O-U.html" rel="prev" title="ä ë ï ö ü ÿ Ä Ë à Ö Ü">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e9"></span><div class="header">
<p>
-Next: <a href="a-e-u.html#g_t_00e0-_00e8-_00f9" accesskey="n" rel="next">à è ù</a>, Previous: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-u.html" accesskey="n" rel="next">à è ù</a>, Previous: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="e"></span><h2 class="chapter">2 é</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html
index 02966f97cc..630c33baa8 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_utf8_in_refs/res_html/index.html
@@ -11,8 +11,7 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" rel="next" title="ä ë ï ö ü ÿ Ä Ë à Ö Ü">
+<link href="a-e-i-o-u-y-A-E-I-O-U.html" rel="next" title="ä ë ï ö ü ÿ Ä Ë à Ö Ü">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -40,7 +39,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="top"></span><h1 class="top">top</h1>
@@ -60,20 +59,20 @@ Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-Â">Â</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-a-e-i-o-u-A-E-I-O-U">â ê î ô û Â Ê Î Ô Û</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-a-e-i-o-u-A-E-I-O-U">â ê î ô û Â Ê Î Ô Û</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-Ä">Ä</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-A-E-I-O-U">Ä Ë à Ö Ü</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-a-e-i-o-u-y">ä ë ï ö ü ÿ</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-A-E-I-O-U">Ä Ë à Ö Ü</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-a-e-i-o-u-y">ä ë ï ö ü ÿ</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-Ç">Ç</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-c">ç</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-c">ç</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-È">È</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-e-1">è</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-e-1">è</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-É">É</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="c.html#index-e">é</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html#g_t_00e7">ç</a></td></tr>
+<tr><td></td><td valign="top"><a href="c.html#index-e">é</a>:</td><td>&nbsp;</td><td valign="top"><a href="c.html">ç</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_letter-Â"><b>Â</b></a>
@@ -89,22 +88,22 @@ Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" accesskey="1">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="1">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="e.html#g_t_00e9" accesskey="2">é</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="e.html" accesskey="2">é</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="a-e-u.html#g_t_00e0-_00e8-_00f9" accesskey="3">à è ù</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-e-u.html" accesskey="3">à è ù</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="a-e-i-o-u-A-E-I-O-U.html#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db" accesskey="4">â ê î ô û Â Ê Î Ô Û</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="4">â ê î ô û Â Ê Î Ô Û</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="c.html#g_t_00e7" accesskey="5">ç</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="c.html" accesskey="5">ç</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<div class="header">
<p>
-Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc" accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë à Ö Ü</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl
index 450c01fb2a..46395ee6da 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl
@@ -123,6 +123,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -661,6 +662,7 @@ $result_sectioning{'char_latin2_latin2_in_refs'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -707,6 +709,7 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -742,27 +745,16 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'char_latin2_latin2_in_refs'}{'menu_child'}{'node_prev'} = $result_nodes{'char_latin2_latin2_in_refs'};
$result_nodes{'char_latin2_latin2_in_refs'}{'menu_child'}{'node_up'} = $result_nodes{'char_latin2_latin2_in_refs'};
$result_nodes{'char_latin2_latin2_in_refs'}{'node_next'} = $result_nodes{'char_latin2_latin2_in_refs'}{'menu_child'};
-$result_nodes{'char_latin2_latin2_in_refs'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'char_latin2_latin2_in_refs'};
$result_menus{'char_latin2_latin2_in_refs'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
index c8e39082d6..5884c1ae34 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="¡ ± ² Ê ê (top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0104-_0105-_02db-_0118-_0119"></span><div class="header">
<p>
-Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="A-a-_002c-E-e"></span><h2 class="chapter">1 ¡ ± ² Ê ê</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html
index 713db82318..3b1efd1a1c 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/char_latin2_latin2_in_refs/res_html/index.html
@@ -11,8 +11,7 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="A-a-_002c-E-e.html#g_t_0104-_0105-_02db-_0118-_0119" rel="next" title="¡ ± ² Ê ê">
+<link href="A-a-_002c-E-e.html" rel="next" title="¡ ± ² Ê ê">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -40,12 +39,12 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="A-a-_002c-E-e.html#g_t_0104-_0105-_02db-_0118-_0119" accesskey="n" rel="next">¡ ± ² Ê ê</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="A-a-_002c-E-e.html" accesskey="n" rel="next">¡ ± ² Ê ê</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="top"></span><h1 class="top">top</h1>
-<p><a href="A-a-_002c-E-e.html#g_t_0104-_0105-_02db-_0118-_0119">¡ ± ² Ê ê</a>.
+<p><a href="A-a-_002c-E-e.html">¡ ± ² Ê ê</a>.
</p>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_letter-¡"><b>¡</b></a>
&nbsp;
@@ -54,7 +53,7 @@ Next: <a href="A-a-_002c-E-e.html#g_t_0104-_0105-_02db-_0118-_0119" accesskey="n
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-¡">¡</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="A-a-_002c-E-e.html#index-A-a-_002c-E-e">¡ ± ² Ê ê</a>:</td><td>&nbsp;</td><td valign="top"><a href="A-a-_002c-E-e.html#g_t_0104-_0105-_02db-_0118-_0119">¡ ± ² Ê ê</a></td></tr>
+<tr><td></td><td valign="top"><a href="A-a-_002c-E-e.html#index-A-a-_002c-E-e">¡ ± ² Ê ê</a>:</td><td>&nbsp;</td><td valign="top"><a href="A-a-_002c-E-e.html">¡ ± ² Ê ê</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_letter-¡"><b>¡</b></a>
@@ -62,14 +61,14 @@ Next: <a href="A-a-_002c-E-e.html#g_t_0104-_0105-_02db-_0118-_0119" accesskey="n
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="A-a-_002c-E-e.html#g_t_0104-_0105-_02db-_0118-_0119" accesskey="1">¡ ± ² Ê ê</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="A-a-_002c-E-e.html" accesskey="1">¡ ± ² Ê ê</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<div class="header">
<p>
-Next: <a href="A-a-_002c-E-e.html#g_t_0104-_0105-_02db-_0118-_0119" accesskey="n" rel="next">¡ ± ² Ê ê</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="A-a-_002c-E-e.html" accesskey="n" rel="next">¡ ± ² Ê ê</a> &nbsp; [<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl
index c17b71d080..15bf735962 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl
@@ -1361,20 +1361,8 @@ $result_nodes{'complex_nestings'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'complex_nestings'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'complex_nestings'};
$result_menus{'complex_nestings'} = {
'cmdname' => 'node',
@@ -1447,7 +1435,7 @@ explanation
';
-$result_converted{'xml'}->{'complex_nestings'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'complex_nestings'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<example endspaces=" ">
<pre xml:space="preserve">deffs
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/empty_accent.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/empty_accent.pl
index 0ecf316735..109c18cd4b 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/empty_accent.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/empty_accent.pl
@@ -54,7 +54,7 @@ $result_errors{'empty_accent'} = [];
-$result_converted{'plaintext'}->{'empty_accent'} = '`
+$result_converted{'plaintext'}->{'empty_accent'} = 'Ì€
';
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number.pl
index 2ea3dace81..70200b247e 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number.pl
@@ -197,20 +197,8 @@ $result_nodes{'footnote_no_number'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'footnote_no_number'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'footnote_no_number'};
$result_menus{'footnote_no_number'} = {
'cmdname' => 'node',
@@ -246,16 +234,16 @@ $result_converted{'html_text'}->{'footnote_no_number'} = '<span id="Top"></span>
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(*)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(*)</a></h3>
<p>Footnote 1.</p>
-<h3><a id="FOOT2" href="#DOCF2">(*)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(*)</a></h3>
<p>Footnote 2.</p>
</div>
<hr>
';
-$result_converted{'xml'}->{'footnote_no_number'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'footnote_no_number'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<para>Para<footnote><para>Footnote 1.</para></footnote>.
</para>
@@ -294,6 +282,11 @@ Ref: Top-Footnote-1121
Ref: Top-Footnote-2141

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number_separate.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 0b1664aa6b..07b8e1c819 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -197,20 +197,8 @@ $result_nodes{'footnote_no_number_separate'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'footnote_no_number_separate'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'footnote_no_number_separate'};
$result_menus{'footnote_no_number_separate'} = {
'cmdname' => 'node',
@@ -244,16 +232,16 @@ $result_converted{'html_text'}->{'footnote_no_number_separate'} = '<span id="Top
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(*)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(*)</a></h3>
<p>Footnote 1.</p>
-<h3><a id="FOOT2" href="#DOCF2">(*)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(*)</a></h3>
<p>Footnote 2.</p>
</div>
<hr>
';
-$result_converted{'xml'}->{'footnote_no_number_separate'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'footnote_no_number_separate'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<para>Para<footnote><para>Footnote 1.</para></footnote>.
</para>
@@ -294,6 +282,11 @@ Ref: Top-Footnote-1177
Ref: Top-Footnote-2197

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/image_extension.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/image_extension.pl
index acdd61c936..b832152372 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/image_extension.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/image_extension.pl
@@ -47,6 +47,9 @@ $result_trees{'image_extension'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -144,6 +147,11 @@ $result_converted{'info'}->{'image_extension'} = 'This is , produced from .
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'image_extension'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl
index 896ef89baa..42054cf463 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl
@@ -96,7 +96,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -172,7 +174,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -253,7 +257,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -339,7 +345,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -430,7 +438,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -536,7 +546,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -627,6 +639,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -836,6 +851,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -859,7 +877,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 11,
@@ -886,7 +906,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -976,7 +998,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1052,7 +1076,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1133,7 +1159,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1219,7 +1247,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1310,7 +1340,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1416,7 +1448,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1507,6 +1541,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1716,6 +1753,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1739,7 +1779,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 22,
@@ -1766,7 +1808,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1861,7 +1905,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 25,
@@ -1922,7 +1968,9 @@ $result_trees{'image_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 28,
@@ -2412,20 +2460,8 @@ $result_nodes{'image_formatting'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'image_formatting'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'image_formatting'};
$result_menus{'image_formatting'} = {
'cmdname' => 'node',
@@ -2575,7 +2611,7 @@ $result_converted_errors{'html_text'}->{'image_formatting'} = [
-$result_converted{'xml'}->{'image_formatting'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'image_formatting'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<para><code>&arobase;image&lbrace;f--ile&rbrace;</code> <image where="inline"><imagefile>f--ile</imagefile></image>
<code>&arobase;image&lbrace;f--ile,l--i&rbrace;</code> <image where="inline"><imagefile>f--ile</imagefile><imagewidth>l--i</imagewidth></image>
@@ -2720,6 +2756,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/image_with_spaces.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/image_with_spaces.pl
index 96538b1b5e..a0b818e619 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/image_with_spaces.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/image_with_spaces.pl
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/index_entry_in_preformatted.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index 65b55117e6..4e9148e741 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -344,20 +344,8 @@ $result_nodes{'index_entry_in_preformatted'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'index_entry_in_preformatted'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_entry_in_preformatted'};
$result_menus{'index_entry_in_preformatted'} = {
'cmdname' => 'node',
@@ -388,7 +376,7 @@ $result_converted{'html_text'}->{'index_entry_in_preformatted'} = '<span id="Top
';
-$result_converted{'xml'}->{'index_entry_in_preformatted'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'index_entry_in_preformatted'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<example endspaces=" ">
<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm index="cp" number="1">first</indexterm></cindex>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis.pl
index 7a81760d6c..eea822e6ff 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis.pl
@@ -1139,25 +1139,13 @@ $result_nodes{'japanese_shift_jis'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'japanese_shift_jis'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'japanese_shift_jis'}{'menu_child'};
$result_nodes{'japanese_shift_jis'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'japanese_shift_jis'};
$result_nodes{'japanese_shift_jis'}{'menu_child'}{'node_prev'} = $result_nodes{'japanese_shift_jis'};
$result_nodes{'japanese_shift_jis'}{'menu_child'}{'node_up'} = $result_nodes{'japanese_shift_jis'};
$result_nodes{'japanese_shift_jis'}{'node_next'} = $result_nodes{'japanese_shift_jis'}{'menu_child'};
-$result_nodes{'japanese_shift_jis'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'japanese_shift_jis'};
$result_menus{'japanese_shift_jis'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html
index 6d3d1321b7..d790cc4b6e 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Introduction.html
@@ -17,9 +17,9 @@ legally counts.
<meta name="keywords" content="Introduction (GNU LilyPond &ndash; Manuel d&rsquo;initiation japanese)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="Preface.html#Preface" rel="prev" title="Preface">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="Preface.html" rel="prev" title="Preface">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<body lang="ja">
<span id="Introduction"></span><div class="header">
<p>
-Previous: <a href="Preface.html#Preface" accesskey="p" rel="prev">Preface</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Previous: <a href="Preface.html" accesskey="p" rel="prev">Preface</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="Introduction-1"></span><h2 class="chapter">2 Introduction</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html
index f88a0e5cf5..e41cc8bea9 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/Preface.html
@@ -17,10 +17,10 @@ legally counts.
<meta name="keywords" content="Preface (GNU LilyPond &ndash; Manuel d&rsquo;initiation japanese)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="Introduction.html#Introduction" rel="next" title="Introduction">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="Introduction.html" rel="next" title="Introduction">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -46,7 +46,7 @@ ul.no-bullet {list-style: none}
<body lang="ja">
<span id="Preface"></span><div class="header">
<p>
-Next: <a href="Introduction.html#Introduction" accesskey="n" rel="next">Introduction</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="Introduction.html" accesskey="n" rel="next">Introduction</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="Preface-1"></span><h2 class="chapter">1 Preface</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html
index 0c2e1cd7bc..2cd4d1d1de 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/japanese_shift_jis/res_html/index.html
@@ -18,8 +18,7 @@ legally counts.
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="Preface.html#Preface" rel="next" title="Preface">
+<link href="Preface.html" rel="next" title="Preface">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -48,7 +47,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="Preface.html#Preface" accesskey="n" rel="next">Preface</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="Preface.html" accesskey="n" rel="next">Preface</a> &nbsp; </p>
</div>
<hr>
<span id="GNU-LilyPond-_002d_002d_002d-XueXimaniyuaru"></span><h1 class="top">GNU LilyPond &mdash; ŠwKƒ}ƒjƒ…ƒAƒ‹</h1>
@@ -58,16 +57,16 @@ Next: <a href="Preface.html#Preface" accesskey="n" rel="next">Preface</a>, Up: <
<p>‚±‚ê‚Í GNU LilyPond ƒo[ƒWƒ‡ƒ“
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="Preface.html#Preface" accesskey="1">Preface</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="Preface.html" accesskey="1">Preface</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="Introduction.html#Introduction" accesskey="2">Introduction</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">LilyPond ‚Ƃ͉½‚È‚Ì‚©A‚È‚º LilyPond ‚ðŽg‚¤‚Ì‚©A‚Ç‚¤‚â‚Á‚Ä LilyPond ‚ðŽg‚¤‚Ì‚©
+<tr><td align="left" valign="top">&bull; <a href="Introduction.html" accesskey="2">Introduction</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">LilyPond ‚Ƃ͉½‚È‚Ì‚©A‚È‚º LilyPond ‚ðŽg‚¤‚Ì‚©A‚Ç‚¤‚â‚Á‚Ä LilyPond ‚ðŽg‚¤‚Ì‚©
</td></tr>
</table>
<hr>
<div class="header">
<p>
-Next: <a href="Preface.html#Preface" accesskey="n" rel="next">Preface</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="Preface.html" accesskey="n" rel="next">Preface</a> &nbsp; </p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl
index 9be10d9d3d..26ca7924cf 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl
@@ -244,9 +244,9 @@ $result_errors{'no_documentencoding_and_insertions'} = [];
-$result_converted{'plaintext'}->{'no_documentencoding_and_insertions'} = '- -- " " \' \' \'in code\'. e~.
+$result_converted{'plaintext'}->{'no_documentencoding_and_insertions'} = '- -- " " \' \' \'in code\'. ẽ.
- -- --- \'\' `` ` \' in code. e~.
+ -- --- \'\' `` ` \' in code. ẽ.
';
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index c018098b45..6e2b064299 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -531,6 +531,7 @@ $result_trees{'printindex_merged_indices_code_style'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -675,26 +676,16 @@ $result_sectioning{'printindex_merged_indices_code_style'} = {};
$result_nodes{'printindex_merged_indices_code_style'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'printindex_merged_indices_code_style'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'printindex_merged_indices_code_style'};
$result_menus{'printindex_merged_indices_code_style'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -830,7 +821,7 @@ $result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = '<spa
';
-$result_converted{'xml'}->{'printindex_merged_indices_code_style'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'printindex_merged_indices_code_style'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<synindex from="cp" to="fn" line="cp fn"></synindex>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl
index 2cd834c66b..70d56d5bca 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2343,25 +2343,13 @@ $result_nodes{'ref_in_sectioning'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'ref_in_sectioning'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'ref_in_sectioning'}{'menu_child'};
$result_nodes{'ref_in_sectioning'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'ref_in_sectioning'};
$result_nodes{'ref_in_sectioning'}{'menu_child'}{'node_prev'} = $result_nodes{'ref_in_sectioning'};
$result_nodes{'ref_in_sectioning'}{'menu_child'}{'node_up'} = $result_nodes{'ref_in_sectioning'};
$result_nodes{'ref_in_sectioning'}{'node_next'} = $result_nodes{'ref_in_sectioning'}{'menu_child'};
-$result_nodes{'ref_in_sectioning'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_in_sectioning'};
$result_menus{'ref_in_sectioning'} = {
'cmdname' => 'node',
@@ -2556,7 +2544,7 @@ $result_converted{'html_text'}->{'ref_in_sectioning'} = '<h2 class="contents-hea
$result_converted{'xml'}->{'ref_in_sectioning'} = '<contents></contents>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">node</nodenext></node>
<top spaces=" "><sectiontitle>for example <ref label="node"><xrefnodename>node</xrefnodename></ref> (<pxref label="node"><xrefnodename>node</xrefnodename></pxref>) (<pxref label="Top" manual="file"><xrefnodename>Top</xrefnodename><xrefinfofile spaces=" ">file</xrefinfofile><xrefprintedname spaces=" ">Manual</xrefprintedname></pxref>)</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8.pl
index 483e344807..9e9ff6d1f1 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8.pl
@@ -1302,6 +1302,7 @@ $result_trees{'sample_utf8'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1778,6 +1779,7 @@ $result_sectioning{'sample_utf8'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Index-node',
'spaces_before_argument' => ' '
}
@@ -1859,6 +1861,7 @@ $result_nodes{'sample_utf8'} = {
},
'level' => 1
},
+ 'isindex' => 1,
'normalized' => 'Index-node',
'spaces_before_argument' => ' '
},
@@ -1886,18 +1889,7 @@ $result_nodes{'sample_utf8'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'sample_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'sample_utf8'}{'menu_child'}{'node_next'};
$result_nodes{'sample_utf8'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'sample_utf8'};
@@ -1906,7 +1898,6 @@ $result_nodes{'sample_utf8'}{'menu_child'}{'node_next'}{'node_up'} = $result_nod
$result_nodes{'sample_utf8'}{'menu_child'}{'node_prev'} = $result_nodes{'sample_utf8'};
$result_nodes{'sample_utf8'}{'menu_child'}{'node_up'} = $result_nodes{'sample_utf8'};
$result_nodes{'sample_utf8'}{'node_next'} = $result_nodes{'sample_utf8'}{'menu_child'};
-$result_nodes{'sample_utf8'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'sample_utf8'};
$result_menus{'sample_utf8'} = {
'cmdname' => 'node',
@@ -1929,6 +1920,7 @@ $result_menus{'sample_utf8'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Index-node',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
index 1fc1f7b58f..31a85832b2 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/DiYiZhang_0028First-Chapter_0029.html
@@ -13,12 +13,12 @@ Texinfo中文示例 -->
<meta name="keywords" content="第一章(First Chapter) (Sample)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="Index-node.html#Index-node" rel="index" title="Index node">
+<link href="index.html" rel="start" title="Top">
+<link href="Index-node.html" rel="index" title="Index node">
<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="Second-Chapter-AE-AE-ae-ae.html#Second-Chapter-AE-_0104_0118-ae-_0105_0119" rel="next" title="Second Chapter AE ĄĘ ae ąę">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="Second-Chapter-AE-AE-ae-ae.html" rel="next" title="Second Chapter AE ĄĘ ae ąę">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -44,7 +44,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09"></span><div class="header">
<p>
-Next: <a href="Second-Chapter-AE-AE-ae-ae.html#Second-Chapter-AE-_0104_0118-ae-_0105_0119" accesskey="n" rel="next">Second Chapter AE ĄĘ ae ąę</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html#Index-node" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Second-Chapter-AE-AE-ae-ae.html" accesskey="n" rel="next">Second Chapter AE ĄĘ ae ąę</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="DiYiZhang_0028First-Chapter_0029"></span><h2 class="chapter">1 第一章(First Chapter)</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html
index f1087e372b..6e9d4ce65f 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Index-node.html
@@ -13,11 +13,11 @@ Texinfo中文示例 -->
<meta name="keywords" content="Index node (Sample)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
+<link href="index.html" rel="start" title="Top">
<link href="#Index-node" rel="index" title="Index node">
<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="Second-Chapter-AE-AE-ae-ae.html#Second-Chapter-AE-_0104_0118-ae-_0105_0119" rel="prev" title="Second Chapter AE ĄĘ ae ąę">
+<link href="index.html" rel="up" title="Top">
+<link href="Second-Chapter-AE-AE-ae-ae.html" rel="prev" title="Second Chapter AE ĄĘ ae ąę">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -43,7 +43,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Index-node"></span><div class="header">
<p>
-Previous: <a href="Second-Chapter-AE-AE-ae-ae.html#Second-Chapter-AE-_0104_0118-ae-_0105_0119" accesskey="p" rel="prev">Second Chapter AE ĄĘ ae ąę</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Index-node" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="Second-Chapter-AE-AE-ae-ae.html" accesskey="p" rel="prev">Second Chapter AE ĄĘ ae ąę</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Index-node" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="Index"></span><h2 class="unnumbered">Index</h2>
@@ -61,16 +61,16 @@ Previous: <a href="Second-Chapter-AE-AE-ae-ae.html#Second-Chapter-AE-_0104_0118-
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Index-node_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#index-chapter_002c-first">chapter, first</a>:</td><td>&nbsp;</td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09">第一章(First Chapter)</a></td></tr>
+<tr><td></td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#index-chapter_002c-first">chapter, first</a>:</td><td>&nbsp;</td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html">第一章(First Chapter)</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Index-node_cp_letter-É">É</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#index-e-A">é Â</a>:</td><td>&nbsp;</td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09">第一章(First Chapter)</a></td></tr>
+<tr><td></td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#index-e-A">é Â</a>:</td><td>&nbsp;</td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html">第一章(First Chapter)</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Index-node_cp_letter-Ä„">Ä„</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#index-AE-ae-ae">ĄĘ ae ąę</a>:</td><td>&nbsp;</td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09">第一章(First Chapter)</a></td></tr>
+<tr><td></td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#index-AE-ae-ae">ĄĘ ae ąę</a>:</td><td>&nbsp;</td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html">第一章(First Chapter)</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Index-node_cp_letter-å¦">å¦</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#index-LingYiGe_002cindex-entry">å¦ä¸€ä¸ªï¼Œindex entry</a>:</td><td>&nbsp;</td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09">第一章(First Chapter)</a></td></tr>
+<tr><td></td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html#index-LingYiGe_002cindex-entry">å¦ä¸€ä¸ªï¼Œindex entry</a>:</td><td>&nbsp;</td><td valign="top"><a href="DiYiZhang_0028First-Chapter_0029.html">第一章(First Chapter)</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Index-node_cp_letter-C"><b>C</b></a>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
index 38dbae35ff..b72c6f252e 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/Second-Chapter-AE-AE-ae-ae.html
@@ -13,12 +13,12 @@ Texinfo中文示例 -->
<meta name="keywords" content="Second Chapter AE ĄĘ ae ąę (Sample)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="Index-node.html#Index-node" rel="index" title="Index node">
+<link href="index.html" rel="start" title="Top">
+<link href="Index-node.html" rel="index" title="Index node">
<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="Index-node.html#Index-node" rel="next" title="Index node">
-<link href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09" rel="prev" title="第一章(First Chapter)">
+<link href="index.html" rel="up" title="Top">
+<link href="Index-node.html" rel="next" title="Index node">
+<link href="DiYiZhang_0028First-Chapter_0029.html" rel="prev" title="第一章(First Chapter)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -44,7 +44,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Second-Chapter-AE-_0104_0118-ae-_0105_0119"></span><div class="header">
<p>
-Next: <a href="Index-node.html#Index-node" accesskey="n" rel="next">Index node</a>, Previous: <a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09" accesskey="p" rel="prev">第一章(First Chapter)</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html#Index-node" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Index-node.html" accesskey="n" rel="next">Index node</a>, Previous: <a href="DiYiZhang_0028First-Chapter_0029.html" accesskey="p" rel="prev">第一章(First Chapter)</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="Chapter-2-AE-AE-ae-ae"></span><h2 class="chapter">2 Chapter 2 AE ĄĘ ae ąę</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/index.html
index 29761c87c7..7a5f47b64f 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/sample_utf8/res_html/index.html
@@ -14,10 +14,9 @@ Texinfo中文示例 -->
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
-<link href="Index-node.html#Index-node" rel="index" title="Index node">
+<link href="Index-node.html" rel="index" title="Index node">
<link href="#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09" rel="next" title="第一章(First Chapter)">
+<link href="DiYiZhang_0028First-Chapter_0029.html" rel="next" title="第一章(First Chapter)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -53,14 +52,14 @@ ul.no-bullet {list-style: none}
<ul class="no-bullet">
<li><a id="toc-DiYiZhang_0028First-Chapter_0029" href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09">1 第一章(First Chapter)</a></li>
<li><a id="toc-Chapter-2-AE-AE-ae-ae" href="Second-Chapter-AE-AE-ae-ae.html#Second-Chapter-AE-_0104_0118-ae-_0105_0119">2 Chapter 2 AE ĄĘ ae ąę</a></li>
- <li><a id="toc-Index" href="Index-node.html#Index-node">Index</a></li>
+ <li><a id="toc-Index" href="Index-node.html#Index-node" rel="index">Index</a></li>
</ul>
</div>
<span id="Top"></span><div class="header">
<p>
-Next: <a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09" accesskey="n" rel="next">第一章(First Chapter)</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html#Index-node" title="Index" rel="index">Index</a>]</p>
+Next: <a href="DiYiZhang_0028First-Chapter_0029.html" accesskey="n" rel="next">第一章(First Chapter)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<span id="TexinfoZhongWenShiLi"></span><h1 class="top">Texinfo中文示例</h1>
@@ -71,12 +70,12 @@ Next: <a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08Firs
Texinfo中文示例
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09" accesskey="1">第一章(First Chapter)</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">这是此示例文档的第一章
+<tr><td align="left" valign="top">&bull; <a href="DiYiZhang_0028First-Chapter_0029.html" accesskey="1">第一章(First Chapter)</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">这是此示例文档的第一章
(with mixed cjk &amp; latin char title)
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="Second-Chapter-AE-AE-ae-ae.html#Second-Chapter-AE-_0104_0118-ae-_0105_0119" accesskey="2">Second Chapter AE ĄĘ ae ąę</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">this is chapter 2. AE ĄĘ ae ąę
+<tr><td align="left" valign="top">&bull; <a href="Second-Chapter-AE-AE-ae-ae.html" accesskey="2">Second Chapter AE ĄĘ ae ąę</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">this is chapter 2. AE ĄĘ ae ąę
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="Index-node.html#Index-node" accesskey="3">Index node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Complete index.
+<tr><td align="left" valign="top">&bull; <a href="Index-node.html" rel="index" accesskey="3">Index node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Complete index.
</td></tr>
</table>
@@ -84,7 +83,7 @@ Texinfo中文示例
<hr>
<div class="header">
<p>
-Next: <a href="DiYiZhang_0028First-Chapter_0029.html#g_t_7b2c_4e00_7ae0_ff08First-Chapter_ff09" accesskey="n" rel="next">第一章(First Chapter)</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html#Index-node" title="Index" rel="index">Index</a>]</p>
+Next: <a href="DiYiZhang_0028First-Chapter_0029.html" accesskey="n" rel="next">第一章(First Chapter)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index-node.html" title="Index" rel="index">Index</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index a80ebc9bd4..57be41ce43 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -1614,23 +1614,11 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'some_at_commands_in_ref_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'some_at_commands_in_ref_nodes'};
$result_nodes{'some_at_commands_in_ref_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'some_at_commands_in_ref_nodes'};
$result_nodes{'some_at_commands_in_ref_nodes'}{'node_next'} = $result_nodes{'some_at_commands_in_ref_nodes'}{'menu_child'};
-$result_nodes{'some_at_commands_in_ref_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'some_at_commands_in_ref_nodes'};
$result_menus{'some_at_commands_in_ref_nodes'} = {
'cmdname' => 'node',
@@ -1659,11 +1647,11 @@ $result_errors{'some_at_commands_in_ref_nodes'} = [];
$result_converted{'plaintext'}->{'some_at_commands_in_ref_nodes'} = 'Top
***
-1 A SC node i" i" E=` /l C\', !
-******************************
+1 A SC node ï ï Ḕ ł Ḉ ¡
+***********************
-see *note (manual)a *strong* ref with SC, a i trema i", a dotless i
-trema i" E=` and exclamdown !::.
+see *note (manual)a *strong* ref with SC, a i trema ï, a dotless i trema
+ï Ḕ and exclamdown ¡::.
';
@@ -1692,7 +1680,7 @@ $result_converted{'html_text'}->{'some_at_commands_in_ref_nodes'} = '
$result_converted{'xml'}->{'some_at_commands_in_ref_nodes'} = '
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">A <sc>sc <accent type="tilde" bracketed="off">n</accent> &aring; &tex;</sc> node <accent type="uml" bracketed="off">i</accent> <accent type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent type="macr" bracketed="off">E</accent></accent> &lslash; <accent type="cedil"><accent type="acute" bracketed="off">C</accent></accent> &iexcl;</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">A <sc>sc <accent type="tilde" bracketed="off">n</accent> &aring; &tex;</sc> node <accent type="uml" bracketed="off">i</accent> <accent type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent type="macr" bracketed="off">E</accent></accent> &lslash; <accent type="cedil"><accent type="acute" bracketed="off">C</accent></accent> &iexcl;</nodenext></node>
<top spaces=" "><sectiontitle>Top</sectiontitle>
<menu endspaces=" ">
@@ -1725,43 +1713,35 @@ $result_converted{'docbook'}->{'some_at_commands_in_ref_nodes'} = '
$result_converted{'info'}->{'some_at_commands_in_ref_nodes'} = 'This is , produced from .

-File: , Node: Top, Next: A SC N~ AA TeX node i" i" E=` /l C\', !, Up: (dir)
+File: , Node: Top, Next: A SC Ñ Å TeX node ï ï Ḕ ł Ḉ ¡, Up: (dir)
Top
***
* Menu:
-* A SC N~ AA TeX node i" i" E=` /l C\', !::
+* A SC Ñ Å TeX node ï ï Ḕ ł Ḉ ¡::

-File: , Node: A SC N~ AA TeX node i" i" E=` /l C\', !, Prev: Top, Up: Top
+File: , Node: A SC Ñ Å TeX node ï ï Ḕ ł Ḉ ¡, Prev: Top, Up: Top
-1 A SC node i" i" E=` /l C\', !
-******************************
+1 A SC node ï ï Ḕ ł Ḉ ¡
+***********************
-see *note (manual)a *strong* ref with SC, a i trema i", a dotless i
-trema i" E=` and exclamdown !::.
+see *note (manual)a *strong* ref with SC, a i trema ï, a dotless i trema
+ï Ḕ and exclamdown ¡::.

Tag Table:
Node: Top27
-Node: A SC N~ AA TeX node i" i" E=` /l C\', !170
+Node: A SC Ñ Å TeX node ï ï Ḕ ł Ḉ ¡172

End Tag Table
-';
-
-$result_converted_errors{'info'}->{'some_at_commands_in_ref_nodes'} = [
- {
- 'error_line' => ':9: warning: @node name should not contain `,\': A SC N~ AA TeX node i" i" E=` /l C\', !
-',
- 'file_name' => '',
- 'line_nr' => 9,
- 'macro' => '',
- 'text' => '@node name should not contain `,\': A SC N~ AA TeX node i" i" E=` /l C\', !',
- 'type' => 'warning'
- }
-];
+
+Local Variables:
+coding: utf-8
+End:
+';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index 68038ef433..15d1daf877 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -816,20 +816,8 @@ $result_nodes{'spaces_in_empty_node_names'} = {
}
}
}
- ],
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ ]
};
-$result_nodes{'spaces_in_empty_node_names'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'spaces_in_empty_node_names'};
$result_menus{'spaces_in_empty_node_names'} = {
'cmdname' => 'node',
@@ -993,7 +981,7 @@ $result_converted{'html_text'}->{'spaces_in_empty_node_names'} = '<span id="Top"
';
-$result_converted{'xml'}->{'spaces_in_empty_node_names'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'spaces_in_empty_node_names'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator="::"><spacecmd type="spc"/><spacecmd type="spc"/></menunode><menudescription><pre xml:space="preserve">
@@ -1051,6 +1039,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl
index f3a6d79213..26e093239e 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -922,18 +922,7 @@ $result_nodes{'spaces_in_node_names'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'};
$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'spaces_in_node_names'};
@@ -942,7 +931,6 @@ $result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_next'}{'node_up'} = $r
$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_prev'} = $result_nodes{'spaces_in_node_names'};
$result_nodes{'spaces_in_node_names'}{'menu_child'}{'node_up'} = $result_nodes{'spaces_in_node_names'};
$result_nodes{'spaces_in_node_names'}{'node_next'} = $result_nodes{'spaces_in_node_names'}{'menu_child'};
-$result_nodes{'spaces_in_node_names'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'spaces_in_node_names'};
$result_menus{'spaces_in_node_names'} = {
'cmdname' => 'node',
@@ -1077,7 +1065,7 @@ $result_converted{'html_text'}->{'spaces_in_node_names'} = '<span id="Top"></spa
';
-$result_converted{'xml'}->{'spaces_in_node_names'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">a<spacecmd type="spc"/><spacecmd type="spc"/></nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'spaces_in_node_names'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">a<spacecmd type="spc"/><spacecmd type="spc"/></nodenext></node>
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator="::">a<spacecmd type="spc"/><spacecmd type="spc"/></menunode><menudescription><pre xml:space="preserve">
@@ -1150,6 +1138,11 @@ Node: b 162
Node: c 218

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 3026afd3e1..0272a701ba 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -910,20 +910,8 @@ $result_nodes{'test_deftypefnnewline'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'test_deftypefnnewline'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'test_deftypefnnewline'};
$result_menus{'test_deftypefnnewline'} = {
'cmdname' => 'node',
@@ -983,7 +971,7 @@ $result_converted{'html_text'}->{'test_deftypefnnewline'} = '
$result_converted{'xml'}->{'test_deftypefnnewline'} = '
<deftypefnnewline value="on" line="on"></deftypefnnewline>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" number="1">name</indexterm><defcategory automatic="on" bracketed="on">Function</defcategory> <deftype>data-type</deftype> <deffunction>name</deffunction> <defparamtype>arguments...</defparamtype></definitionterm>
<definitionitem><para>aaa
</para></definitionitem></deftypefun>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl
index 9921d8c764..a2b4f25aca 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1380,20 +1380,8 @@ $result_nodes{'things_before_setfilename'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'things_before_setfilename'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'things_before_setfilename'};
$result_menus{'things_before_setfilename'} = {
'cmdname' => 'node',
@@ -1611,7 +1599,7 @@ $result_converted{'xml'}->{'things_before_setfilename'} = '<preamble>\\input tex
<setfilename file="things_before_setfilename.info" spaces=" ">things_before_setfilename.info </setfilename>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
<top spaces=" "><sectiontitle>top section</sectiontitle>
<para>Ref to anchor
@@ -1657,6 +1645,11 @@ Tag Table:
Node: Top87

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 2ae155538e..a898c2ba5b 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -1489,6 +1489,11 @@ Ref to anchor *note An anchor::
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'things_before_setfilename_no_element'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref.pl
index 74837db49f..0def663e40 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref.pl
@@ -4201,20 +4201,8 @@ $result_nodes{'top_in_ref'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'top_in_ref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_in_ref'};
$result_menus{'top_in_ref'} = {
'cmdname' => 'node',
@@ -4306,7 +4294,7 @@ $result_converted{'html_text'}->{'top_in_ref'} = '<span id="Top"></span><h1 clas
';
-$result_converted{'xml'}->{'top_in_ref'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'top_in_ref'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<para><code>&arobase;ref&lbrace;Top,cross ref name&rbrace;</code> <ref label="Top"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref name</xrefinfoname></ref>
<code>&arobase;ref&lbrace;Top,,title&rbrace;</code> <ref label="Top"><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref_keep_top.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref_keep_top.pl
index 65de7f3543..f7032a699e 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref_keep_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref_keep_top.pl
@@ -4201,20 +4201,8 @@ $result_nodes{'top_in_ref_keep_top'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'top_in_ref_keep_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_in_ref_keep_top'};
$result_menus{'top_in_ref_keep_top'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl
index 1cbb4bae04..01f834aa04 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl
@@ -581,20 +581,8 @@ $result_nodes{'weird_accents'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'weird_accents'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'weird_accents'};
$result_menus{'weird_accents'} = {
'cmdname' => 'node',
@@ -641,7 +629,7 @@ $result_converted{'html_text'}->{'weird_accents'} = '
$result_converted{'xml'}->{'weird_accents'} = '<documentencoding encoding="ISO-8859-1" spaces=" ">ISO-8859-1</documentencoding>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<para><accent type="macr"><accent type="tilde"><dotless>i</dotless></accent></accent>
diff --git a/macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl b/macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
index 2e5a2f993e..ebcfe28928 100644
--- a/macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
+++ b/macros/texinfo/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl
@@ -581,20 +581,8 @@ $result_nodes{'weird_accents_disable_encoding'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'weird_accents_disable_encoding'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'weird_accents_disable_encoding'};
$result_menus{'weird_accents_disable_encoding'} = {
'cmdname' => 'node',
@@ -641,7 +629,7 @@ $result_converted{'html_text'}->{'weird_accents_disable_encoding'} = '
$result_converted{'xml'}->{'weird_accents_disable_encoding'} = '<documentencoding encoding="ISO-8859-1" spaces=" ">ISO-8859-1</documentencoding>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<para><accent type="macr"><accent type="tilde"><dotless>i</dotless></accent></accent>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl b/macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl
index 80d1cc8bfb..161b9c4739 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/accent_and_dash.pl
@@ -52,7 +52,7 @@ $result_errors{'accent_and_dash'} = [];
-$result_converted{'plaintext'}->{'accent_and_dash'} = 'a-^
+$result_converted{'plaintext'}->{'accent_and_dash'} = 'a-Ì‚
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl b/macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl
index d5b319dc70..3d505ccc1d 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/at_after_accent_command.pl
@@ -91,7 +91,7 @@ $result_errors{'at_after_accent_command'} = [
-$result_converted{'plaintext'}->{'at_after_accent_command'} = '*@. ^@.
+$result_converted{'plaintext'}->{'at_after_accent_command'} = 'ÌŠ@. Ì‚@.
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage/commands.pl
index 25a7bfee84..cb86e2ae53 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/commands.pl
@@ -525,8 +525,8 @@ $result_errors{'commands'} = [
-$result_converted{'plaintext'}->{'commands'} = '@ TeX e" i^ a~ a* File -> Open. b <a> \'code --- -- \'\' ``\' -- - " ".
-SMALL CAPS.
+$result_converted{'plaintext'}->{'commands'} = '@ TeX ë î ã å File -> Open. b <a> \'code --- -- \'\' ``\' -- - " ". SMALL
+CAPS.
majorheading in b
*****************
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl b/macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl
index 992dca8e2e..a49fc46b34 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/invalid_U.pl
@@ -329,7 +329,7 @@ $result_errors{'invalid_U'} = [
-$result_converted{'plaintext'}->{'invalid_U'} = 'U+z U+abc U+9999999999999 U+110000 U+10FFFF U+0023 U+wxyz
+$result_converted{'plaintext'}->{'invalid_U'} = 'U+z ઼ U+9999999999999 U+110000 U+10FFFF # U+wxyz
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl b/macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl
index 4517f66435..fd462f28a0 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl
@@ -63,7 +63,7 @@ $result_errors{'lettered_accent_and_spaces'} = [];
-$result_converted{'plaintext'}->{'lettered_accent_and_spaces'} = 'a*
+$result_converted{'plaintext'}->{'lettered_accent_and_spaces'} = 'Ã¥
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl
index 24280151f6..9898cfaa45 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -39,6 +39,7 @@ $result_trees{'punctuation_in_line_commands'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1031,6 +1032,7 @@ $result_sectioning{'punctuation_in_line_commands'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node_0021-After-punc',
'spaces_before_argument' => ' '
}
@@ -1054,6 +1056,7 @@ $result_nodes{'punctuation_in_line_commands'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'node_0021-After-punc',
'spaces_before_argument' => ' '
}
@@ -1062,6 +1065,7 @@ $result_nodes{'punctuation_in_line_commands'} = {
$result_menus{'punctuation_in_line_commands'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node_0021-After-punc',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl b/macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl
index 39548920f5..2fb15116ad 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl
@@ -227,7 +227,7 @@ $result_errors{'quotation_author'} = [];
$result_converted{'plaintext'}->{'quotation_author'} = ' quotation quotation continues.
-- _First Author_
- -- _Se~cond author_
+ -- _Sẽcond author_
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl b/macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl
index ed76cf77ef..e1fb7e0d2d 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl
@@ -830,17 +830,17 @@ $result_errors{'unknown_accents'} = [];
-$result_converted{'plaintext'}->{'unknown_accents'} = 'X" x" Q" Y"
+$result_converted{'plaintext'}->{'unknown_accents'} = 'Ẍ ẠQ̈ Ÿ
- z\' q\' r\' Z\' Q\' R\'
+ ź qÌ Å• Ź QÌ Å”
- H, h,
+ Ḩ ḩ
- z^ r^ t^ k^ Z^ R^ T^ K^
+ ẑ r̂ t̂ k̂ ẠR̂ T̂ K̂
- z` m` p`
+ z̀ m̀ p̀
- Z~ s~
+ Z̃ s̃
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl b/macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl
index 6f3100ca15..31f1bab032 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage/verbatiminclude.pl
@@ -32,6 +32,7 @@ $result_trees{'verbatiminclude'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'incl-incl.txi'
},
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl
index 6fc89d1845..207a188c9c 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -428,8 +428,8 @@ $result_errors{'abbr_acronym'} = [];
-$result_converted{'plaintext'}->{'abbr_acronym'} = '-a (an accronym) -a -a (an accronym , ...) E\'-a. ,A. (E\'tude-,
-Autonome) E\'-a. ,A.
+$result_converted{'plaintext'}->{'abbr_acronym'} = '-a (an accronym) -a -a (an accronym , ...) É-a. ,A. (Étude-, Autonome)
+É-a. ,A.
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl
index a219cbfad9..ebbc0b3962 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_commands.pl
@@ -248,7 +248,7 @@ $result_errors{'empty_commands'} = [
-$result_converted{'plaintext'}->{'empty_commands'} = '\'\'(1) ~
+$result_converted{'plaintext'}->{'empty_commands'} = '\'\'(1) ̃
---------- Footnotes ----------
@@ -263,7 +263,7 @@ $result_converted{'html_text'}->{'empty_commands'} = '
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
</div>
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl
index e8bfdb1e90..d438fd8d1d 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/empty_images.pl
@@ -17,6 +17,9 @@ $result_trees{'empty_images'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -91,6 +94,9 @@ $result_trees{'empty_images'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -139,6 +145,9 @@ $result_trees{'empty_images'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
@@ -181,6 +190,9 @@ $result_trees{'empty_images'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 6,
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl
index 1ac6cf8490..1075e9cf7e 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote.pl
@@ -131,7 +131,7 @@ $result_converted{'html_text'}->{'footnote'} = '<p>text<a id="DOCF1" href="#FOOT
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote.
</p>
<p><span class="roman">in footnote r</span>. </p>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
index ecc3bc22b7..2cc62fc418 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
@@ -90,7 +90,7 @@ $result_converted{'html_text'}->{'footnote_ending_on_empty_line'} = '<p>text<a i
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote.
</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl
index 9fddd5e84a..e1cf312696 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -158,7 +158,7 @@ $result_converted{'html_text'}->{'footnote_no_node'} = '<span id="top"></span><h
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>In footnote</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
index 28a1499521..e158e00fef 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
@@ -286,9 +286,9 @@ $result_converted{'html_text'}->{'form_feed_in_brace_commands'} = '<p><samp> &#1
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>f1 </p>&#12;
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>gg</p>&#12;<p>jj</p>
</div>
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
index 1aaa359372..c934c03953 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
@@ -283,11 +283,11 @@ $result_converted{'html_text'}->{'format_on_first_footnote_line'} = '<p>Texte<a
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<blockquote>
<p>in quotation on the first footnote line
</p></blockquote>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<div class="example">
<pre class="example">in example
</pre></div>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl
index 30e1f84a0d..acf2eeb823 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -202,7 +202,7 @@ $result_converted{'html_text'}->{'heading_in_footnote'} = '<p>T<a id="DOCF1" hre
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>AAA
</p><span id="H1"></span><h3 class="heading">H1</h3>
<span id="index-ind-e"></span>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl
index 6ef38779db..1ab5d41235 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -297,7 +297,7 @@ $result_converted{'docbook'}->{'nested_in_sc'} = '<para>AAA &#209; &#197; &tex;
</para>';
-$result_converted{'plaintext'}->{'nested_in_sc'} = 'AAA N~ AA TeX AA~ (1), ABR (EXPL), in verb
+$result_converted{'plaintext'}->{'nested_in_sc'} = 'AAA Ñ Å TeX Å̃ (1), ABR (EXPL), in verb
---------- Footnotes ----------
@@ -312,7 +312,7 @@ $result_converted{'html_text'}->{'nested_in_sc'} = '<p><small><small>AAA &Ntilde
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>In footnote</p>
</div>
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl
index d047a5d597..99c9674663 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_command_in_image.pl
@@ -42,7 +42,9 @@ $result_trees{'space_command_in_image'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -89,7 +91,9 @@ $result_trees{'space_command_in_image'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
}
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl
index e5d22ee8d1..35f9474501 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl
@@ -80,7 +80,7 @@ $result_converted{'html_text'}->{'space_in_footnote'} = '<p>text<a id="DOCF1" hr
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote.</p>
</div>
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl
index 178768d241..e874d7ef5e 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl
@@ -75,7 +75,9 @@ $result_trees{'space_in_image'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -108,7 +110,9 @@ $result_trees{'space_in_image'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl
index 802bab5f53..4b3ede9d9c 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl
@@ -248,6 +248,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -557,6 +560,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -808,6 +814,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1113,6 +1122,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1342,6 +1354,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1645,6 +1660,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1897,6 +1915,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -2202,6 +2223,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -2387,6 +2411,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -2692,6 +2719,9 @@ $result_trees{'test_image'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -3471,20 +3501,8 @@ $result_nodes{'test_image'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'test_image'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'test_image'};
$result_menus{'test_image'} = {
'cmdname' => 'node',
@@ -3951,26 +3969,26 @@ $result_converted_errors{'html'}->{'test_image'} = [
$result_converted{'plaintext'}->{'test_image'} = '[f@i--le.. a@<"%@ < & @ % " ]
-In text [alt i^-le.. a
+In text [alt î-le.. a
<"%@ < & @ % " ].
Insertcopying
Text in copying. [f@i--le.. a@<"%@ < & @ % " ]
- In text [alt i^-le.. a
+ In text [alt î-le.. a
<"%@ < & @ % " ].
[f@i--le.. a@<"%@ < & @ % " ]
- In text [alt i^-le.. a
+ In text [alt î-le.. a
<"%@ < & @ % " ].
[f@i--le.. a@<"%@ < & @ % " ]
-In text [alt i^-le.. a
+In text [alt î-le.. a
<"%@ < & @ % " ].
Image 1: [f@i--le.. a@<"%@ < & @ % " ]
-In text [alt i^-le.. a
+In text [alt î-le.. a
<"%@ < & @ % " ].
* Menu:
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
index b133d2d68b..8e12c0dfa4 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -767,23 +767,11 @@ $result_nodes{'two_footnotes_in_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'two_footnotes_in_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'two_footnotes_in_nodes'};
$result_nodes{'two_footnotes_in_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'two_footnotes_in_nodes'};
$result_nodes{'two_footnotes_in_nodes'}{'node_next'} = $result_nodes{'two_footnotes_in_nodes'}{'menu_child'};
-$result_nodes{'two_footnotes_in_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'two_footnotes_in_nodes'};
$result_menus{'two_footnotes_in_nodes'} = {
'cmdname' => 'node',
@@ -846,7 +834,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 nodes</h1>
@@ -874,19 +862,19 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>Footnote Top/1
</p>
<p>para2</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>Footnote Top/2
</p>
<p>para2</p>
-<h3><a id="FOOT3" href="#DOCF3">(3)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3>
<p>Footnote chapter/1
</p>
<p>para2</p>
-<h3><a id="FOOT4" href="#DOCF4">(4)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(4)</a></h3>
<p>Footnote chapter/2
</p>
<p>para2</p>
@@ -957,6 +945,11 @@ Ref: chapter-Footnote-1383
Ref: chapter-Footnote-2420

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1027,19 +1020,19 @@ $result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<span id="Top"></s
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>Footnote Top/1
</p>
<p>para2</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>Footnote Top/2
</p>
<p>para2</p>
-<h3><a id="FOOT3" href="#DOCF3">(3)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3>
<p>Footnote chapter/1
</p>
<p>para2</p>
-<h3><a id="FOOT4" href="#DOCF4">(4)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(4)</a></h3>
<p>Footnote chapter/2
</p>
<p>para2</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index ee571930cf..b97547affc 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -803,23 +803,11 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'two_footnotes_in_nodes_separate'}{'menu_child'}{'node_prev'} = $result_nodes{'two_footnotes_in_nodes_separate'};
$result_nodes{'two_footnotes_in_nodes_separate'}{'menu_child'}{'node_up'} = $result_nodes{'two_footnotes_in_nodes_separate'};
$result_nodes{'two_footnotes_in_nodes_separate'}{'node_next'} = $result_nodes{'two_footnotes_in_nodes_separate'}{'menu_child'};
-$result_nodes{'two_footnotes_in_nodes_separate'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'two_footnotes_in_nodes_separate'};
$result_menus{'two_footnotes_in_nodes_separate'} = {
'cmdname' => 'node',
@@ -882,7 +870,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="g_t2-footnotes-in-2-nodes"></span><h1 class="top">2 footnotes in 2 nodes</h1>
@@ -976,6 +964,11 @@ Ref: chapter-Footnote-1511
Ref: chapter-Footnote-2548

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl
index 370e91292f..6c8679c61e 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -302,7 +302,7 @@ $result_converted_errors{'plaintext'}->{'uref_in_ref'} = [
-$result_converted{'html_text'}->{'uref_in_ref'} = '<p><a href="index3.html#node">title with uref2 <a href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+$result_converted{'html_text'}->{'uref_in_ref'} = '<p><a href="index3.html (uref3).html#node">title with uref2 <a href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
</p>';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl b/macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl
index c37e98de06..f308a98b34 100644
--- a/macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -195,20 +195,8 @@ $result_nodes{'verb_in_xref'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'verb_in_xref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'verb_in_xref'};
$result_menus{'verb_in_xref'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl b/macros/texinfo/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl
index 7eb35777b3..24723a7bc3 100644
--- a/macros/texinfo/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -12739,6 +12739,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -15094,26 +15095,16 @@ $result_sectioning{'all_commands_delimiters_printindex'} = {};
$result_nodes{'all_commands_delimiters_printindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'all_commands_delimiters_printindex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'all_commands_delimiters_printindex'};
$result_menus{'all_commands_delimiters_printindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -15308,6 +15299,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/def/all_commands_printindex.pl b/macros/texinfo/texinfo/tp/t/results/def/all_commands_printindex.pl
index 8306b6f8a5..f71e6c81ae 100644
--- a/macros/texinfo/texinfo/tp/t/results/def/all_commands_printindex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/def/all_commands_printindex.pl
@@ -3149,6 +3149,7 @@ $result_trees{'all_commands_printindex'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3820,26 +3821,16 @@ $result_sectioning{'all_commands_printindex'} = {};
$result_nodes{'all_commands_printindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'all_commands_printindex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'all_commands_printindex'};
$result_menus{'all_commands_printindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3953,6 +3944,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/def/ref_in_def.pl b/macros/texinfo/texinfo/tp/t/results/def/ref_in_def.pl
index 19fb2cd637..9d447c2810 100644
--- a/macros/texinfo/texinfo/tp/t/results/def/ref_in_def.pl
+++ b/macros/texinfo/texinfo/tp/t/results/def/ref_in_def.pl
@@ -771,20 +771,8 @@ $result_nodes{'ref_in_def'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'ref_in_def'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_in_def'};
$result_menus{'ref_in_def'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl b/macros/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl
index 7f4b662e5a..5faf940915 100644
--- a/macros/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl
+++ b/macros/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl
@@ -349,6 +349,7 @@ $result_trees{'space_in_def_for_index'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -450,26 +451,16 @@ $result_sectioning{'space_in_def_for_index'} = {};
$result_nodes{'space_in_def_for_index'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'space_in_def_for_index'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'space_in_def_for_index'};
$result_menus{'space_in_def_for_index'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -499,6 +490,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/docbook_tests/special_docbook_unnumbered.pl b/macros/texinfo/texinfo/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index b7addb9167..664ca0e732 100644
--- a/macros/texinfo/texinfo/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/macros/texinfo/texinfo/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -1140,18 +1140,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_next'};
$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'special_docbook_unnumbered'};
@@ -1162,7 +1151,6 @@ $result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_next'}{'node_up'
$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_prev'} = $result_nodes{'special_docbook_unnumbered'};
$result_nodes{'special_docbook_unnumbered'}{'menu_child'}{'node_up'} = $result_nodes{'special_docbook_unnumbered'};
$result_nodes{'special_docbook_unnumbered'}{'node_next'} = $result_nodes{'special_docbook_unnumbered'}{'menu_child'};
-$result_nodes{'special_docbook_unnumbered'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'special_docbook_unnumbered'};
$result_menus{'special_docbook_unnumbered'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/float/anchor_in_caption.pl b/macros/texinfo/texinfo/tp/t/results/float/anchor_in_caption.pl
index ae4de3dfc6..a0b9444fe6 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/anchor_in_caption.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/anchor_in_caption.pl
@@ -315,20 +315,8 @@ $result_nodes{'anchor_in_caption'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'anchor_in_caption'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_in_caption'};
$result_menus{'anchor_in_caption'} = {
'cmdname' => 'node',
@@ -409,6 +397,11 @@ Ref: label123
Ref: in anchor150

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl b/macros/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl
index bd178f9980..021b6e4293 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl
@@ -291,6 +291,7 @@ $result_trees{'cindex_in_caption'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -388,26 +389,16 @@ $result_sectioning{'cindex_in_caption'} = {};
$result_nodes{'cindex_in_caption'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cindex_in_caption'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cindex_in_caption'};
$result_menus{'cindex_in_caption'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -494,6 +485,11 @@ Node: Top27
Ref: label123

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/float/comment_space_comand_in_float.pl b/macros/texinfo/texinfo/tp/t/results/float/comment_space_comand_in_float.pl
index c602324fc8..0cf6cd5643 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/comment_space_comand_in_float.pl
@@ -293,20 +293,8 @@ $result_nodes{'comment_space_comand_in_float'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'comment_space_comand_in_float'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'comment_space_comand_in_float'};
$result_menus{'comment_space_comand_in_float'} = {
'cmdname' => 'node',
@@ -384,6 +372,11 @@ Node: Top27
Ref: label 61

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/float/complex_float.pl b/macros/texinfo/texinfo/tp/t/results/float/complex_float.pl
index 955c3eb497..8dc5f5c0d3 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/complex_float.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/complex_float.pl
@@ -4487,23 +4487,11 @@ $result_nodes{'complex_float'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'complex_float'}{'menu_child'}{'node_prev'} = $result_nodes{'complex_float'};
$result_nodes{'complex_float'}{'menu_child'}{'node_up'} = $result_nodes{'complex_float'};
$result_nodes{'complex_float'}{'node_next'} = $result_nodes{'complex_float'}{'menu_child'};
-$result_nodes{'complex_float'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'complex_float'};
$result_menus{'complex_float'} = {
'cmdname' => 'node',
@@ -4628,7 +4616,7 @@ A list of floats at the beginning.
* Menu:
-* Text 1: text with a lot of features. TeX and _te\'i^<an_url>_ AND ...
+* Text 1: text with a lot of features. TeX and _téî<an_url>_ AND ...
* Text 1.1: float with a lot of features and no shortcaption.
An example of float ...
@@ -4647,7 +4635,7 @@ An itemize.
A ref. *Note xref Text with features: Top. A footnote. (1).
-TeX and _te\'i^<an_url>_ AND it is @verb a word !@ AE.
+TeX and _téî<an_url>_ AND it is @verb a word !@ Æ.
Text 1: An example of float caption... An example.
example
@@ -4666,7 +4654,7 @@ An itemize.
A ref. *Note xref Text with features caption: Top. A footnote. (2).
-TeX and _te\'i^<an_url>_ AND it is @verb a word !@ AE.
+TeX and _téî<an_url>_ AND it is @verb a word !@ Æ.
---------- Footnotes ----------
@@ -4699,7 +4687,7 @@ An itemize 2.
A ref 2. *Note xref Text with features caption: Top. A footnote 2.
(1).
-TeX and _te\'i^<an_url>_ AND it is @verb a word !@ AE.
+TeX and _téî<an_url>_ AND it is @verb a word !@ Æ.
*Note Text 1: text with a lot of features.
@@ -4747,7 +4735,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="Test-floats"></span><h1 class="top">Test floats</h1>
@@ -4916,13 +4904,13 @@ A footnote 2.
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="t_hlistoffloats_FOOT3_1" href="#t_hlistoffloats_DOCF3_1">(1)</a></h3>
+<h5><a id="t_hlistoffloats_FOOT3_1" href="#t_hlistoffloats_DOCF3_1">(1)</a></h3>
<p>footnote Text with features caption 2</p>
-<h3><a id="FOOT1" href="#DOCF1">(2)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(2)</a></h3>
<p>footnote Text with features</p>
-<h3><a id="FOOT2" href="#DOCF2">(3)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(3)</a></h3>
<p>footnote Text with features caption</p>
-<h3><a id="FOOT3" href="#DOCF3">(4)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(4)</a></h3>
<p>footnote Text with features caption 2</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/float/float_copying.pl b/macros/texinfo/texinfo/tp/t/results/float/float_copying.pl
index 3f69b6f6f8..206ac64eb7 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/float_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/float_copying.pl
@@ -283,6 +283,7 @@ $result_trees{'float_copying'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1233,6 +1234,7 @@ $result_sectioning{'float_copying'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Copying-and-floats',
'spaces_before_argument' => ' '
}
@@ -1279,6 +1281,7 @@ $result_nodes{'float_copying'} = {
'level' => 1,
'number' => 'A'
},
+ 'isindex' => 1,
'normalized' => 'Copying-and-floats',
'spaces_before_argument' => ' '
},
@@ -1300,23 +1303,11 @@ $result_nodes{'float_copying'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'float_copying'}{'menu_child'}{'node_prev'} = $result_nodes{'float_copying'};
$result_nodes{'float_copying'}{'menu_child'}{'node_up'} = $result_nodes{'float_copying'};
$result_nodes{'float_copying'}{'node_next'} = $result_nodes{'float_copying'}{'menu_child'};
-$result_nodes{'float_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'float_copying'};
$result_menus{'float_copying'} = {
'cmdname' => 'node',
@@ -1327,6 +1318,7 @@ $result_menus{'float_copying'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Copying-and-floats',
'spaces_before_argument' => ' '
},
@@ -1522,6 +1514,11 @@ Ref: Copying and floats-Footnote-11479
Ref: Copying and floats-Footnote-21552

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'float_copying'} = [
@@ -1628,7 +1625,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#Copying-and-floats" accesskey="n" rel="next">Copying and floats</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#Copying-and-floats" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#Copying-and-floats" accesskey="n" rel="next">Copying and floats</a> &nbsp; [<a href="#Copying-and-floats" title="Index" rel="index">Index</a>]</p>
</div>
<span id="Top-1"></span><h1 class="top">Top</h1>
@@ -1644,7 +1641,7 @@ the author abandon his copyright.
<span id="index-copying-indexed-caption-function"></span>
</div></div>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Copying-and-floats" accesskey="1">Copying and floats</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#Copying-and-floats" rel="index" accesskey="1">Copying and floats</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -1720,7 +1717,7 @@ the author abandon his copyright.
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>The caption copying footnote
<span id="caption-copying-footnote-anchor"></span></p>
<span id="index-copying-indexed-caption-copying-footnote"></span>
@@ -1728,7 +1725,7 @@ the author abandon his copyright.
<p>see <a href="#Copying-and-floats">Copying and floats</a>.
</p>
-<h3><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h3>
+<h5><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h3>
<p>The caption copying footnote
<span id="caption-copying-footnote-anchor"></span></p>
<span id="index-copying-indexed-caption-copying-footnote"></span>
@@ -1736,7 +1733,7 @@ the author abandon his copyright.
<p>see <a href="#Copying-and-floats">Copying and floats</a>.
</p>
-<h3><a id="FOOT1_3" href="#DOCF1_3">(3)</a></h3>
+<h5><a id="FOOT1_3" href="#DOCF1_3">(3)</a></h3>
<p>The caption copying footnote
<span id="caption-copying-footnote-anchor"></span></p>
<span id="index-copying-indexed-caption-copying-footnote"></span>
@@ -1744,7 +1741,7 @@ the author abandon his copyright.
<p>see <a href="#Copying-and-floats">Copying and floats</a>.
</p>
-<h3><a id="t_hlistoffloats_FOOT1_4" href="#t_hlistoffloats_DOCF1_4">(4)</a></h3>
+<h5><a id="t_hlistoffloats_FOOT1_4" href="#t_hlistoffloats_DOCF1_4">(4)</a></h3>
<p>The caption copying footnote
</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/float/float_with_at_commands.pl b/macros/texinfo/texinfo/tp/t/results/float/float_with_at_commands.pl
index 4a57b902b0..6df92744bc 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/float_with_at_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/float_with_at_commands.pl
@@ -519,13 +519,13 @@ $result_floats{'float_with_at_commands'}{'entr@\'ee'}[0]{'extra'}{'caption'}{'ex
-$result_converted{'plaintext'}->{'float_with_at_commands'} = 'Ceci est notre premie`re entre\'e.
+$result_converted{'plaintext'}->{'float_with_at_commands'} = 'Ceci est notre première entrée.
-entre\'e 1: La premie`re entre\'e est importante
+entrée 1: La première entrée est importante
* Menu:
-* entre\'e 1: premie`re entre\'e. La premie`re entre\'e est ...
+* entrée 1: première entrée. La première entrée est ...
';
diff --git a/macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption.pl b/macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption.pl
index 10cc6812fd..99bd3bf023 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption.pl
@@ -315,20 +315,8 @@ $result_nodes{'footnote_in_caption'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'footnote_in_caption'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'footnote_in_caption'};
$result_menus{'footnote_in_caption'} = {
'cmdname' => 'node',
@@ -419,6 +407,11 @@ Ref: label126
Ref: Top-Footnote-1194

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -470,9 +463,9 @@ ul.no-bullet {list-style: none}
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="t_hlistoffloats_FOOT1_1" href="#t_hlistoffloats_DOCF1_1">(1)</a></h3>
+<h5><a id="t_hlistoffloats_FOOT1_1" href="#t_hlistoffloats_DOCF1_1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT1" href="#DOCF1">(2)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(2)</a></h3>
<p>in footnote</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption_and_error.pl b/macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption_and_error.pl
index 70e86e71a0..e6430ae549 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -323,20 +323,8 @@ $result_nodes{'footnote_in_caption_and_error'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'footnote_in_caption_and_error'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'footnote_in_caption_and_error'};
$result_menus{'footnote_in_caption_and_error'} = {
'cmdname' => 'node',
@@ -460,9 +448,9 @@ ul.no-bullet {list-style: none}
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="t_hlistoffloats_FOOT1_1" href="#t_hlistoffloats_DOCF1_1">(1)</a></h3>
+<h5><a id="t_hlistoffloats_FOOT1_1" href="#t_hlistoffloats_DOCF1_1">(1)</a></h3>
<p>in footnote error&rarr;</p>
-<h3><a id="FOOT1" href="#DOCF1">(2)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(2)</a></h3>
<p>in footnote error&rarr;</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl b/macros/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl
index ab4d4725a5..22e6f8947a 100644
--- a/macros/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/macros/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -7036,18 +7036,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'numbering_captions_listoffloats'}{'menu_child'};
$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'};
@@ -7063,7 +7052,6 @@ $result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_next'}{'nod
$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_prev'} = $result_nodes{'numbering_captions_listoffloats'};
$result_nodes{'numbering_captions_listoffloats'}{'menu_child'}{'node_up'} = $result_nodes{'numbering_captions_listoffloats'};
$result_nodes{'numbering_captions_listoffloats'}{'node_next'} = $result_nodes{'numbering_captions_listoffloats'}{'menu_child'};
-$result_nodes{'numbering_captions_listoffloats'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'numbering_captions_listoffloats'};
$result_menus{'numbering_captions_listoffloats'} = {
'cmdname' => 'node',
@@ -8020,9 +8008,9 @@ Text 1.1: C Text in chapter
Text 1.2: An example of float caption, no shortcaption...
-A the\'ore`me
+A théorème
-the\'ore`me 1.1: C A the\'ore`me
+théorème 1.1: C A théorème
float with no type.
@@ -8115,7 +8103,7 @@ text with a lot of features.
* Menu:
-* the\'ore`me 1.1: theoreme. C A the\'ore`me
+* théorème 1.1: theoreme. C A théorème
';
@@ -8157,7 +8145,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="Test-floats"></span><h1 class="top">Test floats</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/cond.pl b/macros/texinfo/texinfo/tp/t/results/formatting/cond.pl
index 70be10b8ef..33649c6694 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/cond.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/cond.pl
@@ -434,20 +434,8 @@ $result_nodes{'cond'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cond'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cond'};
$result_menus{'cond'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl b/macros/texinfo/texinfo/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index ba384d0511..88832553b5 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -451,20 +451,8 @@ $result_nodes{'cond_ifhtml_ifinfo_iftex'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cond_ifhtml_ifinfo_iftex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cond_ifhtml_ifinfo_iftex'};
$result_menus{'cond_ifhtml_ifinfo_iftex'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/cond_info.pl b/macros/texinfo/texinfo/tp/t/results/formatting/cond_info.pl
index 50f3460e5c..4639ae30f1 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/cond_info.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/cond_info.pl
@@ -417,20 +417,8 @@ $result_nodes{'cond_info'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cond_info'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cond_info'};
$result_menus{'cond_info'} = {
'cmdname' => 'node',
@@ -461,6 +449,11 @@ Tag Table:
Node: Top65

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl b/macros/texinfo/texinfo/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
index b6041e4a14..e7cd1ee513 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -451,20 +451,8 @@ $result_nodes{'cond_info_ifhtml_ifinfo_iftex'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cond_info_ifhtml_ifinfo_iftex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cond_info_ifhtml_ifinfo_iftex'};
$result_menus{'cond_info_ifhtml_ifinfo_iftex'} = {
'cmdname' => 'node',
@@ -499,6 +487,11 @@ Tag Table:
Node: Top65

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl b/macros/texinfo/texinfo/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index 03dfba47ac..d3406ded0a 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -417,20 +417,8 @@ $result_nodes{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cond_info_no-ifhtml_no-ifinfo_no-iftex'};
$result_menus{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'node',
@@ -461,6 +449,11 @@ Tag Table:
Node: Top65

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl b/macros/texinfo/texinfo/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index 77cbbb2b04..3ad0622b61 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -417,20 +417,8 @@ $result_nodes{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cond_no-ifhtml_no-ifinfo_no-iftex'};
$result_menus{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/cond_xml.pl b/macros/texinfo/texinfo/tp/t/results/formatting/cond_xml.pl
index f838d43e4d..daf7dd205b 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/cond_xml.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/cond_xml.pl
@@ -417,20 +417,8 @@ $result_nodes{'cond_xml'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cond_xml'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cond_xml'};
$result_menus{'cond_xml'} = {
'cmdname' => 'node',
@@ -447,7 +435,7 @@ $result_errors{'cond_xml'} = [];
$result_converted{'xml'}->{'cond_xml'} = '<preamble>\\input texinfo
</preamble><setfilename file="cond.info" spaces=" ">cond.info</setfilename>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
<html endspaces=" ">
</html>
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl b/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl
index bf56942ff8..72e449ebfa 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -1246,23 +1246,11 @@ $result_nodes{'direntry_dircategory_info_split'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'direntry_dircategory_info_split'}{'menu_child'}{'node_prev'} = $result_nodes{'direntry_dircategory_info_split'};
$result_nodes{'direntry_dircategory_info_split'}{'menu_child'}{'node_up'} = $result_nodes{'direntry_dircategory_info_split'};
$result_nodes{'direntry_dircategory_info_split'}{'node_next'} = $result_nodes{'direntry_dircategory_info_split'}{'menu_child'};
-$result_nodes{'direntry_dircategory_info_split'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'direntry_dircategory_info_split'};
$result_menus{'direntry_dircategory_info_split'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split/res_info/direntry_dircategory.info b/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split/res_info/direntry_dircategory.info
index 33f6b5ecfa..d5de60b014 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split/res_info/direntry_dircategory.info
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/direntry_dircategory_info_split/res_info/direntry_dircategory.info
@@ -30,3 +30,8 @@ Node: Top430
Node: chapter1024

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option.pl b/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option.pl
index 534dc25f91..26ffcbecb4 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option.pl
@@ -352,20 +352,8 @@ $result_nodes{'documentlanguage_set_option'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'documentlanguage_set_option'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'documentlanguage_set_option'};
$result_menus{'documentlanguage_set_option'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info.pl b/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info.pl
index 2ac897b22c..a35bc05cea 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info.pl
@@ -352,20 +352,8 @@ $result_nodes{'documentlanguage_set_option_info'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'documentlanguage_set_option_info'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'documentlanguage_set_option_info'};
$result_menus{'documentlanguage_set_option_info'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info/res_info/documentlanguage_set.info b/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info/res_info/documentlanguage_set.info
index bf7ed67ad5..c9bb6b4799 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info/res_info/documentlanguage_set.info
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_option_info/res_info/documentlanguage_set.info
@@ -15,3 +15,8 @@ Tag Table:
Node: Top97

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_unknown.pl b/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_unknown.pl
index 80e6606eaa..bdd06234a2 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_unknown.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/documentlanguage_set_unknown.pl
@@ -352,20 +352,8 @@ $result_nodes{'documentlanguage_set_unknown'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'documentlanguage_set_unknown'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'documentlanguage_set_unknown'};
$result_menus{'documentlanguage_set_unknown'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying.pl b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying.pl
index ae7e4cbb57..dea471feb4 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying.pl
@@ -342,6 +342,7 @@ $result_trees{'float_copying'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1807,6 +1808,7 @@ $result_sectioning{'float_copying'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Copying-and-floats',
'spaces_before_argument' => ' '
}
@@ -1853,6 +1855,7 @@ $result_nodes{'float_copying'} = {
'level' => 1,
'number' => 'A'
},
+ 'isindex' => 1,
'normalized' => 'Copying-and-floats',
'spaces_before_argument' => ' '
},
@@ -1874,23 +1877,11 @@ $result_nodes{'float_copying'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'float_copying'}{'menu_child'}{'node_prev'} = $result_nodes{'float_copying'};
$result_nodes{'float_copying'}{'menu_child'}{'node_up'} = $result_nodes{'float_copying'};
$result_nodes{'float_copying'}{'node_next'} = $result_nodes{'float_copying'}{'menu_child'};
-$result_nodes{'float_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'float_copying'};
$result_menus{'float_copying'} = {
'cmdname' => 'node',
@@ -1901,6 +1892,7 @@ $result_menus{'float_copying'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Copying-and-floats',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
index 53d31a85ae..ada022aa6d 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/Copying-and-floats.html
@@ -40,16 +40,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-floats"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#Copying-and-floats" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="float_copying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -105,14 +105,14 @@ the author abandon his copyright.
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-floats-1_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-indexed-caption">indexed caption</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="float_copying_fot.html#index-copying-indexed-caption-copying-footnote">indexed caption copying footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-indexed-caption">indexed caption</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="float_copying_fot.html#index-copying-indexed-caption-copying-footnote">indexed caption copying footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-floats-1_cp_letter-L">L</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-listofloats">listofloats</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-floats">Appendix A Copying and floats</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-floats-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-Top">Top</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-Top">Top</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-floats-1_cp_letter-I"><b>I</b></a>
@@ -131,10 +131,10 @@ the author abandon his copyright.
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-floats-1_fn_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-indexed-caption-function"><code>indexed caption function</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-indexed-caption-function"><code>indexed caption function</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-floats-1_fn_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="float_copying_fot.html#index-copying-public-domain-function"><code>public domain function</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="float_copying_fot.html#index-copying-public-domain-function"><code>public domain function</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-floats-1_fn_letter-I"><b>I</b></a>
@@ -145,14 +145,14 @@ the author abandon his copyright.
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#Copying-and-floats" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="float_copying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_abt.html b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_abt.html
index 0936539157..976423ae33 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_abt.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="Copying-and-floats.html#Copying-and-floats" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-floats.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -150,9 +150,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="Copying-and-floats.html#Copying-and-floats" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-floats.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
index 054f7f57b1..2c98fb99cd 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/float_copying_fot.html
@@ -41,22 +41,22 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Foot"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="Copying-and-floats.html#Copying-and-floats" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-floats.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="float_copying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="index.html#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="index.html#DOCF1">(1)</a></h3>
<p>The caption copying footnote
<span id="caption-copying-footnote-anchor"></span></p>
<span id="index-copying-indexed-caption-copying-footnote"></span>
<span id="index-copying-public-domain-function"></span>
-<p>see <a href="Copying-and-floats.html#Copying-and-floats">Copying and floats</a>.
+<p>see <a href="Copying-and-floats.html">Copying and floats</a>.
</p>
-<h3><a id="FOOT1_2" href="Copying-and-floats.html#DOCF1_2">(2)</a></h3>
+<h5><a id="FOOT1_2" href="Copying-and-floats.html#DOCF1_2">(2)</a></h3>
<p>The caption copying footnote
<span id="caption-copying-footnote-anchor"></span></p>
<span id="index-copying-indexed-caption-copying-footnote"></span>
@@ -64,7 +64,7 @@ ul.no-bullet {list-style: none}
<p>see <a href="#Copying-and-floats">Copying and floats</a>.
</p>
-<h3><a id="FOOT1_3" href="Copying-and-floats.html#DOCF1_3">(3)</a></h3>
+<h5><a id="FOOT1_3" href="Copying-and-floats.html#DOCF1_3">(3)</a></h3>
<p>The caption copying footnote
<span id="caption-copying-footnote-anchor"></span></p>
<span id="index-copying-indexed-caption-copying-footnote"></span>
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
<p>see <a href="#Copying-and-floats">Copying and floats</a>.
</p>
-<h3><a id="t_hlistoffloats_FOOT1_4" href="Copying-and-floats.html#t_hlistoffloats_DOCF1_4">(4)</a></h3>
+<h5><a id="t_hlistoffloats_FOOT1_4" href="Copying-and-floats.html#t_hlistoffloats_DOCF1_4">(4)</a></h3>
<p>The caption copying footnote
</p>
@@ -80,9 +80,9 @@ ul.no-bullet {list-style: none}
</p>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="Copying-and-floats.html#Copying-and-floats" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-floats.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="float_copying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/index.html
index 63fc189ebe..1e53831eb5 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/float_copying/res_html/index.html
@@ -43,10 +43,10 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Copying-and-floats.html#Copying-and-floats" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-floats.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="Copying-and-floats.html#Copying-and-floats" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-floats.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="float_copying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Top-1"></span><h1 class="top">Top</h1>
@@ -69,17 +69,17 @@ the author abandon his copyright.
<span id="index-copying-indexed-caption-function"></span>
</div></div>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-floats.html#Copying-and-floats">Appendix A Copying and floats</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-floats.html" rel="index">Appendix A Copying and floats</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Copying-and-floats.html#Copying-and-floats" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-floats.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="Copying-and-floats.html#Copying-and-floats" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-floats.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="float_copying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_date_in_header.pl b/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_date_in_header.pl
index 33a2485f31..91cd53368e 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_date_in_header.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_date_in_header.pl
@@ -206,20 +206,8 @@ $result_nodes{'simplest_test_date_in_header'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'simplest_test_date_in_header'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'simplest_test_date_in_header'};
$result_menus{'simplest_test_date_in_header'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix.pl b/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix.pl
index f277b42415..325b826c54 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix.pl
@@ -206,20 +206,8 @@ $result_nodes{'simplest_test_prefix'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'simplest_test_prefix'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'simplest_test_prefix'};
$result_menus{'simplest_test_prefix'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html b/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
deleted file mode 100644
index db24cdfe89..0000000000
--- a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix/res_html/truc.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
-
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<style type="text/css">
-<!--
-a.summary-letter {text-decoration: none}
-blockquote.indentedblock {margin-right: 0em}
-div.display {margin-left: 3.2em}
-div.example {margin-left: 3.2em}
-div.lisp {margin-left: 3.2em}
-kbd {font-style: oblique}
-pre.display {font-family: inherit}
-pre.format {font-family: inherit}
-pre.menu-comment {font-family: serif}
-pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
-span.roman {font-family: initial; font-weight: normal}
-span.sansserif {font-family: sans-serif; font-weight: normal}
-ul.no-bullet {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-
-<span id="Top"></span>
-<p>This is a very simple texi manual &nbsp; &lt;&gt;.
-</p>
-<hr>
-<p><font size="-1">
- This document was generated on <em>a sunny day</em> using <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
-</font></p>
-
-
-</body>
-</html>
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info.pl b/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info.pl
index 6830cba2a8..8e7e0d3113 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info.pl
@@ -206,20 +206,8 @@ $result_nodes{'simplest_test_prefix_info'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'simplest_test_prefix_info'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'simplest_test_prefix_info'};
$result_menus{'simplest_test_prefix_info'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info/res_info/truc.info b/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info/res_info/truc.info
deleted file mode 100644
index 347c1116d7..0000000000
--- a/macros/texinfo/texinfo/tp/t/results/formatting/simplest_test_prefix_info/res_info/truc.info
+++ /dev/null
@@ -1,13 +0,0 @@
-This is truc.info, produced by texi2any version from simplest.texi.
-
-
-File: truc.info, Node: Top, Up: (dir)
-
-This is a very simple texi manual <>.
-
-
-
-Tag Table:
-Node: Top69
-
-End Tag Table
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split.pl b/macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split.pl
index 2dd502cb7c..2c50790411 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split.pl
@@ -206,20 +206,8 @@ $result_nodes{'split_for_format_not_split'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'split_for_format_not_split'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'split_for_format_not_split'};
$result_menus{'split_for_format_not_split'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml b/macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
index b3eb92c70e..03c2a2ded2 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
@@ -6,7 +6,7 @@
</preamble><setfilename file="simplest.info" spaces=" ">simplest.info</setfilename>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
<para>This is a very simple texi manual <spacecmd type="spc"/> &lt;&gt;.
</para>
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying.pl b/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying.pl
index 4d1e3f9150..479b4f5eff 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying.pl
@@ -563,23 +563,11 @@ $result_nodes{'split_nocopying'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'split_nocopying'}{'menu_child'}{'node_prev'} = $result_nodes{'split_nocopying'};
$result_nodes{'split_nocopying'}{'menu_child'}{'node_up'} = $result_nodes{'split_nocopying'};
$result_nodes{'split_nocopying'}{'node_next'} = $result_nodes{'split_nocopying'}{'menu_child'};
-$result_nodes{'split_nocopying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'split_nocopying'};
$result_menus{'split_nocopying'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying/res_info/split-nocopying.info b/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying/res_info/split-nocopying.info
index 990f1b8da9..f801a8f5dd 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying/res_info/split-nocopying.info
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying/res_info/split-nocopying.info
@@ -28,3 +28,8 @@ Node: Top87
Node: Ch1203

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split.pl b/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split.pl
index 07960ef212..73391db699 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split.pl
@@ -563,23 +563,11 @@ $result_nodes{'split_nocopying_split'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'split_nocopying_split'}{'menu_child'}{'node_prev'} = $result_nodes{'split_nocopying_split'};
$result_nodes{'split_nocopying_split'}{'menu_child'}{'node_up'} = $result_nodes{'split_nocopying_split'};
$result_nodes{'split_nocopying_split'}{'node_next'} = $result_nodes{'split_nocopying_split'}{'menu_child'};
-$result_nodes{'split_nocopying_split'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'split_nocopying_split'};
$result_menus{'split_nocopying_split'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split/res_info/split-nocopying.info b/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split/res_info/split-nocopying.info
index 9ba08915eb..aaf930bac1 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split/res_info/split-nocopying.info
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/split_nocopying_split/res_info/split-nocopying.info
@@ -12,3 +12,8 @@ Node: Top87
Node: Ch1290

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/texi_bib_example.pl b/macros/texinfo/texinfo/tp/t/results/formatting/texi_bib_example.pl
index f52e03b495..ddd7638118 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/texi_bib_example.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/texi_bib_example.pl
@@ -5528,25 +5528,13 @@ $result_nodes{'texi_bib_example'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'texi_bib_example'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'texi_bib_example'}{'menu_child'};
$result_nodes{'texi_bib_example'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'texi_bib_example'};
$result_nodes{'texi_bib_example'}{'menu_child'}{'node_prev'} = $result_nodes{'texi_bib_example'};
$result_nodes{'texi_bib_example'}{'menu_child'}{'node_up'} = $result_nodes{'texi_bib_example'};
$result_nodes{'texi_bib_example'}{'node_next'} = $result_nodes{'texi_bib_example'}{'menu_child'};
-$result_nodes{'texi_bib_example'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'texi_bib_example'};
$result_menus{'texi_bib_example'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/texi_cond.pl b/macros/texinfo/texinfo/tp/t/results/formatting/texi_cond.pl
index 85f61adf0a..edb3bad8c2 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/texi_cond.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/texi_cond.pl
@@ -434,20 +434,8 @@ $result_nodes{'texi_cond'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'texi_cond'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'texi_cond'};
$result_menus{'texi_cond'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/texi_glossary.pl b/macros/texinfo/texinfo/tp/t/results/formatting/texi_glossary.pl
index 4cb1781c54..43b4ec1a9f 100644
--- a/macros/texinfo/texinfo/tp/t/results/formatting/texi_glossary.pl
+++ b/macros/texinfo/texinfo/tp/t/results/formatting/texi_glossary.pl
@@ -1487,23 +1487,11 @@ $result_nodes{'texi_glossary'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'texi_glossary'}{'menu_child'}{'node_prev'} = $result_nodes{'texi_glossary'};
$result_nodes{'texi_glossary'}{'menu_child'}{'node_up'} = $result_nodes{'texi_glossary'};
$result_nodes{'texi_glossary'}{'node_next'} = $result_nodes{'texi_glossary'}{'menu_child'};
-$result_nodes{'texi_glossary'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'texi_glossary'};
$result_menus{'texi_glossary'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/unknown_nodes_renamed.pl b/macros/texinfo/texinfo/tp/t/results/formatting/unknown_nodes_renamed.pl
deleted file mode 100644
index 42a52c41a7..0000000000
--- a/macros/texinfo/texinfo/tp/t/results/formatting/unknown_nodes_renamed.pl
+++ /dev/null
@@ -1,128 +0,0 @@
-use vars qw(%result_texis %result_texts %result_trees %result_errors
- %result_indices %result_sectioning %result_nodes %result_menus
- %result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text);
-
-use utf8;
-
-$result_trees{'unknown_nodes_renamed'} = {
- 'contents' => [
- {
- 'contents' => [],
- 'parent' => {},
- 'type' => 'text_root'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Top'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top',
- 'spaces_before_argument' => ' '
- },
- 'line_nr' => {
- 'file_name' => 'unknown_nodes_renamed.texi',
- 'line_nr' => 1,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'type' => 'document_root'
-};
-$result_trees{'unknown_nodes_renamed'}{'contents'}[0]{'parent'} = $result_trees{'unknown_nodes_renamed'};
-$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'args'}[0];
-$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'unknown_nodes_renamed'}{'contents'}[1];
-$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'extra'}{'node_content'};
-$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'parent'} = $result_trees{'unknown_nodes_renamed'};
-
-$result_texis{'unknown_nodes_renamed'} = '@node Top
-';
-
-
-$result_texts{'unknown_nodes_renamed'} = '';
-
-$result_sectioning{'unknown_nodes_renamed'} = {};
-
-$result_nodes{'unknown_nodes_renamed'} = {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top',
- 'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
-};
-$result_nodes{'unknown_nodes_renamed'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'unknown_nodes_renamed'};
-
-$result_menus{'unknown_nodes_renamed'} = {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top',
- 'spaces_before_argument' => ' '
- }
-};
-
-$result_errors{'unknown_nodes_renamed'} = [];
-
-
-
-$result_converted{'file_html'}->{'unknown_nodes_renamed'} = '';
-
-$result_converted_errors{'file_html'}->{'unknown_nodes_renamed'} = [
- {
- 'error_line' => 'texi2any: warning: using a renamed nodes file (`unknown_nodes_renamed-noderename.cnf\') is deprecated
-',
- 'text' => 'using a renamed nodes file (`unknown_nodes_renamed-noderename.cnf\') is deprecated',
- 'type' => 'warning'
- },
- {
- 'error_line' => 'unknown_nodes_renamed.texi: warning: must specify a title with a title command or @top
-',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- },
- {
- 'error_line' => 'unknown_nodes_renamed-noderename.cnf:3: warning: target node (new name for `Unknown node 1\') not in document: renamed as unknow too
-',
- 'text' => 'target node (new name for `Unknown node 1\') not in document: renamed as unknow too',
- 'type' => 'warning'
- }
-];
-
-
-1;
diff --git a/macros/texinfo/texinfo/tp/t/results/formatting/unknown_nodes_renamed/res_html/unknown_nodes_renamed.html b/macros/texinfo/texinfo/tp/t/results/formatting/unknown_nodes_renamed/res_html/unknown_nodes_renamed.html
deleted file mode 100644
index 03e419e0ba..0000000000
--- a/macros/texinfo/texinfo/tp/t/results/formatting/unknown_nodes_renamed/res_html/unknown_nodes_renamed.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
-
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<style type="text/css">
-<!--
-a.summary-letter {text-decoration: none}
-blockquote.indentedblock {margin-right: 0em}
-div.display {margin-left: 3.2em}
-div.example {margin-left: 3.2em}
-div.lisp {margin-left: 3.2em}
-kbd {font-style: oblique}
-pre.display {font-family: inherit}
-pre.format {font-family: inherit}
-pre.menu-comment {font-family: serif}
-pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
-span.roman {font-family: initial; font-weight: normal}
-span.sansserif {font-family: sans-serif; font-weight: normal}
-ul.no-bullet {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<span id="Top"></span><hr>
-<p><font size="-1">
- This document was generated on <em>a sunny day</em> using <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
-</font></p>
-
-
-</body>
-</html>
diff --git a/macros/texinfo/texinfo/tp/t/results/heading/heading_in_copying.pl b/macros/texinfo/texinfo/tp/t/results/heading/heading_in_copying.pl
index 7c6ceee52a..18b40a792c 100644
--- a/macros/texinfo/texinfo/tp/t/results/heading/heading_in_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/heading/heading_in_copying.pl
@@ -371,20 +371,8 @@ $result_nodes{'heading_in_copying'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'heading_in_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'heading_in_copying'};
$result_menus{'heading_in_copying'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/check_htmlxref.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/check_htmlxref.pl
index dc558a1afe..8522bfbea9 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/check_htmlxref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/check_htmlxref.pl
@@ -114,8 +114,7 @@ $result_trees{'check_htmlxref'} = {
{
'manual_content' => [
{}
- ],
- 'top_node_up' => {}
+ ]
}
],
'normalized' => 'Top',
@@ -588,7 +587,6 @@ $result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'nod
$result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0] = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[1]{'contents'}[1];
$result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0] = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[2]{'contents'}[0];
$result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0] = $result_trees{'check_htmlxref'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'check_htmlxref'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'top_node_up'} = $result_trees{'check_htmlxref'}{'contents'}[1];
$result_trees{'check_htmlxref'}{'contents'}[1]{'parent'} = $result_trees{'check_htmlxref'};
$result_trees{'check_htmlxref'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2]{'args'}[0];
$result_trees{'check_htmlxref'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'check_htmlxref'}{'contents'}[2];
@@ -769,13 +767,11 @@ $result_nodes{'check_htmlxref'} = {
{
'text' => 'dir'
}
- ],
- 'top_node_up' => {}
+ ]
}
}
};
$result_nodes{'check_htmlxref'}{'node_prev'} = $result_nodes{'check_htmlxref'}{'menu_child'};
-$result_nodes{'check_htmlxref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'check_htmlxref'};
$result_menus{'check_htmlxref'} = {
'cmdname' => 'node',
@@ -848,7 +844,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="..html#Top" accesskey="n" rel="next">(../there/no_existing_no_manual_direction)</a>, Previous: <a href="#first" accesskey="p" rel="prev">first</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="no_existing_no_manual_direction.html#Top" accesskey="n" rel="next">(../there/no_existing_no_manual_direction)</a>, Previous: <a href="#first" accesskey="p" rel="prev">first</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -884,6 +880,12 @@ $result_converted_errors{'html'}->{'check_htmlxref'} = [
'type' => 'warning'
},
{
+ 'error_line' => 'warning: no htmlxref.cnf entry found for `dir\'
+',
+ 'text' => 'no htmlxref.cnf entry found for `dir\'',
+ 'type' => 'warning'
+ },
+ {
'error_line' => ':5: warning: no htmlxref.cnf entry found for `no_existing_no_manual.info\'
',
'file_name' => '',
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/commands_in_alt.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/commands_in_alt.pl
index bf88f5cea5..bddede4a8d 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/commands_in_alt.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/commands_in_alt.pl
@@ -64,6 +64,9 @@ $result_trees{'commands_in_alt'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -149,6 +152,9 @@ $result_trees{'commands_in_alt'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index a213048897..7710ac1645 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -224,20 +224,8 @@ $result_nodes{'empty_lines_at_beginning_no_setfilename'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'empty_lines_at_beginning_no_setfilename'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'empty_lines_at_beginning_no_setfilename'};
$result_menus{'empty_lines_at_beginning_no_setfilename'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/html_in_copying.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/html_in_copying.pl
index 5fffb57b14..b362ab9a02 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/html_in_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/html_in_copying.pl
@@ -326,20 +326,8 @@ $result_nodes{'html_in_copying'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'html_in_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'html_in_copying'};
$result_menus{'html_in_copying'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/image_link_prefix.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/image_link_prefix.pl
index 06ee6ea76c..bccb3e451d 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/image_link_prefix.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/image_link_prefix.pl
@@ -22,6 +22,9 @@ $result_trees{'image_link_prefix'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/index_and_node_same_name.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/index_and_node_same_name.pl
index f652f8e315..888889df66 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -147,6 +147,7 @@ $result_trees{'index_and_node_same_name'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -224,6 +225,7 @@ $result_sectioning{'index_and_node_same_name'}{'section_childs'}[0]{'section_up'
$result_nodes{'index_and_node_same_name'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'index-node',
'spaces_before_argument' => ' '
}
@@ -232,6 +234,7 @@ $result_nodes{'index_and_node_same_name'} = {
$result_menus{'index_and_node_same_name'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'index-node',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels.pl
index df268bdf16..c0686936a7 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels.pl
@@ -1491,18 +1491,7 @@ $result_nodes{'redirection_same_labels'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'redirection_same_labels'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'redirection_same_labels'}{'menu_child'}{'menu_child'};
$result_nodes{'redirection_same_labels'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'redirection_same_labels'}{'menu_child'};
@@ -1513,7 +1502,6 @@ $result_nodes{'redirection_same_labels'}{'menu_child'}{'node_next'}{'node_up'} =
$result_nodes{'redirection_same_labels'}{'menu_child'}{'node_prev'} = $result_nodes{'redirection_same_labels'};
$result_nodes{'redirection_same_labels'}{'menu_child'}{'node_up'} = $result_nodes{'redirection_same_labels'};
$result_nodes{'redirection_same_labels'}{'node_next'} = $result_nodes{'redirection_same_labels'}{'menu_child'};
-$result_nodes{'redirection_same_labels'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'redirection_same_labels'};
$result_menus{'redirection_same_labels'} = {
'cmdname' => 'node',
@@ -1714,17 +1702,6 @@ $result_elements{'redirection_same_labels'} = [
'Forward' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -1775,7 +1752,6 @@ $result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForwa
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'Forward'} = $result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'redirection_same_labels'}[0];
$result_elements{'redirection_same_labels'}[0]{'extra'}{'node'} = $result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'redirection_same_labels'}[0]{'extra'}{'section'} = $result_elements{'redirection_same_labels'}[0]{'extra'}{'element_command'};
@@ -1789,7 +1765,6 @@ $result_directions_text{'redirection_same_labels'} = 'element: @top the top
Forward: @chapter umlaut
NodeForward: @chapter umlaut
NodeNext: @chapter umlaut
- NodeUp: (dir)
This: @top the top
element: @chapter umlaut
Back: @top the top
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html b/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
index 7b38bd8839..46531cf6f1 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/circumflex.html
@@ -9,8 +9,8 @@
<meta name="keywords" content="circumflex (the top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
<link href="umlaut.html#g_t_0129" rel="prev" title="&#297;">
<style type="text/css">
<!--
@@ -37,7 +37,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="circumflex"></span><div class="header">
<p>
-Previous: <a href="umlaut.html#umlaut" accesskey="p" rel="prev">umlaut</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Previous: <a href="umlaut.html#umlaut" accesskey="p" rel="prev">umlaut</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<span id="circumflex-1"></span><h2 class="chapter">2 circumflex</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/index.html
index 719b4b01d5..ec2facadf7 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/index.html
@@ -10,7 +10,6 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
<link href="umlaut.html#umlaut" rel="next" title="umlaut">
<style type="text/css">
<!--
@@ -38,7 +37,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a> &nbsp; </p>
</div>
<span id="the-top"></span><h1 class="top">the top</h1>
@@ -52,7 +51,7 @@ Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a>, Up: <a h
<hr>
<div class="header">
<p>
-Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="umlaut.html#umlaut" accesskey="n" rel="next">umlaut</a> &nbsp; </p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html b/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
index 30dc8fc4e9..05e048362a 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/redirection_same_labels/res_html/umlaut.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="umlaut (the top)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
<link href="circumflex.html#circumflex" rel="next" title="circumflex">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="umlaut"></span><div class="header">
<p>
-Next: <a href="circumflex.html#circumflex" accesskey="n" rel="next">circumflex</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="circumflex.html#circumflex" accesskey="n" rel="next">circumflex</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<span id="umlaut-1"></span><h2 class="chapter">1 umlaut</h2>
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/ref_in_preformatted.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/ref_in_preformatted.pl
index 2ae4466379..7ec2430694 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -431,23 +431,11 @@ $result_nodes{'ref_in_preformatted'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'ref_in_preformatted'}{'menu_child'}{'node_prev'} = $result_nodes{'ref_in_preformatted'};
$result_nodes{'ref_in_preformatted'}{'menu_child'}{'node_up'} = $result_nodes{'ref_in_preformatted'};
$result_nodes{'ref_in_preformatted'}{'node_next'} = $result_nodes{'ref_in_preformatted'}{'menu_child'};
-$result_nodes{'ref_in_preformatted'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_in_preformatted'};
$result_menus{'ref_in_preformatted'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/simple_menu.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/simple_menu.pl
index d8557c6c45..0d4a9cec24 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/simple_menu.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/simple_menu.pl
@@ -2137,21 +2137,9 @@ $result_nodes{'simple_menu'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'simple_menu'}{'node_next'} = $result_nodes{'simple_menu'}{'menu_child'};
-$result_nodes{'simple_menu'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'simple_menu'};
$result_menus{'simple_menu'} = {
'cmdname' => 'node',
@@ -2227,6 +2215,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index d2a8d6eeb5..f15446834f 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -634,23 +634,11 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'test_xrefautomaticsectiontitle'}{'menu_child'}{'node_prev'} = $result_nodes{'test_xrefautomaticsectiontitle'};
$result_nodes{'test_xrefautomaticsectiontitle'}{'menu_child'}{'node_up'} = $result_nodes{'test_xrefautomaticsectiontitle'};
$result_nodes{'test_xrefautomaticsectiontitle'}{'node_next'} = $result_nodes{'test_xrefautomaticsectiontitle'}{'menu_child'};
-$result_nodes{'test_xrefautomaticsectiontitle'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'test_xrefautomaticsectiontitle'};
$result_menus{'test_xrefautomaticsectiontitle'} = {
'cmdname' => 'node',
@@ -713,7 +701,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chap" accesskey="n" rel="next">chap</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chap" accesskey="n" rel="next">chap</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/titles.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/titles.pl
index 61c25730cb..c9c78ac95d 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/titles.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/titles.pl
@@ -374,20 +374,8 @@ $result_nodes{'titles'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'titles'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'titles'};
$result_menus{'titles'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
index 44af5a87de..ad62e5d5e4 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
@@ -213,6 +213,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'inc_file.texi'
},
diff --git a/macros/texinfo/texinfo/tp/t/results/html_tests/xml_protected_in_verb.pl b/macros/texinfo/texinfo/tp/t/results/html_tests/xml_protected_in_verb.pl
index 78fc954462..ba257b8eda 100644
--- a/macros/texinfo/texinfo/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/macros/texinfo/texinfo/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -107,6 +107,7 @@ $result_trees{'xml_protected_in_verb'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'file_with_xml_chars.texi'
},
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref.pl b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref.pl
index 5c6a293340..a53eadd3a1 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref.pl
@@ -1035,7 +1035,7 @@ $result_trees{'htmlxref'} = {
'contents' => [
{
'parent' => {},
- 'text' => '../manual/doc.texi'
+ 'text' => '../manual/doc'
}
],
'extra' => {
@@ -3282,7 +3282,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
@subheading Testing manual name
-@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc.texi}@*
+@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc}@*
@example
mono : doc.html#node
split: ../doc/node.html#node
@@ -3550,18 +3550,7 @@ $result_nodes{'htmlxref'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'htmlxref'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'htmlxref'}{'menu_child'};
@@ -3573,7 +3562,6 @@ $result_nodes{'htmlxref'}{'menu_child'}{'node_next'} = $result_nodes{'htmlxref'}
$result_nodes{'htmlxref'}{'menu_child'}{'node_prev'} = $result_nodes{'htmlxref'};
$result_nodes{'htmlxref'}{'menu_child'}{'node_up'} = $result_nodes{'htmlxref'};
$result_nodes{'htmlxref'}{'node_next'} = $result_nodes{'htmlxref'}{'menu_child'};
-$result_nodes{'htmlxref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'htmlxref'};
$result_menus{'htmlxref'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
index 240ce05e0e..f7a1a59f23 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref/res_html/test_refs.html
@@ -76,7 +76,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-<p><tt>../manual/doc.texi</tt> <a href="doc.html#node">(../manual/doc.texi)node</a><br>
+<p><tt>../manual/doc.texi</tt> <a href="doc.html#node">(../manual/doc)node</a><br>
</p><div class="example">
<pre class="example">mono : doc.html#node
split: ../doc/node.html#node
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes.pl b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes.pl
index 3ac912f330..8969d02a62 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -1035,7 +1035,7 @@ $result_trees{'htmlxref_nodes'} = {
'contents' => [
{
'parent' => {},
- 'text' => '../manual/doc.texi'
+ 'text' => '../manual/doc'
}
],
'extra' => {
@@ -3282,7 +3282,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
@subheading Testing manual name
-@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc.texi}@*
+@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc}@*
@example
mono : doc.html#node
split: ../doc/node.html#node
@@ -3550,18 +3550,7 @@ $result_nodes{'htmlxref_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'htmlxref_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'htmlxref_nodes'}{'menu_child'};
@@ -3573,7 +3562,6 @@ $result_nodes{'htmlxref_nodes'}{'menu_child'}{'node_next'} = $result_nodes{'html
$result_nodes{'htmlxref_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'htmlxref_nodes'};
$result_nodes{'htmlxref_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'htmlxref_nodes'};
$result_nodes{'htmlxref_nodes'}{'node_next'} = $result_nodes{'htmlxref_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'htmlxref_nodes'};
$result_menus{'htmlxref_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index e7a8f99c35..925723fa51 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 625ef45e1a..6ce036d1b2 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="local-node.html#local-node" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="local-node.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
index 3685c47e83..0379202705 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/index.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<span id="Test-refs"></span><h1 class="top">Test refs</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="other-nodes.html#other-nodes">other nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="other-nodes.html">other nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -77,7 +77,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-<p><tt>../manual/doc.texi</tt> <a href="../doc/node.html#node">(../manual/doc.texi)node</a><br>
+<p><tt>../manual/doc.texi</tt> <a href="../doc/node.html#node">(../manual/doc)node</a><br>
</p><div class="example">
<pre class="example">mono : doc.html#node
split: ../doc/node.html#node
@@ -85,12 +85,12 @@ split: ../doc/node.html#node
<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-<p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
+<p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
</p><div class="example">
<pre class="example">target: #_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
</pre></div>
-<p><tt>/;&lt;=&gt;?[\]^_`|~</tt> <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><tt>/;&lt;=&gt;?[\]^_`|~</tt> <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
</p><div class="example">
<pre class="example">target: #_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
</pre></div>
@@ -100,7 +100,7 @@ split: ../doc/node.html#node
<pre class="example">target: #Top
</pre></div>
-<p><tt> local node</tt> <a href="local-node.html#local-node">local node</a>
+<p><tt> local node</tt> <a href="local-node.html">local node</a>
</p><div class="example">
<pre class="example">target: #local-node
</pre></div>
@@ -108,7 +108,7 @@ split: ../doc/node.html#node
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
index 5b0dc7b9ec..8eba8a6955 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/local-node.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="local-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
index 157587e354..7c021b6bef 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/other-nodes.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -55,17 +55,17 @@ ul.no-bullet {list-style: none}
<pre class="example">id: other-nodes
</pre></div>
-<p><tt>Top</tt> <a href="index.html#Top">Top</a>
+<p><tt>Top</tt> <a href="index.html">Top</a>
</p><div class="example">
<pre class="example">target: #Top
</pre></div>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="local-node.html#local-node">local node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="local-node.html">local node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html
index 6c38aacb5e..b29177cdb3 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_nodes/res_html/test_refs_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -145,7 +145,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono.pl b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 94ee0f3805..bc4a0a38da 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -1035,7 +1035,7 @@ $result_trees{'htmlxref_only_mono'} = {
'contents' => [
{
'parent' => {},
- 'text' => '../manual/doc.texi'
+ 'text' => '../manual/doc'
}
],
'extra' => {
@@ -3282,7 +3282,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
@subheading Testing manual name
-@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc.texi}@*
+@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc}@*
@example
mono : doc.html#node
split: ../doc/node.html#node
@@ -3550,18 +3550,7 @@ $result_nodes{'htmlxref_only_mono'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'htmlxref_only_mono'}{'menu_child'};
@@ -3573,7 +3562,6 @@ $result_nodes{'htmlxref_only_mono'}{'menu_child'}{'node_next'} = $result_nodes{'
$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'node_prev'} = $result_nodes{'htmlxref_only_mono'};
$result_nodes{'htmlxref_only_mono'}{'menu_child'}{'node_up'} = $result_nodes{'htmlxref_only_mono'};
$result_nodes{'htmlxref_only_mono'}{'node_next'} = $result_nodes{'htmlxref_only_mono'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'htmlxref_only_mono'};
$result_menus{'htmlxref_only_mono'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
index 240ce05e0e..f7a1a59f23 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono/res_html/test_refs.html
@@ -76,7 +76,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-<p><tt>../manual/doc.texi</tt> <a href="doc.html#node">(../manual/doc.texi)node</a><br>
+<p><tt>../manual/doc.texi</tt> <a href="doc.html#node">(../manual/doc)node</a><br>
</p><div class="example">
<pre class="example">mono : doc.html#node
split: ../doc/node.html#node
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index b6b13748ca..a0a72463a7 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -1035,7 +1035,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'contents' => [
{
'parent' => {},
- 'text' => '../manual/doc.texi'
+ 'text' => '../manual/doc'
}
],
'extra' => {
@@ -3282,7 +3282,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
@subheading Testing manual name
-@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc.texi}@*
+@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc}@*
@example
mono : doc.html#node
split: ../doc/node.html#node
@@ -3550,18 +3550,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'};
@@ -3573,7 +3562,6 @@ $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'node_next'} = $result_n
$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'htmlxref_only_mono_nodes'};
$result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'htmlxref_only_mono_nodes'};
$result_nodes{'htmlxref_only_mono_nodes'}{'node_next'} = $result_nodes{'htmlxref_only_mono_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_mono_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'htmlxref_only_mono_nodes'};
$result_menus{'htmlxref_only_mono_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index e7a8f99c35..925723fa51 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 625ef45e1a..6ce036d1b2 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="local-node.html#local-node" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="local-node.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
index c9009aa68b..d28b73db59 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/index.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<span id="Test-refs"></span><h1 class="top">Test refs</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="other-nodes.html#other-nodes">other nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="other-nodes.html">other nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -77,7 +77,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-<p><tt>../manual/doc.texi</tt> <a href="../doc/node.html#node">(../manual/doc.texi)node</a><br>
+<p><tt>../manual/doc.texi</tt> <a href="../doc/node.html#node">(../manual/doc)node</a><br>
</p><div class="example">
<pre class="example">mono : doc.html#node
split: ../doc/node.html#node
@@ -85,12 +85,12 @@ split: ../doc/node.html#node
<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-<p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
+<p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
</p><div class="example">
<pre class="example">target: #_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
</pre></div>
-<p><tt>/;&lt;=&gt;?[\]^_`|~</tt> <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><tt>/;&lt;=&gt;?[\]^_`|~</tt> <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
</p><div class="example">
<pre class="example">target: #_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
</pre></div>
@@ -100,7 +100,7 @@ split: ../doc/node.html#node
<pre class="example">target: #Top
</pre></div>
-<p><tt> local node</tt> <a href="local-node.html#local-node">local node</a>
+<p><tt> local node</tt> <a href="local-node.html">local node</a>
</p><div class="example">
<pre class="example">target: #local-node
</pre></div>
@@ -108,7 +108,7 @@ split: ../doc/node.html#node
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
index 5b0dc7b9ec..8eba8a6955 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/local-node.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="local-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
index 157587e354..7c021b6bef 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/other-nodes.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -55,17 +55,17 @@ ul.no-bullet {list-style: none}
<pre class="example">id: other-nodes
</pre></div>
-<p><tt>Top</tt> <a href="index.html#Top">Top</a>
+<p><tt>Top</tt> <a href="index.html">Top</a>
</p><div class="example">
<pre class="example">target: #Top
</pre></div>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="local-node.html#local-node">local node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="local-node.html">local node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html
index 6c38aacb5e..b29177cdb3 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_mono_nodes/res_html/test_refs_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -145,7 +145,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split.pl b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split.pl
index 463aab96d6..a334d76816 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -1035,7 +1035,7 @@ $result_trees{'htmlxref_only_split'} = {
'contents' => [
{
'parent' => {},
- 'text' => '../manual/doc.texi'
+ 'text' => '../manual/doc'
}
],
'extra' => {
@@ -3282,7 +3282,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
@subheading Testing manual name
-@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc.texi}@*
+@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc}@*
@example
mono : doc.html#node
split: ../doc/node.html#node
@@ -3550,18 +3550,7 @@ $result_nodes{'htmlxref_only_split'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'htmlxref_only_split'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'htmlxref_only_split'}{'menu_child'};
@@ -3573,7 +3562,6 @@ $result_nodes{'htmlxref_only_split'}{'menu_child'}{'node_next'} = $result_nodes{
$result_nodes{'htmlxref_only_split'}{'menu_child'}{'node_prev'} = $result_nodes{'htmlxref_only_split'};
$result_nodes{'htmlxref_only_split'}{'menu_child'}{'node_up'} = $result_nodes{'htmlxref_only_split'};
$result_nodes{'htmlxref_only_split'}{'node_next'} = $result_nodes{'htmlxref_only_split'}{'menu_child'};
-$result_nodes{'htmlxref_only_split'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'htmlxref_only_split'};
$result_menus{'htmlxref_only_split'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
index cf4bd2d352..532fc1f162 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split/res_html/test_refs.html
@@ -76,7 +76,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-<p><tt>../manual/doc.texi</tt> <a href="doc.html#node">(../manual/doc.texi)node</a><br>
+<p><tt>../manual/doc.texi</tt> <a href="doc.html#node">(../manual/doc)node</a><br>
</p><div class="example">
<pre class="example">mono : doc.html#node
split: ../doc/node.html#node
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index d4c3892b1e..638a1ee422 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -1035,7 +1035,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'contents' => [
{
'parent' => {},
- 'text' => '../manual/doc.texi'
+ 'text' => '../manual/doc'
}
],
'extra' => {
@@ -3282,7 +3282,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
@subheading Testing manual name
-@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc.texi}@*
+@verb{:../manual/doc.texi:} @ref{node,,, ../manual/doc}@*
@example
mono : doc.html#node
split: ../doc/node.html#node
@@ -3550,18 +3550,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'};
@@ -3573,7 +3562,6 @@ $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'node_next'} = $result_
$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'htmlxref_only_split_nodes'};
$result_nodes{'htmlxref_only_split_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'htmlxref_only_split_nodes'};
$result_nodes{'htmlxref_only_split_nodes'}{'node_next'} = $result_nodes{'htmlxref_only_split_nodes'}{'menu_child'};
-$result_nodes{'htmlxref_only_split_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'htmlxref_only_split_nodes'};
$result_menus{'htmlxref_only_split_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index e7a8f99c35..925723fa51 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 625ef45e1a..6ce036d1b2 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="local-node.html#local-node" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="local-node.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
index 3685c47e83..0379202705 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/index.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<span id="Test-refs"></span><h1 class="top">Test refs</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="other-nodes.html#other-nodes">other nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="other-nodes.html">other nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -77,7 +77,7 @@ split: ../mtexinfo/Cross-References.html#Cross-References
<span id="Testing-manual-name"></span><h3 class="subheading">Testing manual name</h3>
-<p><tt>../manual/doc.texi</tt> <a href="../doc/node.html#node">(../manual/doc.texi)node</a><br>
+<p><tt>../manual/doc.texi</tt> <a href="../doc/node.html#node">(../manual/doc)node</a><br>
</p><div class="example">
<pre class="example">mono : doc.html#node
split: ../doc/node.html#node
@@ -85,12 +85,12 @@ split: ../doc/node.html#node
<span id="Testing-local-nodes"></span><h3 class="subheading">Testing local nodes</h3>
-<p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
+<p><tt>!_&quot;#$%&amp;'()*+-.</tt> <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
</p><div class="example">
<pre class="example">target: #_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e
</pre></div>
-<p><tt>/;&lt;=&gt;?[\]^_`|~</tt> <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a><br>
+<p><tt>/;&lt;=&gt;?[\]^_`|~</tt> <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a><br>
</p><div class="example">
<pre class="example">target: #_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e
</pre></div>
@@ -100,7 +100,7 @@ split: ../doc/node.html#node
<pre class="example">target: #Top
</pre></div>
-<p><tt> local node</tt> <a href="local-node.html#local-node">local node</a>
+<p><tt> local node</tt> <a href="local-node.html">local node</a>
</p><div class="example">
<pre class="example">target: #local-node
</pre></div>
@@ -108,7 +108,7 @@ split: ../doc/node.html#node
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
index 5b0dc7b9ec..8eba8a6955 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/local-node.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="local-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="other-nodes.html#other-nodes" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="other-nodes.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="other-nodes.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
index 157587e354..7c021b6bef 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/other-nodes.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="other-nodes"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="test_refs_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -55,17 +55,17 @@ ul.no-bullet {list-style: none}
<pre class="example">id: other-nodes
</pre></div>
-<p><tt>Top</tt> <a href="index.html#Top">Top</a>
+<p><tt>Top</tt> <a href="index.html">Top</a>
</p><div class="example">
<pre class="example">target: #Top
</pre></div>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="local-node.html#local-node">local node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="local-node.html">local node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html
index 6c38aacb5e..b29177cdb3 100644
--- a/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/htmlxref/htmlxref_only_split_nodes/res_html/test_refs_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -145,7 +145,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/include/cpp_lines.pl b/macros/texinfo/texinfo/tp/t/results/include/cpp_lines.pl
index 0451390f4b..2b9271e13e 100644
--- a/macros/texinfo/texinfo/tp/t/results/include/cpp_lines.pl
+++ b/macros/texinfo/texinfo/tp/t/results/include/cpp_lines.pl
@@ -915,20 +915,8 @@ $result_nodes{'cpp_lines'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'cpp_lines'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'cpp_lines'};
$result_menus{'cpp_lines'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/include/include_with_setfilename.pl b/macros/texinfo/texinfo/tp/t/results/include/include_with_setfilename.pl
index afccba16ae..5babfbdee1 100644
--- a/macros/texinfo/texinfo/tp/t/results/include/include_with_setfilename.pl
+++ b/macros/texinfo/texinfo/tp/t/results/include/include_with_setfilename.pl
@@ -85,6 +85,11 @@ In included file.
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'include_with_setfilename'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl b/macros/texinfo/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl
index f5a349f64e..9bcf6815df 100644
--- a/macros/texinfo/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -400,6 +400,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'inc_@f--ile.texi'
},
@@ -561,20 +562,8 @@ $result_nodes{'macro_and_commands_in_early_commands'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'macro_and_commands_in_early_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'macro_and_commands_in_early_commands'};
$result_menus{'macro_and_commands_in_early_commands'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl b/macros/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl
index 94d16412f3..d7fcb6675a 100644
--- a/macros/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl
@@ -657,20 +657,8 @@ $result_nodes{'macro_in_early_commands'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'macro_in_early_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'macro_in_early_commands'};
$result_menus{'macro_in_early_commands'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/include/value_expansion_in_include.pl b/macros/texinfo/texinfo/tp/t/results/include/value_expansion_in_include.pl
index c88656a8bc..19650d3643 100644
--- a/macros/texinfo/texinfo/tp/t/results/include/value_expansion_in_include.pl
+++ b/macros/texinfo/texinfo/tp/t/results/include/value_expansion_in_include.pl
@@ -242,6 +242,7 @@ $result_trees{'value_expansion_in_include'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'incl-incl.txi'
},
@@ -336,6 +337,7 @@ $result_trees{'value_expansion_in_include'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'incl-incl.txi'
},
@@ -430,6 +432,7 @@ $result_trees{'value_expansion_in_include'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'incl-incl.txi'
},
@@ -580,20 +583,8 @@ $result_nodes{'value_expansion_in_include'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'value_expansion_in_include'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'value_expansion_in_include'};
$result_menus{'value_expansion_in_include'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/complex_recursive_synindex.pl b/macros/texinfo/texinfo/tp/t/results/indices/complex_recursive_synindex.pl
index 4b5bb5ba3d..9049b6e87d 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/complex_recursive_synindex.pl
@@ -888,6 +888,7 @@ $result_trees{'complex_recursive_synindex'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1090,26 +1091,16 @@ $result_sectioning{'complex_recursive_synindex'} = {};
$result_nodes{'complex_recursive_synindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'complex_recursive_synindex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'complex_recursive_synindex'};
$result_menus{'complex_recursive_synindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/def_existing_index.pl b/macros/texinfo/texinfo/tp/t/results/indices/def_existing_index.pl
index 5df02da407..f8ae6de0eb 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/def_existing_index.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/def_existing_index.pl
@@ -69,6 +69,11 @@ $result_converted{'info'}->{'def_existing_index'} = 'This is , produced from .
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'def_existing_index'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/def_syn_indices.pl b/macros/texinfo/texinfo/tp/t/results/indices/def_syn_indices.pl
index 1bd92412db..ec4a1473dd 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/def_syn_indices.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/def_syn_indices.pl
@@ -1213,6 +1213,7 @@ $result_trees{'def_syn_indices'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1510,26 +1511,16 @@ $result_sectioning{'def_syn_indices'} = {};
$result_nodes{'def_syn_indices'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'def_syn_indices'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'def_syn_indices'};
$result_menus{'def_syn_indices'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -1719,6 +1710,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl b/macros/texinfo/texinfo/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index 230e3c7c90..2465d3cd83 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -196,6 +196,7 @@ $result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -269,26 +270,16 @@ $result_sectioning{'default_cp_index_and_one_letter_syncodeindex'} = {};
$result_nodes{'default_cp_index_and_one_letter_syncodeindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'default_cp_index_and_one_letter_syncodeindex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'default_cp_index_and_one_letter_syncodeindex'};
$result_menus{'default_cp_index_and_one_letter_syncodeindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -362,6 +353,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/double_index_entry.pl b/macros/texinfo/texinfo/tp/t/results/indices/double_index_entry.pl
index c7151ed4e5..b2d61e245f 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/double_index_entry.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/double_index_entry.pl
@@ -410,6 +410,7 @@ $result_trees{'double_index_entry'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -549,6 +550,7 @@ $result_nodes{'double_index_entry'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'other-node',
'spaces_before_argument' => ' '
},
@@ -570,23 +572,11 @@ $result_nodes{'double_index_entry'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'double_index_entry'}{'menu_child'}{'node_prev'} = $result_nodes{'double_index_entry'};
$result_nodes{'double_index_entry'}{'menu_child'}{'node_up'} = $result_nodes{'double_index_entry'};
$result_nodes{'double_index_entry'}{'node_next'} = $result_nodes{'double_index_entry'}{'menu_child'};
-$result_nodes{'double_index_entry'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'double_index_entry'};
$result_menus{'double_index_entry'} = {
'cmdname' => 'node',
@@ -597,6 +587,7 @@ $result_menus{'double_index_entry'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'other-node',
'spaces_before_argument' => ' '
},
@@ -640,6 +631,11 @@ Node: Top27
Node: other node111

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -667,7 +663,7 @@ $result_converted{'html_text'}->{'double_index_entry'} = '<span id="Top"></span>
<span id="index-aaa-1"></span>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#other-node" accesskey="1">other node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#other-node" rel="index" accesskey="1">other node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/double_syncodeindex.pl b/macros/texinfo/texinfo/tp/t/results/indices/double_syncodeindex.pl
index d742283ed3..a219f292be 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/double_syncodeindex.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/double_syncodeindex.pl
@@ -260,6 +260,7 @@ $result_trees{'double_syncodeindex'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -341,26 +342,16 @@ $result_sectioning{'double_syncodeindex'} = {};
$result_nodes{'double_syncodeindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'double_syncodeindex'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'double_syncodeindex'};
$result_menus{'double_syncodeindex'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -444,6 +435,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/empty_cindex_entry.pl b/macros/texinfo/texinfo/tp/t/results/indices/empty_cindex_entry.pl
index b88865d0cd..27103277ee 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/empty_cindex_entry.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/empty_cindex_entry.pl
@@ -101,20 +101,8 @@ $result_nodes{'empty_cindex_entry'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'empty_cindex_entry'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'empty_cindex_entry'};
$result_menus{'empty_cindex_entry'} = {
'cmdname' => 'node',
@@ -149,6 +137,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl b/macros/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl
index 384366a31a..da40f4ffaf 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl
@@ -178,6 +178,7 @@ $result_trees{'empty_index_entry'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -247,26 +248,16 @@ $result_sectioning{'empty_index_entry'} = {};
$result_nodes{'empty_index_entry'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'empty_index_entry'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'empty_index_entry'};
$result_menus{'empty_index_entry'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -299,6 +290,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/empty_string_index_entry.pl b/macros/texinfo/texinfo/tp/t/results/indices/empty_string_index_entry.pl
index 6bd9ccf3bd..4064ee0a17 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/empty_string_index_entry.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/empty_string_index_entry.pl
@@ -563,6 +563,7 @@ $result_trees{'empty_string_index_entry'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -710,26 +711,16 @@ $result_sectioning{'empty_string_index_entry'} = {};
$result_nodes{'empty_string_index_entry'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'empty_string_index_entry'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'empty_string_index_entry'};
$result_menus{'empty_string_index_entry'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -792,6 +783,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'empty_string_index_entry'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii.pl b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii.pl
index 48069931ed..e88f64663d 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii.pl
@@ -105,6 +105,7 @@ $result_trees{'encoding_index_ascii'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3454,6 +3455,7 @@ $result_sectioning{'encoding_index_ascii'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3477,26 +3479,16 @@ $result_nodes{'encoding_index_ascii'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'encoding_index_ascii'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'encoding_index_ascii'};
$result_menus{'encoding_index_ascii'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii/res_html/index.html
index f6fc8c1b95..088bf1569f 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii/res_html/index.html
@@ -11,7 +11,6 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index a746055a25..f20707a8db 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -105,6 +105,7 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3454,6 +3455,7 @@ $result_sectioning{'encoding_index_ascii_enable_encoding'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3477,26 +3479,16 @@ $result_nodes{'encoding_index_ascii_enable_encoding'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'encoding_index_ascii_enable_encoding'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'encoding_index_ascii_enable_encoding'};
$result_menus{'encoding_index_ascii_enable_encoding'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
index f6fc8c1b95..088bf1569f 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_html/index.html
@@ -11,7 +11,6 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1.pl b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1.pl
index 8c15ac2c18..560b6fbc0e 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1.pl
@@ -105,6 +105,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3410,6 +3411,7 @@ $result_sectioning{'encoding_index_latin1'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3433,26 +3435,16 @@ $result_nodes{'encoding_index_latin1'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'encoding_index_latin1'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'encoding_index_latin1'};
$result_menus{'encoding_index_latin1'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1/res_html/index.html
index 4ad239f0f0..c0935bbb4d 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1/res_html/index.html
@@ -11,7 +11,6 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index 0f43eb388d..5e5ff1fb92 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -105,6 +105,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3410,6 +3411,7 @@ $result_sectioning{'encoding_index_latin1_enable_encoding'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3433,26 +3435,16 @@ $result_nodes{'encoding_index_latin1_enable_encoding'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'encoding_index_latin1_enable_encoding'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'encoding_index_latin1_enable_encoding'};
$result_menus{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
index df10b1e7ee..3e29c018bb 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
@@ -11,7 +11,6 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8.pl b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8.pl
index a54129124a..c11620c482 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8.pl
@@ -105,6 +105,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3410,6 +3411,7 @@ $result_sectioning{'encoding_index_utf8'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3433,26 +3435,16 @@ $result_nodes{'encoding_index_utf8'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'encoding_index_utf8'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'encoding_index_utf8'};
$result_menus{'encoding_index_utf8'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8/res_html/index.html
index 83380f9771..4b5bbda1fe 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8/res_html/index.html
@@ -11,7 +11,6 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index 71b4092fc0..70c702c56b 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -105,6 +105,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3410,6 +3411,7 @@ $result_sectioning{'encoding_index_utf8_enable_encoding'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3433,26 +3435,16 @@ $result_nodes{'encoding_index_utf8_enable_encoding'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'encoding_index_utf8_enable_encoding'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'encoding_index_utf8_enable_encoding'};
$result_menus{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
index 935bda047e..341a7073f4 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
@@ -11,7 +11,6 @@
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/explicit_sort_key.pl b/macros/texinfo/texinfo/tp/t/results/indices/explicit_sort_key.pl
index 23698771bb..2b512fcbcf 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/explicit_sort_key.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/explicit_sort_key.pl
@@ -32,6 +32,7 @@ $result_trees{'explicit_sort_key'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -316,7 +317,12 @@ $result_trees{'explicit_sort_key'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'aaa '
+ 'text' => 'aaa'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
},
{
'args' => [
@@ -369,7 +375,7 @@ $result_trees{'explicit_sort_key'} = {
'index_at_command' => 'SKindex',
'index_name' => 'SK',
'index_type_command' => 'SKindex',
- 'key' => 'aaa invalid nesting',
+ 'key' => 'aaainvalid nesting',
'node' => {},
'number' => 4
},
@@ -389,7 +395,12 @@ $result_trees{'explicit_sort_key'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'in a reuglar para '
+ 'text' => 'in a reuglar para'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
},
{
'args' => [
@@ -423,7 +434,12 @@ $result_trees{'explicit_sort_key'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'inside another '
+ 'text' => 'inside another'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
},
{
'args' => [
@@ -521,7 +537,12 @@ $result_trees{'explicit_sort_key'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'and cmd '
+ 'text' => 'and cmd'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
},
{
'args' => [
@@ -663,34 +684,37 @@ $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[5]{'extra'}{'index
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[5]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[5]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'node'} = $result_trees{'explicit_sort_key'}{'contents'}[1];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[6]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'args'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[1];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'line_nr'};
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[1]{'line_nr'};
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[3]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'line_nr'};
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'line_nr'};
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[4]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'contents'}[5]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[8]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[9]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'args'}[0];
@@ -702,11 +726,12 @@ $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[0]
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2];
-$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'line_nr'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10];
$result_trees{'explicit_sort_key'}{'contents'}[2]{'contents'}[10]{'parent'} = $result_trees{'explicit_sort_key'}{'contents'}[2];
@@ -738,10 +763,10 @@ in a reuglar para @sortas{foo}. @code{inside another @sortas{command}}.
$result_texts{'explicit_sort_key'} = '
-in a reuglar para foo. inside another command.
+in a reuglar parafoo. inside anothercommand.
and cmd inside.
-and cmd inside.
+and cmdinside.
';
@@ -754,6 +779,7 @@ $result_sectioning{'explicit_sort_key'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -774,26 +800,16 @@ $result_nodes{'explicit_sort_key'} = {
'extra' => {},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'explicit_sort_key'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'explicit_sort_key'};
$result_menus{'explicit_sort_key'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -909,16 +925,16 @@ $result_converted{'info'}->{'explicit_sort_key'} = 'This is , produced from .

File: , Node: Top, Up: (dir)
-in a reuglar para . \'inside another \'.
+in a reuglar para. \'inside another\'.
- . <and cmd >.
+ . <and cmd>.
* Menu:
* zero sort key: Top. (line 3)
* bbbbbbb (first): Top. (line 3)
-* aaa : Top. (line 3)
+* aaa: Top. (line 3)
* aaaaaaa (second): Top. (line 3)
@@ -927,18 +943,23 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
-$result_converted{'plaintext'}->{'explicit_sort_key'} = 'in a reuglar para . \'inside another \'.
+$result_converted{'plaintext'}->{'explicit_sort_key'} = 'in a reuglar para. \'inside another\'.
- . <and cmd >.
+ . <and cmd>.
* Menu:
* zero sort key: Top. (line 0)
* bbbbbbb (first): Top. (line 0)
-* aaa : Top. (line 0)
+* aaa: Top. (line 0)
* aaaaaaa (second): Top. (line 0)
';
@@ -949,12 +970,12 @@ $result_converted{'html_text'}->{'explicit_sort_key'} = '<span id="Top"></span><
<span id="index-Abbbbbbb-_0028first_0029"></span>
<span id="index-Baaaaaaa-_0028second_0029"></span>
<span id="index-0zero-sort-key"></span>
-<span id="index-aaa-invalid-nesting"></span>
+<span id="index-aaainvalid-nesting"></span>
-<p>in a reuglar para . <code>inside another </code>.
+<p>in a reuglar para. <code>inside another</code>.
</p>
<p>.
-<a href="and cmd ">and cmd </a>.
+<a href="and cmd">and cmd</a>.
</p>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#t_h_SK_symbol-1"><b>0</b></a>
&nbsp;
@@ -972,7 +993,7 @@ $result_converted{'html_text'}->{'explicit_sort_key'} = '<span id="Top"></span><
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="t_h_SK_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Abbbbbbb-_0028first_0029">bbbbbbb (first)</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-aaa-invalid-nesting"><b>aaa </b></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-aaainvalid-nesting"><b>aaa</b></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="t_h_SK_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Baaaaaaa-_0028second_0029">aaaaaaa (second)</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/ftable_vtable.pl b/macros/texinfo/texinfo/tp/t/results/indices/ftable_vtable.pl
index 47558e7bf1..b9e63ec7d7 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/ftable_vtable.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/ftable_vtable.pl
@@ -644,6 +644,7 @@ $result_trees{'ftable_vtable'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -818,26 +819,16 @@ $result_sectioning{'ftable_vtable'} = {};
$result_nodes{'ftable_vtable'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'ftable_vtable'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ftable_vtable'};
$result_menus{'ftable_vtable'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -883,6 +874,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/image_lines_count.pl b/macros/texinfo/texinfo/tp/t/results/indices/image_lines_count.pl
index a2cdaa3fdf..31735e27f7 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/image_lines_count.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/image_lines_count.pl
@@ -52,7 +52,9 @@ $result_trees{'image_lines_count'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -151,6 +153,7 @@ $result_trees{'image_lines_count'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -218,26 +221,16 @@ $result_sectioning{'image_lines_count'} = {};
$result_nodes{'image_lines_count'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'image_lines_count'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'image_lines_count'};
$result_menus{'image_lines_count'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -271,6 +264,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/image_text_lines_count.pl b/macros/texinfo/texinfo/tp/t/results/indices/image_text_lines_count.pl
index 5ed9ed11be..f8b8b937b5 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/image_text_lines_count.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/image_text_lines_count.pl
@@ -52,7 +52,9 @@ $result_trees{'image_text_lines_count'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -151,6 +153,7 @@ $result_trees{'image_text_lines_count'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -218,26 +221,16 @@ $result_sectioning{'image_text_lines_count'} = {};
$result_nodes{'image_text_lines_count'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'image_text_lines_count'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'image_text_lines_count'};
$result_menus{'image_text_lines_count'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -270,6 +263,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/index_entries_locations.pl b/macros/texinfo/texinfo/tp/t/results/indices/index_entries_locations.pl
index 117d3f6006..3b0fbda186 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/index_entries_locations.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/index_entries_locations.pl
@@ -337,6 +337,7 @@ $result_trees{'index_entries_locations'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -460,26 +461,16 @@ $result_sectioning{'index_entries_locations'} = {};
$result_nodes{'index_entries_locations'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'index_entries_locations'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_entries_locations'};
$result_menus{'index_entries_locations'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -518,6 +509,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_first_node.pl b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_first_node.pl
index 1869af1793..aa4e02bfcd 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_first_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_first_node.pl
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_node.pl b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_node.pl
index 62745ce13b..8697ac48c1 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_before_node.pl
@@ -462,6 +462,7 @@ $result_trees{'index_entry_before_node'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -620,6 +621,7 @@ $result_nodes{'index_entry_before_node'} = {
'node_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
@@ -644,25 +646,13 @@ $result_nodes{'index_entry_before_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'index_entry_before_node'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'index_entry_before_node'}{'menu_child'};
$result_nodes{'index_entry_before_node'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'index_entry_before_node'};
$result_nodes{'index_entry_before_node'}{'menu_child'}{'node_prev'} = $result_nodes{'index_entry_before_node'};
$result_nodes{'index_entry_before_node'}{'menu_child'}{'node_up'} = $result_nodes{'index_entry_before_node'};
$result_nodes{'index_entry_before_node'}{'node_next'} = $result_nodes{'index_entry_before_node'}{'menu_child'};
-$result_nodes{'index_entry_before_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_entry_before_node'};
$result_menus{'index_entry_before_node'} = {
'cmdname' => 'node',
@@ -679,6 +669,7 @@ $result_menus{'index_entry_before_node'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
@@ -733,6 +724,11 @@ Node: first106
Node: second174

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -754,7 +750,7 @@ $result_converted{'html_text'}->{'index_entry_before_node'} = '<span id="Top"></
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">&bull; <a href="#first" accesskey="1">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#second" accesskey="2">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index" accesskey="2">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote.pl
index 02b5f60c0b..dacfb34fe8 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote.pl
@@ -161,6 +161,7 @@ $result_trees{'index_entry_in_footnote'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -229,26 +230,16 @@ $result_sectioning{'index_entry_in_footnote'} = {};
$result_nodes{'index_entry_in_footnote'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'index_entry_in_footnote'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_entry_in_footnote'};
$result_menus{'index_entry_in_footnote'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -281,6 +272,11 @@ Node: Top27
Ref: Top-Footnote-1205

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -318,7 +314,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote'} = '<span id="Top"></
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote
<span id="index-index-entry-in-footnote"></span>
</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index 09a4f0a8a9..eed38ee53a 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
@@ -404,6 +404,7 @@ $result_trees{'index_entry_in_footnote_different_node_end'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -531,6 +532,7 @@ $result_nodes{'index_entry_in_footnote_different_node_end'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'First',
'spaces_before_argument' => ' '
},
@@ -552,23 +554,11 @@ $result_nodes{'index_entry_in_footnote_different_node_end'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'index_entry_in_footnote_different_node_end'}{'menu_child'}{'node_prev'} = $result_nodes{'index_entry_in_footnote_different_node_end'};
$result_nodes{'index_entry_in_footnote_different_node_end'}{'menu_child'}{'node_up'} = $result_nodes{'index_entry_in_footnote_different_node_end'};
$result_nodes{'index_entry_in_footnote_different_node_end'}{'node_next'} = $result_nodes{'index_entry_in_footnote_different_node_end'}{'menu_child'};
-$result_nodes{'index_entry_in_footnote_different_node_end'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_entry_in_footnote_different_node_end'};
$result_menus{'index_entry_in_footnote_different_node_end'} = {
'cmdname' => 'node',
@@ -579,6 +569,7 @@ $result_menus{'index_entry_in_footnote_different_node_end'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'First',
'spaces_before_argument' => ' '
},
@@ -630,6 +621,11 @@ Ref: Top-Footnote-1144
Node: First182

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -658,7 +654,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} =
<h1 class="node-heading">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#First" accesskey="1">First</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#First" rel="index" accesskey="1">First</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -695,7 +691,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote_different_node_end'} =
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote
<span id="index-index-entry-in-footnote"></span>
</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl
index d4408bc2ff..2975df4ef5 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -436,6 +436,7 @@ $result_trees{'index_entry_in_footnote_separate'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -567,6 +568,7 @@ $result_nodes{'index_entry_in_footnote_separate'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'First',
'spaces_before_argument' => ' '
},
@@ -588,23 +590,11 @@ $result_nodes{'index_entry_in_footnote_separate'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'index_entry_in_footnote_separate'}{'menu_child'}{'node_prev'} = $result_nodes{'index_entry_in_footnote_separate'};
$result_nodes{'index_entry_in_footnote_separate'}{'menu_child'}{'node_up'} = $result_nodes{'index_entry_in_footnote_separate'};
$result_nodes{'index_entry_in_footnote_separate'}{'node_next'} = $result_nodes{'index_entry_in_footnote_separate'}{'menu_child'};
-$result_nodes{'index_entry_in_footnote_separate'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_entry_in_footnote_separate'};
$result_menus{'index_entry_in_footnote_separate'} = {
'cmdname' => 'node',
@@ -615,6 +605,7 @@ $result_menus{'index_entry_in_footnote_separate'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'First',
'spaces_before_argument' => ' '
},
@@ -668,6 +659,11 @@ Ref: Top-Footnote-1175
Node: First213

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -694,7 +690,7 @@ $result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<span id
<h1 class="node-heading">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#First" accesskey="1">First</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#First" rel="index" accesskey="1">First</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/print_merged_index.pl b/macros/texinfo/texinfo/tp/t/results/indices/print_merged_index.pl
index 5793934a60..b7c3e1f045 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/print_merged_index.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/print_merged_index.pl
@@ -93,6 +93,7 @@ $result_trees{'print_merged_index'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -140,26 +141,16 @@ $result_sectioning{'print_merged_index'} = {};
$result_nodes{'print_merged_index'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'print_merged_index'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'print_merged_index'};
$result_menus{'print_merged_index'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl b/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl
index e6d50c9603..609486097f 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -823,6 +823,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1156,6 +1157,7 @@ $result_sectioning{'printindex_index_entry_in_copying'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
}
@@ -1202,6 +1204,7 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
'level' => 1,
'number' => 1
},
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
},
@@ -1223,23 +1226,11 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'printindex_index_entry_in_copying'}{'menu_child'}{'node_prev'} = $result_nodes{'printindex_index_entry_in_copying'};
$result_nodes{'printindex_index_entry_in_copying'}{'menu_child'}{'node_up'} = $result_nodes{'printindex_index_entry_in_copying'};
$result_nodes{'printindex_index_entry_in_copying'}{'node_next'} = $result_nodes{'printindex_index_entry_in_copying'}{'menu_child'};
-$result_nodes{'printindex_index_entry_in_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'printindex_index_entry_in_copying'};
$result_menus{'printindex_index_entry_in_copying'} = {
'cmdname' => 'node',
@@ -1250,6 +1241,7 @@ $result_menus{'printindex_index_entry_in_copying'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
},
@@ -1344,6 +1336,11 @@ Node: Top131
Node: chapter687

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1454,7 +1451,7 @@ $result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#chapter" accesskey="1">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#chapter" rel="index" accesskey="1">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index a0bf1f50ff..1b0f5813b1 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
@@ -754,23 +754,11 @@ $result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'menu_child'}{'node_prev'} = $result_nodes{'printindex_index_entry_in_copying_in_footnote'};
$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'menu_child'}{'node_up'} = $result_nodes{'printindex_index_entry_in_copying_in_footnote'};
$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'node_next'} = $result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'menu_child'};
-$result_nodes{'printindex_index_entry_in_copying_in_footnote'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'printindex_index_entry_in_copying_in_footnote'};
$result_menus{'printindex_index_entry_in_copying_in_footnote'} = {
'cmdname' => 'node',
@@ -856,6 +844,11 @@ Node: chapter299
Ref: chapter-Footnote-1512

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -949,11 +942,11 @@ $result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>In footnote
<span id="index-copying-Copying-this-document"></span>
</p>
-<h3><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h3>
+<h5><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h3>
<p>In footnote
<span id="index-copying-Copying-this-document"></span>
</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl b/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index 509c27a310..8fb5b86117 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -806,6 +806,7 @@ $result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1116,6 +1117,7 @@ $result_sectioning{'printindex_index_entry_in_copying_no_insertcopying'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
}
@@ -1162,6 +1164,7 @@ $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
'level' => 1,
'number' => 1
},
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
},
@@ -1183,23 +1186,11 @@ $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'menu_child'}{'node_prev'} = $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'};
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'menu_child'}{'node_up'} = $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'};
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'node_next'} = $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'menu_child'};
-$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'printindex_index_entry_in_copying_no_insertcopying'};
$result_menus{'printindex_index_entry_in_copying_no_insertcopying'} = {
'cmdname' => 'node',
@@ -1210,6 +1201,7 @@ $result_menus{'printindex_index_entry_in_copying_no_insertcopying'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
},
@@ -1267,6 +1259,11 @@ Node: Top131
Node: chapter218

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1294,7 +1291,7 @@ $result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcop
<p>Top.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#chapter" accesskey="1">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#chapter" rel="index" accesskey="1">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/printindex_with_space_before.pl b/macros/texinfo/texinfo/tp/t/results/indices/printindex_with_space_before.pl
index 32c75311e5..f5d8f8040d 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/printindex_with_space_before.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/printindex_with_space_before.pl
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/same_index_entry_merged_indices.pl b/macros/texinfo/texinfo/tp/t/results/indices/same_index_entry_merged_indices.pl
index 79b42d050d..f9c3f3f5d9 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -71,6 +71,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -588,6 +589,7 @@ $result_sectioning{'same_index_entry_merged_indices'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -608,26 +610,16 @@ $result_nodes{'same_index_entry_merged_indices'} = {
'extra' => {},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'same_index_entry_merged_indices'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'same_index_entry_merged_indices'};
$result_menus{'same_index_entry_merged_indices'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -709,6 +701,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/seeentry.pl b/macros/texinfo/texinfo/tp/t/results/indices/seeentry.pl
new file mode 100644
index 0000000000..8cd67f9984
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/indices/seeentry.pl
@@ -0,0 +1,339 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'seeentry'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aaa'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'bbb'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'seeentry',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [],
+ 'content_normalized' => [],
+ 'index_at_command' => 'cindex',
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'seeentry' => 'bbb',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'ccc'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'seealso',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'ddd'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [],
+ 'content_normalized' => [],
+ 'index_at_command' => 'cindex',
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'seealso' => 'ccc',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ }
+ ],
+ 'extra' => {},
+ 'level' => 0,
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'seeentry'}{'contents'}[0]{'parent'} = $result_trees{'seeentry'};
+$result_trees{'seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[1]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[1];
+$result_trees{'seeentry'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'seeentry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'seeentry'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'seeentry'}{'contents'}[1]{'parent'} = $result_trees{'seeentry'};
+$result_trees{'seeentry'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'} = $result_trees{'seeentry'}{'contents'}[1];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'seeentry'}{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'} = $result_trees{'seeentry'}{'contents'}[1];
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'line_nr'} = $result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'seeentry'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'seeentry'}{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[2]{'parent'} = $result_trees{'seeentry'};
+
+$result_texis{'seeentry'} = '@node Top
+@top
+
+@cindex aaa @seeentry{bbb}
+@cindex @seealso{ccc} ddd
+';
+
+
+$result_texts{'seeentry'} = '
+';
+
+$result_sectioning{'seeentry'} = {
+ 'level' => -1,
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+ }
+ },
+ 'level' => 0,
+ 'section_up' => {}
+ }
+ ]
+};
+$result_sectioning{'seeentry'}{'section_childs'}[0]{'section_up'} = $result_sectioning{'seeentry'};
+
+$result_nodes{'seeentry'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'level' => 0
+ },
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+};
+
+$result_menus{'seeentry'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+};
+
+$result_errors{'seeentry'} = [];
+
+
+
+$result_converted{'docbook'}->{'seeentry'} = '<chapter label="" id="Top">
+<title></title>
+
+<indexterm role="cp"><primary>aaa</primary><see>bbb</see></indexterm>
+<indexterm role="cp"><primary>ddd</primary><seealso>ccc</seealso></indexterm>
+</chapter>
+';
+
+
+$result_converted{'info'}->{'seeentry'} = 'This is , produced from .
+
+
+File: , Node: Top, Up: (dir)
+
+
+
+Tag Table:
+Node: Top27
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
+';
+
+
+$result_converted{'plaintext'}->{'seeentry'} = '';
+
+
+$result_converted{'html_text'}->{'seeentry'} = '<span id="Top"></span><span id="SEC_Top"></span>
+<hr>
+';
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/subentries.pl b/macros/texinfo/texinfo/tp/t/results/indices/subentries.pl
new file mode 100644
index 0000000000..db840b50dd
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/indices/subentries.pl
@@ -0,0 +1,676 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'subentries'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'isindex' => 1,
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aa'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [],
+ 'content_normalized' => [],
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex',
+ 'key' => 'aa',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'bb'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [],
+ 'content_normalized' => [],
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex',
+ 'key' => 'bb',
+ 'node' => {},
+ 'number' => 2
+ },
+ 'spaces_before_argument' => ' ',
+ 'subentry' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cc'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'subentry',
+ 'extra' => {
+ 'level' => 1,
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {},
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'ddd'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [],
+ 'content_normalized' => [],
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex',
+ 'key' => 'ddd',
+ 'node' => {},
+ 'number' => 3
+ },
+ 'spaces_before_argument' => ' ',
+ 'subentry' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'eee'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'subentry',
+ 'extra' => {
+ 'level' => 1,
+ 'spaces_before_argument' => ' ',
+ 'subentry' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'fff'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'subentry',
+ 'extra' => {
+ 'level' => 2,
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {},
+ {},
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'ggg'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [],
+ 'content_normalized' => [],
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex',
+ 'key' => 'ggg',
+ 'node' => {},
+ 'number' => 4
+ },
+ 'spaces_before_argument' => ' ',
+ 'subentry' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'hhh jjj'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'subentry',
+ 'extra' => {
+ 'level' => 1,
+ 'spaces_before_argument' => ' ',
+ 'subentry' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'kkk'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'subentry',
+ 'extra' => {
+ 'level' => 2,
+ 'spaces_before_argument' => ' ',
+ 'subentry' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'lll'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'subentry',
+ 'extra' => {
+ 'level' => 3,
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {},
+ {},
+ {},
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cp'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'printindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'cp'
+ ],
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {},
+ 'level' => 0,
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'subentries'}{'contents'}[0]{'parent'} = $result_trees{'subentries'};
+$result_trees{'subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[1]{'args'}[0];
+$result_trees{'subentries'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[1];
+$result_trees{'subentries'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'subentries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'subentries'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'subentries'}{'contents'}[1]{'parent'} = $result_trees{'subentries'};
+$result_trees{'subentries'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[1];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[1];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'} = $result_trees{'subentries'}{'contents'}[1];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'} = $result_trees{'subentries'}{'contents'}[1];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'}{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'}{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'line_nr'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'}{'line_nr'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[3] = $result_trees{'subentries'}{'contents'}[2]{'contents'}[2]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'node'} = $result_trees{'subentries'}{'contents'}[1];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'line_nr'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'line_nr'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'line_nr'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'line_nr'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[5] = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[6] = $result_trees{'subentries'}{'contents'}[2]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'} = $result_trees{'subentries'}{'contents'}[1];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'line_nr'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'line_nr'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'line_nr'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'line_nr'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'line_nr'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'}{'line_nr'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[8] = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[9] = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[10] = $result_trees{'subentries'}{'contents'}[2]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'extra'}{'subentry'};
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[11]{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[12]{'args'}[0];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'subentries'}{'contents'}[2]{'contents'}[12];
+$result_trees{'subentries'}{'contents'}[2]{'contents'}[12]{'parent'} = $result_trees{'subentries'}{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[2]{'parent'} = $result_trees{'subentries'};
+
+$result_texis{'subentries'} = '@node Top
+@top
+
+@cindex aa
+@cindex bb @subentry cc
+@cindex ddd @subentry eee @subentry fff
+@cindex ggg @subentry hhh jjj @subentry kkk @subentry lll
+
+@printindex cp
+';
+
+
+$result_texts{'subentries'} = '
+
+';
+
+$result_sectioning{'subentries'} = {
+ 'level' => -1,
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+ }
+ },
+ 'level' => 0,
+ 'section_up' => {}
+ }
+ ]
+};
+$result_sectioning{'subentries'}{'section_childs'}[0]{'section_up'} = $result_sectioning{'subentries'};
+
+$result_nodes{'subentries'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'level' => 0
+ },
+ 'isindex' => 1,
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+};
+
+$result_menus{'subentries'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+};
+
+$result_errors{'subentries'} = [
+ {
+ 'error_line' => ':7: no more than two levels of index subentry are allowed
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'no more than two levels of index subentry are allowed',
+ 'type' => 'error'
+ }
+];
+
+
+
+$result_converted{'docbook'}->{'subentries'} = '<chapter label="" id="Top">
+<title></title>
+
+<indexterm role="cp"><primary>aa</primary></indexterm>
+<indexterm role="cp"><primary>bb</primary><secondary>cc</secondary></indexterm><indexterm role="cp"><primary>ddd</primary><secondary>eee</secondary><tertiary>fff</tertiary></indexterm><indexterm role="cp"><primary>ggg</primary><secondary>hhh jjj</secondary><tertiary>kkk</tertiary><tertiary>lll</tertiary></indexterm>
+<index role="cp"></index>
+</chapter>
+';
+
+
+$result_converted{'info'}->{'subentries'} = 'This is , produced from .
+
+
+File: , Node: Top, Up: (dir)
+
+
+* Menu:
+
+* aa: Top. (line 3)
+* bb, cc: Top. (line 3)
+* ddd, eee, fff: Top. (line 3)
+* ggg, hhh jjj, kkk, lll: Top. (line 3)
+
+
+
+Tag Table:
+Node: Top27
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
+';
+
+
+$result_converted{'plaintext'}->{'subentries'} = '* Menu:
+
+* aa: Top. (line 0)
+* bb, cc: Top. (line 0)
+* ddd, eee, fff: Top. (line 0)
+* ggg, hhh jjj, kkk, lll: Top. (line 0)
+
+';
+
+
+$result_converted{'html_text'}->{'subentries'} = '<span id="Top"></span><span id="SEC_Top"></span>
+<span id="index-aa"></span>
+<span id="index-bb"></span>
+<span id="index-ddd"></span>
+<span id="index-ggg"></span>
+
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#t_h_cp_letter-B"><b>B</b></a>
+ &nbsp;
+<a class="summary-letter" href="#t_h_cp_letter-D"><b>D</b></a>
+ &nbsp;
+<a class="summary-letter" href="#t_h_cp_letter-G"><b>G</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-aa">aa</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-B">B</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-bb">bb, cc</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-D">D</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-ddd">ddd, eee, fff</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-G">G</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-ggg">ggg, hhh jjj, kkk, lll</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#t_h_cp_letter-B"><b>B</b></a>
+ &nbsp;
+<a class="summary-letter" href="#t_h_cp_letter-D"><b>D</b></a>
+ &nbsp;
+<a class="summary-letter" href="#t_h_cp_letter-G"><b>G</b></a>
+ &nbsp;
+</td></tr></table>
+<hr>
+';
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/subentry_and_sortas.pl b/macros/texinfo/texinfo/tp/t/results/indices/subentry_and_sortas.pl
new file mode 100644
index 0000000000..b72242c961
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/indices/subentry_and_sortas.pl
@@ -0,0 +1,475 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'subentry_and_sortas'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'isindex' => 1,
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aaa'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'A'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sortas',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [],
+ 'content_normalized' => [],
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex',
+ 'key' => 'A',
+ 'node' => {},
+ 'number' => 1,
+ 'sortas' => 'A'
+ },
+ 'sortas' => 'A',
+ 'spaces_before_argument' => ' ',
+ 'subentry' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'B'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'sortas',
+ 'contents' => [],
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'bbb'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'subentry',
+ 'extra' => {
+ 'level' => 1,
+ 'sortas' => 'B',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {},
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cp'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'printindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'cp'
+ ],
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {},
+ 'level' => 0,
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'subentry_and_sortas'}{'contents'}[0]{'parent'} = $result_trees{'subentry_and_sortas'};
+$result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[1];
+$result_trees{'subentry_and_sortas'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'subentry_and_sortas'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'subentry_and_sortas'}{'contents'}[1]{'parent'} = $result_trees{'subentry_and_sortas'};
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'} = $result_trees{'subentry_and_sortas'}{'contents'}[1];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'line_nr'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'}{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'line_nr'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[2] = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[1]{'extra'}{'subentry'};
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[3]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[4];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'contents'}[4]{'parent'} = $result_trees{'subentry_and_sortas'}{'contents'}[2];
+$result_trees{'subentry_and_sortas'}{'contents'}[2]{'parent'} = $result_trees{'subentry_and_sortas'};
+
+$result_texis{'subentry_and_sortas'} = '@node Top
+@top
+
+@cindex aaa @sortas{A} @subentry @sortas{B} bbb
+
+@printindex cp
+';
+
+
+$result_texts{'subentry_and_sortas'} = '
+
+';
+
+$result_sectioning{'subentry_and_sortas'} = {
+ 'level' => -1,
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+ }
+ },
+ 'level' => 0,
+ 'section_up' => {}
+ }
+ ]
+};
+$result_sectioning{'subentry_and_sortas'}{'section_childs'}[0]{'section_up'} = $result_sectioning{'subentry_and_sortas'};
+
+$result_nodes{'subentry_and_sortas'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'level' => 0
+ },
+ 'isindex' => 1,
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+};
+
+$result_menus{'subentry_and_sortas'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+};
+
+$result_errors{'subentry_and_sortas'} = [];
+
+
+
+$result_converted{'plaintext'}->{'subentry_and_sortas'} = '* Menu:
+
+* aaa, bbb: Top. (line 0)
+
+';
+
+
+$result_converted{'docbook'}->{'subentry_and_sortas'} = '<chapter label="" id="Top">
+<title></title>
+
+<indexterm role="cp"><primary>aaa</primary><secondary>bbb</secondary></indexterm>
+<index role="cp"></index>
+</chapter>
+';
+
+
+$result_converted{'html'}->{'subentry_and_sortas'} = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<link href="#Top" rel="start" title="Top">
+<link href="#Top" rel="index" title="Top">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<span id="Top"></span><span id="SEC_Top"></span>
+<span id="index-aaaA"></span>
+
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_letter-A"><b>A</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-aaaA">aaa, bbb</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_letter-A"><b>A</b></a>
+ &nbsp;
+</td></tr></table>
+<hr>
+
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'subentry_and_sortas'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
+
+$result_converted{'info'}->{'subentry_and_sortas'} = 'This is , produced from .
+
+
+File: , Node: Top, Up: (dir)
+
+
+* Menu:
+
+* aaa, bbb: Top. (line 3)
+
+
+
+Tag Table:
+Node: Top27
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
+';
+
+
+$result_converted{'plaintext'}->{'subentry_and_sortas'} = '* Menu:
+
+* aaa, bbb: Top. (line 0)
+
+';
+
+
+$result_converted{'html_text'}->{'subentry_and_sortas'} = '<span id="Top"></span><span id="SEC_Top"></span>
+<span id="index-aaaA"></span>
+
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="t_h_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-aaaA">aaa, bbb</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#t_h_cp_letter-A"><b>A</b></a>
+ &nbsp;
+</td></tr></table>
+<hr>
+';
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/syncode_index_print_both.pl b/macros/texinfo/texinfo/tp/t/results/indices/syncode_index_print_both.pl
index 22bc7b4d44..993f72231d 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/syncode_index_print_both.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/syncode_index_print_both.pl
@@ -280,6 +280,7 @@ $result_trees{'syncode_index_print_both'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -380,26 +381,16 @@ $result_sectioning{'syncode_index_print_both'} = {};
$result_nodes{'syncode_index_print_both'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'syncode_index_print_both'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'syncode_index_print_both'};
$result_menus{'syncode_index_print_both'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -487,6 +478,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/indices/syncodeindex_to_plain.pl b/macros/texinfo/texinfo/tp/t/results/indices/syncodeindex_to_plain.pl
index 649b0c9774..23320752bc 100644
--- a/macros/texinfo/texinfo/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/macros/texinfo/texinfo/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -297,6 +297,7 @@ $result_trees{'syncodeindex_to_plain'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -393,26 +394,16 @@ $result_sectioning{'syncodeindex_to_plain'} = {};
$result_nodes{'syncodeindex_to_plain'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'syncodeindex_to_plain'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'syncodeindex_to_plain'};
$result_menus{'syncodeindex_to_plain'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -495,6 +486,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/anchor_and_spaces.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/anchor_and_spaces.pl
index 94381b85c8..f354e01494 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -300,20 +300,8 @@ $result_nodes{'anchor_and_spaces'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'anchor_and_spaces'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_and_spaces'};
$result_menus{'anchor_and_spaces'} = {
'cmdname' => 'node',
@@ -347,6 +335,11 @@ Ref: anchor181
Ref: anchor296

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/anchor_in_command.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/anchor_in_command.pl
index 9ad765cefb..3692889b33 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/anchor_in_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/anchor_in_command.pl
@@ -255,20 +255,8 @@ $result_nodes{'anchor_in_command'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'anchor_in_command'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_in_command'};
$result_menus{'anchor_in_command'} = {
'cmdname' => 'node',
@@ -295,6 +283,11 @@ Node: Top27
Ref: anchor in emph97

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/before_node_and_section.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/before_node_and_section.pl
index 4e48ac0be8..72e5e42396 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/before_node_and_section.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/before_node_and_section.pl
@@ -613,6 +613,7 @@ $result_trees{'before_node_and_section'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -888,6 +889,7 @@ $result_sectioning{'before_node_and_section'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node1',
'spaces_before_argument' => ' '
}
@@ -934,6 +936,7 @@ $result_nodes{'before_node_and_section'} = {
'level' => 1,
'number' => 1
},
+ 'isindex' => 1,
'normalized' => 'node1',
'spaces_before_argument' => ' '
},
@@ -955,23 +958,11 @@ $result_nodes{'before_node_and_section'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'before_node_and_section'}{'menu_child'}{'node_prev'} = $result_nodes{'before_node_and_section'};
$result_nodes{'before_node_and_section'}{'menu_child'}{'node_up'} = $result_nodes{'before_node_and_section'};
$result_nodes{'before_node_and_section'}{'node_next'} = $result_nodes{'before_node_and_section'}{'menu_child'};
-$result_nodes{'before_node_and_section'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'before_node_and_section'};
$result_menus{'before_node_and_section'} = {
'cmdname' => 'node',
@@ -982,6 +973,7 @@ $result_menus{'before_node_and_section'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node1',
'spaces_before_argument' => ' '
},
@@ -1073,6 +1065,11 @@ Ref: Top-Footnote-2336
Node: node1361

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'before_node_and_section'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/center_flush.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/center_flush.pl
index 54897075b8..32f46e9033 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/center_flush.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/center_flush.pl
@@ -600,6 +600,11 @@ Ref: anchor in flushright607
Ref: second anchor in flushright677

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'center_flush'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl
index 1eaf0811de..d0fba0d030 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -574,6 +574,7 @@ $result_trees{'colon_in_index_entry'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -720,26 +721,16 @@ $result_sectioning{'colon_in_index_entry'} = {};
$result_nodes{'colon_in_index_entry'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'colon_in_index_entry'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'colon_in_index_entry'};
$result_menus{'colon_in_index_entry'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -820,6 +811,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl
index 3d639ce221..b8ca1ff162 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/contents_setcontentsaftertitlepage_before_node.pl
@@ -191,20 +191,8 @@ $result_nodes{'contents_setcontentsaftertitlepage_before_node'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'contents_setcontentsaftertitlepage_before_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'contents_setcontentsaftertitlepage_before_node'};
$result_menus{'contents_setcontentsaftertitlepage_before_node'} = {
'cmdname' => 'node',
@@ -242,6 +230,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/def_in_copying.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/def_in_copying.pl
index 896ce7e3de..17a3517428 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/def_in_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/def_in_copying.pl
@@ -96,6 +96,7 @@ $result_trees{'def_in_copying'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -900,6 +901,7 @@ $result_sectioning{'def_in_copying'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -923,26 +925,16 @@ $result_nodes{'def_in_copying'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'def_in_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'def_in_copying'};
$result_menus{'def_in_copying'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -982,6 +974,11 @@ Tag Table:
Node: Top88

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
index 43a88bb32c..ebfcb71c8d 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -646,20 +646,8 @@ $result_nodes{'direntry_dircategory_and_commands'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'direntry_dircategory_and_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'direntry_dircategory_and_commands'};
$result_menus{'direntry_dircategory_and_commands'} = {
'cmdname' => 'node',
@@ -701,6 +689,11 @@ Tag Table:
Node: Top264

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl
index cbd08e197e..fdd52ebd32 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl
@@ -138,20 +138,8 @@ $result_nodes{'encoding_us_ascii'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'encoding_us_ascii'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'encoding_us_ascii'};
$result_menus{'encoding_us_ascii'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/error_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/error_in_footnote.pl
index b963e10938..7d05515433 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/error_in_footnote.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/error_in_footnote.pl
@@ -494,20 +494,8 @@ $result_nodes{'error_in_footnote'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'error_in_footnote'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'error_in_footnote'};
$result_menus{'error_in_footnote'} = {
'cmdname' => 'node',
@@ -606,6 +594,11 @@ Ref: label61
Ref: Top-Footnote-1343

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'error_in_footnote'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/file_only_png.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/file_only_png.pl
index 0d3059bbd9..a70ada0ae3 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/file_only_png.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/file_only_png.pl
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/float_long_captions.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/float_long_captions.pl
index 85d9ec9539..37590c06c3 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/float_long_captions.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/float_long_captions.pl
@@ -421,20 +421,8 @@ $result_nodes{'float_long_captions'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'float_long_captions'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'float_long_captions'};
$result_menus{'float_long_captions'} = {
'cmdname' => 'node',
@@ -538,6 +526,11 @@ Ref: text161
Ref: text2105

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/image_and_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/image_and_punctuation.pl
index 6d19406412..45c70a05bc 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/image_and_punctuation.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/image_and_punctuation.pl
@@ -58,7 +58,9 @@ $result_trees{'image_and_punctuation'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -102,7 +104,9 @@ $result_trees{'image_and_punctuation'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
@@ -147,7 +151,9 @@ $result_trees{'image_and_punctuation'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 8,
@@ -191,7 +197,9 @@ $result_trees{'image_and_punctuation'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 10,
@@ -235,7 +243,9 @@ $result_trees{'image_and_punctuation'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 12,
@@ -280,7 +290,9 @@ $result_trees{'image_and_punctuation'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 15,
@@ -411,20 +423,8 @@ $result_nodes{'image_and_punctuation'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'image_and_punctuation'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'image_and_punctuation'};
$result_menus{'image_and_punctuation'} = {
'cmdname' => 'node',
@@ -460,6 +460,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/image_and_spaces_formatting.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/image_and_spaces_formatting.pl
index 79f768eb8d..066b58f060 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -52,7 +52,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -79,7 +81,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -102,7 +106,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -125,7 +131,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -148,7 +156,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -171,7 +181,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -194,7 +206,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -230,7 +244,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
@@ -257,7 +273,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -280,7 +298,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -303,7 +323,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -326,7 +348,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -349,7 +373,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -372,7 +398,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -412,7 +440,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 7,
@@ -439,7 +469,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -462,7 +494,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -485,7 +519,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -508,7 +544,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -531,7 +569,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -554,7 +594,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -594,7 +636,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 9,
@@ -638,7 +682,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 11,
@@ -682,7 +728,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 13,
@@ -709,7 +757,9 @@ $result_trees{'image_and_spaces_formatting'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -934,20 +984,8 @@ $result_nodes{'image_and_spaces_formatting'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'image_and_spaces_formatting'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'image_and_spaces_formatting'};
$result_menus{'image_and_spaces_formatting'} = {
'cmdname' => 'node',
@@ -984,6 +1022,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/image_extension.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/image_extension.pl
index 5a12f51d42..bc834c349c 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/image_extension.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/image_extension.pl
@@ -77,7 +77,9 @@ $result_trees{'image_extension'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -130,7 +132,9 @@ $result_trees{'image_extension'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 4,
@@ -183,7 +187,9 @@ $result_trees{'image_extension'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
@@ -276,20 +282,8 @@ $result_nodes{'image_extension'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'image_extension'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'image_extension'};
$result_menus{'image_extension'} = {
'cmdname' => 'node',
@@ -317,6 +311,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/image_in_paragraph.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/image_in_paragraph.pl
index 304f102398..d26dea5264 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/image_in_paragraph.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/image_in_paragraph.pl
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/image_not_found.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/image_not_found.pl
index 503e2b971a..afb3114cdc 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/image_not_found.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/image_not_found.pl
@@ -46,6 +46,9 @@ $result_trees{'image_not_found'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 2,
@@ -108,20 +111,8 @@ $result_nodes{'image_not_found'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'image_not_found'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'image_not_found'};
$result_menus{'image_not_found'} = {
'cmdname' => 'node',
@@ -146,6 +137,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'image_not_found'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/image_quotes.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/image_quotes.pl
index 41dedffbbb..0e705fa521 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/image_quotes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/image_quotes.pl
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/index_entry_at_end_node.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/index_entry_at_end_node.pl
index ea0dd614a6..f4fd4ac3ce 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/index_entry_at_end_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/index_entry_at_end_node.pl
@@ -423,6 +423,7 @@ $result_trees{'index_entry_at_end_node'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -667,6 +668,7 @@ $result_sectioning{'index_entry_at_end_node'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'indices',
'spaces_before_argument' => ' '
}
@@ -732,6 +734,7 @@ $result_nodes{'index_entry_at_end_node'} = {
'level' => 1,
'number' => 'A'
},
+ 'isindex' => 1,
'normalized' => 'indices',
'spaces_before_argument' => ' '
},
@@ -756,25 +759,13 @@ $result_nodes{'index_entry_at_end_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'index_entry_at_end_node'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'index_entry_at_end_node'}{'menu_child'};
$result_nodes{'index_entry_at_end_node'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'index_entry_at_end_node'};
$result_nodes{'index_entry_at_end_node'}{'menu_child'}{'node_prev'} = $result_nodes{'index_entry_at_end_node'};
$result_nodes{'index_entry_at_end_node'}{'menu_child'}{'node_up'} = $result_nodes{'index_entry_at_end_node'};
$result_nodes{'index_entry_at_end_node'}{'node_next'} = $result_nodes{'index_entry_at_end_node'}{'menu_child'};
-$result_nodes{'index_entry_at_end_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_entry_at_end_node'};
$result_menus{'index_entry_at_end_node'} = {
'cmdname' => 'node',
@@ -791,6 +782,7 @@ $result_menus{'index_entry_at_end_node'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'indices',
'spaces_before_argument' => ' '
},
@@ -852,6 +844,11 @@ Node: chapter128
Node: indices213

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_no_warning.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_no_warning.pl
index 0d5d7bf26f..cc58e6c63c 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_no_warning.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_no_warning.pl
@@ -990,18 +990,7 @@ $result_nodes{'invalid_node_name_no_warning'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'};
$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'invalid_node_name_no_warning'};
@@ -1010,7 +999,6 @@ $result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_next'}{'node_u
$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_prev'} = $result_nodes{'invalid_node_name_no_warning'};
$result_nodes{'invalid_node_name_no_warning'}{'menu_child'}{'node_up'} = $result_nodes{'invalid_node_name_no_warning'};
$result_nodes{'invalid_node_name_no_warning'}{'node_next'} = $result_nodes{'invalid_node_name_no_warning'}{'menu_child'};
-$result_nodes{'invalid_node_name_no_warning'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'invalid_node_name_no_warning'};
$result_menus{'invalid_node_name_no_warning'} = {
'cmdname' => 'node',
@@ -1094,6 +1082,11 @@ Node: node,comma221
Node: bidule:296

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_warning.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_warning.pl
index 403bd79d11..de6b0fabc2 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -990,18 +990,7 @@ $result_nodes{'invalid_node_name_warning'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'};
$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'invalid_node_name_warning'};
@@ -1010,7 +999,6 @@ $result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_next'}{'node_up'}
$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_prev'} = $result_nodes{'invalid_node_name_warning'};
$result_nodes{'invalid_node_name_warning'}{'menu_child'}{'node_up'} = $result_nodes{'invalid_node_name_warning'};
$result_nodes{'invalid_node_name_warning'}{'node_next'} = $result_nodes{'invalid_node_name_warning'}{'menu_child'};
-$result_nodes{'invalid_node_name_warning'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'invalid_node_name_warning'};
$result_menus{'invalid_node_name_warning'} = {
'cmdname' => 'node',
@@ -1094,6 +1082,11 @@ Node: node,comma221
Node: bidule:296

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'invalid_node_name_warning'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/known_encoding.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/known_encoding.pl
index a7d2b31e80..7de35a2a01 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/known_encoding.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/known_encoding.pl
@@ -138,20 +138,8 @@ $result_nodes{'known_encoding'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'known_encoding'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'known_encoding'};
$result_menus{'known_encoding'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/multiline_image_and_align.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/multiline_image_and_align.pl
index fe57db271e..871073ff81 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -26,7 +26,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -79,7 +81,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -132,7 +136,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
@@ -185,7 +191,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 7,
@@ -253,7 +261,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 11,
@@ -297,7 +307,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 13,
@@ -324,7 +336,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -365,7 +379,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 16,
@@ -482,7 +498,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 19,
@@ -569,7 +587,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 21,
@@ -656,7 +676,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 23,
@@ -743,7 +765,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 25,
@@ -845,7 +869,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 29,
@@ -923,7 +949,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 31,
@@ -984,7 +1012,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -1059,7 +1089,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 34,
@@ -1435,6 +1467,11 @@ BBB
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'multiline_image_and_align'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index ef7518bfb6..88ea3f25cf 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -940,6 +940,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1163,26 +1164,16 @@ $result_sectioning{'multitable_anchor_and_index_entry'} = {};
$result_nodes{'multitable_anchor_and_index_entry'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'multitable_anchor_and_index_entry'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'multitable_anchor_and_index_entry'};
$result_menus{'multitable_anchor_and_index_entry'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -1235,6 +1226,11 @@ Ref: anchor in multitable269
Ref: mark388

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/nested_footnotes_separate.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/nested_footnotes_separate.pl
index f0eab84162..66bc40ed6f 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/nested_footnotes_separate.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/nested_footnotes_separate.pl
@@ -233,20 +233,8 @@ $result_nodes{'nested_footnotes_separate'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'nested_footnotes_separate'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nested_footnotes_separate'};
$result_menus{'nested_footnotes_separate'} = {
'cmdname' => 'node',
@@ -285,6 +273,11 @@ Ref: Top-Footnote-1134
Ref: Top-Footnote-2189

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index c06960712f..00f200041c 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -671,6 +671,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -830,26 +831,16 @@ $result_sectioning{'nested_multitable_anchor_index'} = {};
$result_nodes{'nested_multitable_anchor_index'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'nested_multitable_anchor_index'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nested_multitable_anchor_index'};
$result_menus{'nested_multitable_anchor_index'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -884,6 +875,11 @@ Ref: mark inside94
Ref: mark140

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/no_node_but_top.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/no_node_but_top.pl
index e6cb085215..7b6bb36517 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/no_node_but_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/no_node_but_top.pl
@@ -87,6 +87,11 @@ top
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'no_node_but_top'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/no_nodes.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/no_nodes.pl
index 21d75d1ef6..abf81e179e 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/no_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/no_nodes.pl
@@ -40,6 +40,11 @@ Text.
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'no_nodes'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/no_top_node.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/no_top_node.pl
index 0a6505f746..b069c5aa3b 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/no_top_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/no_top_node.pl
@@ -100,6 +100,11 @@ Tag Table:
Node: node Top not Top node27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'no_top_node'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong.pl
index 9ad86a5fd1..627a43b1e9 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong.pl
@@ -417,20 +417,8 @@ $result_nodes{'note_in_strong'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'note_in_strong'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'note_in_strong'};
$result_menus{'note_in_strong'} = {
'cmdname' => 'node',
@@ -466,6 +454,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'note_in_strong'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong_end_of_line.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong_end_of_line.pl
index 43d18dc9c2..b10fe1ff95 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong_end_of_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/note_in_strong_end_of_line.pl
@@ -191,20 +191,8 @@ $result_nodes{'note_in_strong_end_of_line'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'note_in_strong_end_of_line'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'note_in_strong_end_of_line'};
$result_menus{'note_in_strong_end_of_line'} = {
'cmdname' => 'node',
@@ -234,6 +222,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'note_in_strong_end_of_line'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/novalidate_empty_refs.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/novalidate_empty_refs.pl
index 96b1f73fb9..64d7f64620 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/novalidate_empty_refs.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/novalidate_empty_refs.pl
@@ -380,20 +380,8 @@ $result_nodes{'novalidate_empty_refs'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'novalidate_empty_refs'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'novalidate_empty_refs'};
$result_menus{'novalidate_empty_refs'} = {
'cmdname' => 'node',
@@ -450,6 +438,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_and_preamble.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index 3c5a663fca..9fc8ff6cf5 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -396,20 +396,8 @@ $result_nodes{'paragraphindent_and_preamble'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'paragraphindent_and_preamble'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'paragraphindent_and_preamble'};
$result_menus{'paragraphindent_and_preamble'} = {
'cmdname' => 'node',
@@ -447,6 +435,11 @@ Tag Table:
Node: Top63

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_asis_first.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_asis_first.pl
index 086129b685..3d1b8bba83 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_asis_first.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_asis_first.pl
@@ -125,6 +125,11 @@ bbb
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'paragraphindent_asis_first'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_none_first.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_none_first.pl
index 9716b5e1d3..3becffc973 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_none_first.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/paragraphindent_none_first.pl
@@ -166,6 +166,11 @@ after none
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'paragraphindent_none_first'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/pxref_test.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/pxref_test.pl
index cccef9e5c9..cad01b52d5 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/pxref_test.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/pxref_test.pl
@@ -374,20 +374,8 @@ $result_nodes{'pxref_test'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'pxref_test'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'pxref_test'};
$result_menus{'pxref_test'} = {
'cmdname' => 'node',
@@ -414,6 +402,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/ref_tests.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/ref_tests.pl
index 1ca18bf17e..5e5eddecad 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/ref_tests.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/ref_tests.pl
@@ -649,20 +649,8 @@ $result_nodes{'ref_tests'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'ref_tests'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_tests'};
$result_menus{'ref_tests'} = {
'cmdname' => 'node',
@@ -694,6 +682,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'ref_tests'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/space_at_menu_end.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/space_at_menu_end.pl
index 54a9c6fcfe..192fa9a104 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/space_at_menu_end.pl
@@ -296,21 +296,9 @@ $result_nodes{'space_at_menu_end'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'space_at_menu_end'}{'node_next'} = $result_nodes{'space_at_menu_end'}{'menu_child'};
-$result_nodes{'space_at_menu_end'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'space_at_menu_end'};
$result_menus{'space_at_menu_end'} = {
'cmdname' => 'node',
@@ -349,6 +337,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/space_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/space_in_menu.pl
index 4c898e5238..fad61f5c3e 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/space_in_menu.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/space_in_menu.pl
@@ -474,23 +474,11 @@ $result_nodes{'space_in_menu'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'space_in_menu'}{'menu_child'}{'node_prev'} = $result_nodes{'space_in_menu'};
$result_nodes{'space_in_menu'}{'menu_child'}{'node_up'} = $result_nodes{'space_in_menu'};
$result_nodes{'space_in_menu'}{'node_next'} = $result_nodes{'space_in_menu'}{'menu_child'};
-$result_nodes{'space_in_menu'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'space_in_menu'};
$result_menus{'space_in_menu'} = {
'cmdname' => 'node',
@@ -544,6 +532,11 @@ Node: Top27
Node: node117

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/space_in_setfilename.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/space_in_setfilename.pl
index d65ffac8df..6eccf1ccd8 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/space_in_setfilename.pl
@@ -148,20 +148,8 @@ $result_nodes{'space_in_setfilename'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'space_in_setfilename'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'space_in_setfilename'};
$result_menus{'space_in_setfilename'} = {
'cmdname' => 'node',
@@ -205,6 +193,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/split_no_copying.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/split_no_copying.pl
index 25c7096dc4..1bdfc9c8ac 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/split_no_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/split_no_copying.pl
@@ -556,23 +556,11 @@ $result_nodes{'split_no_copying'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'split_no_copying'}{'menu_child'}{'node_prev'} = $result_nodes{'split_no_copying'};
$result_nodes{'split_no_copying'}{'menu_child'}{'node_up'} = $result_nodes{'split_no_copying'};
$result_nodes{'split_no_copying'}{'node_next'} = $result_nodes{'split_no_copying'}{'menu_child'};
-$result_nodes{'split_no_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'split_no_copying'};
$result_menus{'split_no_copying'} = {
'cmdname' => 'node',
@@ -629,6 +617,11 @@ Node: Top63
Node: Ch1179

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node.pl
index 950501a1b3..57b16234d9 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node.pl
@@ -550,23 +550,11 @@ $result_nodes{'split_test_before_first_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'split_test_before_first_node'}{'menu_child'}{'node_prev'} = $result_nodes{'split_test_before_first_node'};
$result_nodes{'split_test_before_first_node'}{'menu_child'}{'node_up'} = $result_nodes{'split_test_before_first_node'};
$result_nodes{'split_test_before_first_node'}{'node_next'} = $result_nodes{'split_test_before_first_node'}{'menu_child'};
-$result_nodes{'split_test_before_first_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'split_test_before_first_node'};
$result_menus{'split_test_before_first_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node/res_info/split_test_before_first_node.info b/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node/res_info/split_test_before_first_node.info
index 5a80256f8e..5814a707da 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node/res_info/split_test_before_first_node.info
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node/res_info/split_test_before_first_node.info
@@ -13,3 +13,8 @@ Node: Top115
Node: chap1353

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
index 67ef7bf559..b37e41f121 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line.pl
@@ -541,23 +541,11 @@ $result_nodes{'split_test_before_first_node_no_empty_line'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'split_test_before_first_node_no_empty_line'}{'menu_child'}{'node_prev'} = $result_nodes{'split_test_before_first_node_no_empty_line'};
$result_nodes{'split_test_before_first_node_no_empty_line'}{'menu_child'}{'node_up'} = $result_nodes{'split_test_before_first_node_no_empty_line'};
$result_nodes{'split_test_before_first_node_no_empty_line'}{'node_next'} = $result_nodes{'split_test_before_first_node_no_empty_line'}{'menu_child'};
-$result_nodes{'split_test_before_first_node_no_empty_line'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'split_test_before_first_node_no_empty_line'};
$result_menus{'split_test_before_first_node_no_empty_line'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line/res_info/split_test_before_first_node.info b/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line/res_info/split_test_before_first_node.info
index 5a80256f8e..5814a707da 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line/res_info/split_test_before_first_node.info
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/split_test_before_first_node_no_empty_line/res_info/split_test_before_first_node.info
@@ -13,3 +13,8 @@ Node: Top115
Node: chap1353

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/test_index.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/test_index.pl
index ea203d08fb..79580b6f1a 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/test_index.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/test_index.pl
@@ -193,6 +193,7 @@ $result_trees{'test_index'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -415,7 +416,7 @@ $result_trees{'test_index'} = {
'index_at_command' => 'cindex',
'index_name' => 'cp',
'index_type_command' => 'cindex',
- 'key' => '!',
+ 'key' => "\x{a1}",
'node' => {},
'number' => 3
},
@@ -4350,6 +4351,7 @@ $result_sectioning{'test_index'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
'spaces_before_argument' => ' '
}
@@ -4482,6 +4484,7 @@ $result_nodes{'test_index'} = {
'level' => 1,
'number' => 'A'
},
+ 'isindex' => 1,
'normalized' => 'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
'spaces_before_argument' => ' '
},
@@ -4506,25 +4509,13 @@ $result_nodes{'test_index'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'test_index'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'test_index'}{'menu_child'};
$result_nodes{'test_index'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'test_index'};
$result_nodes{'test_index'}{'menu_child'}{'node_prev'} = $result_nodes{'test_index'};
$result_nodes{'test_index'}{'menu_child'}{'node_up'} = $result_nodes{'test_index'};
$result_nodes{'test_index'}{'node_next'} = $result_nodes{'test_index'}{'menu_child'};
-$result_nodes{'test_index'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'test_index'};
$result_menus{'test_index'} = {
'cmdname' => 'node',
@@ -4541,6 +4532,7 @@ $result_menus{'test_index'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'name1-looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
'spaces_before_argument' => ' '
},
@@ -4771,9 +4763,9 @@ Para.
* Menu:
-* !: Top. (line 8)
* ": Top. (line 8)
* @: Top. (line 8)
+* ¡: Top. (line 8)
* in Top: Top. (line 8)
* index entry in appendix before para: name1 looooooooooooooooooooooooooooooooooooooooooooooooooooooooong.
(line 6)
@@ -4823,9 +4815,14 @@ Tag Table:
Node: Top27
Node: name330
Node: name1 looooooooooooooooooooooooooooooooooooooooooooooooooooooooong982
-Ref: a counting anchor3070
+Ref: a counting anchor3071

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/text_before_node.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/text_before_node.pl
index 922f16a4aa..9e3acbeec7 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/text_before_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/text_before_node.pl
@@ -435,23 +435,11 @@ $result_nodes{'text_before_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'text_before_node'}{'menu_child'}{'node_prev'} = $result_nodes{'text_before_node'};
$result_nodes{'text_before_node'}{'menu_child'}{'node_up'} = $result_nodes{'text_before_node'};
$result_nodes{'text_before_node'}{'node_next'} = $result_nodes{'text_before_node'}{'menu_child'};
-$result_nodes{'text_before_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'text_before_node'};
$result_menus{'text_before_node'} = {
'cmdname' => 'node',
@@ -504,6 +492,11 @@ Node: Top27
Node: chapter node125

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/top_node_normalization.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/top_node_normalization.pl
index adbf8dc852..2a7915f70c 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/top_node_normalization.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/top_node_normalization.pl
@@ -331,23 +331,11 @@ $result_nodes{'top_node_normalization'} = {
}
],
'node_next' => {},
- 'node_prev' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_prev' => {}
};
$result_nodes{'top_node_normalization'}{'menu_child'} = $result_nodes{'top_node_normalization'};
$result_nodes{'top_node_normalization'}{'node_next'} = $result_nodes{'top_node_normalization'};
$result_nodes{'top_node_normalization'}{'node_prev'} = $result_nodes{'top_node_normalization'};
-$result_nodes{'top_node_normalization'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_node_normalization'};
$result_menus{'top_node_normalization'} = {
'cmdname' => 'node',
@@ -391,15 +379,6 @@ $result_errors{'top_node_normalization'} = [
'macro' => '',
'text' => '@menu entry node name `tOP\' different from node name `ToP\'',
'type' => 'warning'
- },
- {
- 'error_line' => ':1: warning: for `ToP\', up in menu `ToP\' and up `(dir)\' don\'t match
-',
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => '',
- 'text' => 'for `ToP\', up in menu `ToP\' and up `(dir)\' don\'t match',
- 'type' => 'warning'
}
];
@@ -421,6 +400,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/unknown_encoding.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/unknown_encoding.pl
index 2c23234e2e..6ddd5f93eb 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/unknown_encoding.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/unknown_encoding.pl
@@ -136,20 +136,8 @@ $result_nodes{'unknown_encoding'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'unknown_encoding'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'unknown_encoding'};
$result_menus{'unknown_encoding'} = {
'cmdname' => 'node',
@@ -193,6 +181,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/info_tests/xref_test.pl b/macros/texinfo/texinfo/tp/t/results/info_tests/xref_test.pl
index eac1e02eb9..a13eb9b08f 100644
--- a/macros/texinfo/texinfo/tp/t/results/info_tests/xref_test.pl
+++ b/macros/texinfo/texinfo/tp/t/results/info_tests/xref_test.pl
@@ -427,20 +427,8 @@ $result_nodes{'xref_test'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'xref_test'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'xref_test'};
$result_menus{'xref_test'} = {
'cmdname' => 'node',
@@ -468,6 +456,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'xref_test'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/footnote_in_ref.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/footnote_in_ref.pl
index a51e4bed1a..4685e2e841 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/footnote_in_ref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/footnote_in_ref.pl
@@ -187,20 +187,8 @@ $result_nodes{'footnote_in_ref'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'footnote_in_ref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'footnote_in_ref'};
$result_menus{'footnote_in_ref'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ignore_in_xref.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ignore_in_xref.pl
index 72a3807281..f7564fa744 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ignore_in_xref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ignore_in_xref.pl
@@ -193,20 +193,8 @@ $result_nodes{'ignore_in_xref'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'ignore_in_xref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ignore_in_xref'};
$result_menus{'ignore_in_xref'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/in_table.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/in_table.pl
index 01cba1a6e3..c3417282b1 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/in_table.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/in_table.pl
@@ -980,6 +980,7 @@ $result_trees{'in_table'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1219,26 +1220,16 @@ $result_sectioning{'in_table'} = {};
$result_nodes{'in_table'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'in_table'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'in_table'};
$result_menus{'in_table'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/menu_in_style_command.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/menu_in_style_command.pl
index fd93c61c78..607f7d5e6f 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -284,21 +284,9 @@ $result_nodes{'menu_in_style_command'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'menu_in_style_command'}{'node_next'} = $result_nodes{'menu_in_style_command'}{'menu_child'};
-$result_nodes{'menu_in_style_command'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'menu_in_style_command'};
$result_menus{'menu_in_style_command'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
index f8d24aa128..056939ffc0 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl
@@ -230,20 +230,8 @@ $result_nodes{'node_in_copying_not_closed'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'node_in_copying_not_closed'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_in_copying_not_closed'};
$result_menus{'node_in_copying_not_closed'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/quotation_in_ref.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/quotation_in_ref.pl
index d18beee2f1..c75f058aeb 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -219,20 +219,8 @@ $result_nodes{'quotation_in_ref'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'quotation_in_ref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'quotation_in_ref'};
$result_menus{'quotation_in_ref'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_anchor.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_anchor.pl
index a1dad57c4e..2c511dd4cf 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_anchor.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_anchor.pl
@@ -148,20 +148,8 @@ $result_nodes{'ref_in_anchor'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'ref_in_anchor'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_in_anchor'};
$result_menus{'ref_in_anchor'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_ref.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_ref.pl
index c9f07a7445..652a5dc208 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_ref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_ref.pl
@@ -146,20 +146,8 @@ $result_nodes{'ref_in_ref'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'ref_in_ref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_in_ref'};
$result_menus{'ref_in_ref'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
index 49a782d330..35c80719a9 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl
@@ -135,20 +135,8 @@ $result_nodes{'style_not_closed_before_first_node'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'style_not_closed_before_first_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'style_not_closed_before_first_node'};
$result_menus{'style_not_closed_before_first_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
index 20958f90ae..1441eaa760 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
@@ -520,23 +520,11 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'style_not_closed_no_newline_root_commands'}{'menu_child'}{'node_prev'} = $result_nodes{'style_not_closed_no_newline_root_commands'};
$result_nodes{'style_not_closed_no_newline_root_commands'}{'menu_child'}{'node_up'} = $result_nodes{'style_not_closed_no_newline_root_commands'};
$result_nodes{'style_not_closed_no_newline_root_commands'}{'node_next'} = $result_nodes{'style_not_closed_no_newline_root_commands'}{'menu_child'};
-$result_nodes{'style_not_closed_no_newline_root_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'style_not_closed_no_newline_root_commands'};
$result_menus{'style_not_closed_no_newline_root_commands'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
index 14bd5aa0eb..10b59800ea 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl
@@ -538,23 +538,11 @@ $result_nodes{'style_not_closed_root_commands'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'style_not_closed_root_commands'}{'menu_child'}{'node_prev'} = $result_nodes{'style_not_closed_root_commands'};
$result_nodes{'style_not_closed_root_commands'}{'menu_child'}{'node_up'} = $result_nodes{'style_not_closed_root_commands'};
$result_nodes{'style_not_closed_root_commands'}{'node_next'} = $result_nodes{'style_not_closed_root_commands'}{'menu_child'};
-$result_nodes{'style_not_closed_root_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'style_not_closed_root_commands'};
$result_menus{'style_not_closed_root_commands'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/verbatim_in_ref.pl b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 11321ddc9a..55cf4a30d8 100644
--- a/macros/texinfo/texinfo/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/macros/texinfo/texinfo/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -188,20 +188,8 @@ $result_nodes{'verbatim_in_ref'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'verbatim_in_ref'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'verbatim_in_ref'};
$result_menus{'verbatim_in_ref'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl b/macros/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl
index bd71a675a8..0557b8cda5 100644
--- a/macros/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl
+++ b/macros/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl
@@ -276,9 +276,9 @@ $result_errors{'accent_argument'} = [
-$result_converted{'plaintext'}->{'accent_argument'} = ' ~ item
+$result_converted{'plaintext'}->{'accent_argument'} = ' ̃ item
- ~ item
+ ̃ item
';
diff --git a/macros/texinfo/texinfo/tp/t/results/itemize/table_in_itemize.pl b/macros/texinfo/texinfo/tp/t/results/itemize/table_in_itemize.pl
new file mode 100644
index 0000000000..102948f22e
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/t/results/itemize/table_in_itemize.pl
@@ -0,0 +1,476 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'table_in_itemize'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemize',
+ 'contents' => [
+ {
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'item one
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 1,
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'table one'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aaaaa
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'New para.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_item'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'table two'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Five
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'New para.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_item'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'table'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'table',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'table'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'command_as_argument' => {},
+ 'end_command' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 2
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'item three
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 3,
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'itemize'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'itemize',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'command_as_argument' => {},
+ 'end_command' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'table_in_itemize'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'args'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[2];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[2]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[3];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[3]{'parent'} = $result_trees{'table_in_itemize'}{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'extra'}{'command_as_argument'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[3];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'line_nr'} = $result_trees{'table_in_itemize'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'table_in_itemize'}{'contents'}[0]{'parent'} = $result_trees{'table_in_itemize'};
+
+$result_texis{'table_in_itemize'} = '@itemize @bullet
+@item item one
+@item
+@table @asis
+@item table one
+aaaaa
+
+New para.
+@item table two
+Five
+
+New para.
+@end table
+@item item three
+@end itemize';
+
+
+$result_texts{'table_in_itemize'} = 'item one
+table one
+aaaaa
+
+New para.
+table two
+Five
+
+New para.
+item three
+';
+
+$result_errors{'table_in_itemize'} = [];
+
+
+
+$result_converted{'plaintext'}->{'table_in_itemize'} = ' * item one
+ * table one
+ aaaaa
+
+ New para.
+ table two
+ Five
+
+ New para.
+ * item three
+';
+
+
+$result_converted{'html_text'}->{'table_in_itemize'} = '<ul>
+<li> item one
+</li><li> <dl compact="compact">
+<dt>table one</dt>
+<dd><p>aaaaa
+</p>
+<p>New para.
+</p></dd>
+<dt>table two</dt>
+<dd><p>Five
+</p>
+<p>New para.
+</p></dd>
+</dl>
+</li><li> item three
+</li></ul>
+';
+
+1;
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/appendix_translated.pl b/macros/texinfo/texinfo/tp/t/results/languages/appendix_translated.pl
index 463cd5bc9a..0c620809fc 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/appendix_translated.pl
+++ b/macros/texinfo/texinfo/tp/t/results/languages/appendix_translated.pl
@@ -273,20 +273,8 @@ $result_nodes{'appendix_translated'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'appendix_translated'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'appendix_translated'};
$result_menus{'appendix_translated'} = {
'cmdname' => 'node',
@@ -328,6 +316,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/command_translated.pl b/macros/texinfo/texinfo/tp/t/results/languages/command_translated.pl
index af12853674..2200b0a2cf 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/command_translated.pl
+++ b/macros/texinfo/texinfo/tp/t/results/languages/command_translated.pl
@@ -240,20 +240,8 @@ $result_nodes{'command_translated'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'command_translated'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'command_translated'};
$result_menus{'command_translated'} = {
'cmdname' => 'node',
@@ -289,6 +277,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/multiple.pl b/macros/texinfo/texinfo/tp/t/results/languages/multiple.pl
index 4fa349beca..0cdb70b6b0 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/multiple.pl
+++ b/macros/texinfo/texinfo/tp/t/results/languages/multiple.pl
@@ -867,20 +867,8 @@ $result_nodes{'multiple'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'multiple'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'multiple'};
$result_menus{'multiple'} = {
'cmdname' => 'node',
@@ -898,9 +886,9 @@ $result_converted{'plaintext'}->{'multiple'} = ' -- Variable d\'instance de fr :
-- Variable d\'instance de copying : a b
- -- Variável de instância da pt: BBB CCC
+ -- Variável de instância da pt: BBB CCC
- -- Variável de instância da copying: a b
+ -- Variável de instância da copying: a b
';
@@ -915,15 +903,20 @@ File: , Node: Top, Up: (dir)
-- Variable d\'instance de copying : a b
- -- Variável de instância da pt: BBB CCC
+ -- Variável de instância da pt: BBB CCC
- -- Variável de instância da copying: a b
+ -- Variável de instância da copying: a b

Tag Table:
Node: Top69

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters.pl b/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters.pl
index 32d707ec91..2400612388 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters.pl
@@ -2238,18 +2238,7 @@ $result_nodes{'multiple_lang_chapters'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'multiple_lang_chapters'};
@@ -2262,7 +2251,6 @@ $result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_next'}{'node_up'} =
$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_prev'} = $result_nodes{'multiple_lang_chapters'};
$result_nodes{'multiple_lang_chapters'}{'menu_child'}{'node_up'} = $result_nodes{'multiple_lang_chapters'};
$result_nodes{'multiple_lang_chapters'}{'node_next'} = $result_nodes{'multiple_lang_chapters'}{'menu_child'};
-$result_nodes{'multiple_lang_chapters'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'multiple_lang_chapters'};
$result_menus{'multiple_lang_chapters'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html b/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
index bf52becf57..d4641b2c99 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
+++ b/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
@@ -10,7 +10,6 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
-<link href="dir.html#Top" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -37,7 +36,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Pr&oacute;ximo: <a href="#chapter-ja" accesskey="n" rel="next">chapter ja</a>, Acima: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Pr&oacute;ximo: <a href="#chapter-ja" accesskey="n" rel="next">chapter ja</a> &nbsp; </p>
</div>
<span id="Multi-language-file"></span><h1 class="top">Multi language file</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters_texi2html.pl b/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 267ef20314..d3d6bebb51 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/macros/texinfo/texinfo/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -2238,18 +2238,7 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'};
$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'multiple_lang_chapters_texi2html'};
@@ -2262,7 +2251,6 @@ $result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_next'}{'no
$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_prev'} = $result_nodes{'multiple_lang_chapters_texi2html'};
$result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'}{'node_up'} = $result_nodes{'multiple_lang_chapters_texi2html'};
$result_nodes{'multiple_lang_chapters_texi2html'}{'node_next'} = $result_nodes{'multiple_lang_chapters_texi2html'}{'menu_child'};
-$result_nodes{'multiple_lang_chapters_texi2html'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'multiple_lang_chapters_texi2html'};
$result_menus{'multiple_lang_chapters_texi2html'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/simple.pl b/macros/texinfo/texinfo/tp/t/results/languages/simple.pl
index 23610db17a..b5f9e49a3e 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/simple.pl
+++ b/macros/texinfo/texinfo/tp/t/results/languages/simple.pl
@@ -314,20 +314,8 @@ $result_nodes{'simple'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'simple'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'simple'};
$result_menus{'simple'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/unknown_language.pl b/macros/texinfo/texinfo/tp/t/results/languages/unknown_language.pl
index 1240c73207..70431af4c9 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/unknown_language.pl
+++ b/macros/texinfo/texinfo/tp/t/results/languages/unknown_language.pl
@@ -353,20 +353,8 @@ $result_nodes{'unknown_language'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'unknown_language'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'unknown_language'};
$result_menus{'unknown_language'} = {
'cmdname' => 'node',
@@ -434,6 +422,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/languages/unknown_region.pl b/macros/texinfo/texinfo/tp/t/results/languages/unknown_region.pl
index 3ddbf6353c..7c7e46720e 100644
--- a/macros/texinfo/texinfo/tp/t/results/languages/unknown_region.pl
+++ b/macros/texinfo/texinfo/tp/t/results/languages/unknown_region.pl
@@ -314,20 +314,8 @@ $result_nodes{'unknown_region'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'unknown_region'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'unknown_region'};
$result_menus{'unknown_region'} = {
'cmdname' => 'node',
@@ -367,6 +355,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation.pl
index c2e363ce74..4d2a46af2c 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation'}{'menu_child'};
$result_nodes{'navigation'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation'};
$result_nodes{'navigation'}{'menu_child'}{'node_up'} = $result_nodes{'navigation'};
$result_nodes{'navigation'}{'node_next'} = $result_nodes{'navigation'}{'menu_child'};
-$result_nodes{'navigation'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation'};
$result_menus{'navigation'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl
index f45889711f..261fd40ee6 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_chapter'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_chapter'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_chapter'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter'}{'menu_child'};
$result_nodes{'navigation_chapter'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_chapter'};
$result_nodes{'navigation_chapter'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter'};
$result_nodes{'navigation_chapter'}{'node_next'} = $result_nodes{'navigation_chapter'}{'menu_child'};
-$result_nodes{'navigation_chapter'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_chapter'};
$result_menus{'navigation_chapter'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html
index 84821116e3..d764cec5e1 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -66,7 +66,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -116,7 +116,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -133,7 +133,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_abt.html
index 6dda0e2f19..5cf710a731 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html
index 20e7416a05..5cf28cb573 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/navigation_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl
index 212402ea33..a6ad9c5e48 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_chapter_no_header'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_no_header'}{'menu_child'};
$result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_chapter_no_header'};
$result_nodes{'navigation_chapter_no_header'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_no_header'};
$result_nodes{'navigation_chapter_no_header'}{'node_next'} = $result_nodes{'navigation_chapter_no_header'}{'menu_child'};
-$result_nodes{'navigation_chapter_no_header'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_chapter_no_header'};
$result_menus{'navigation_chapter_no_header'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html
index fe92882b61..5147c35a14 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html
@@ -34,14 +34,14 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -94,7 +94,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_abt.html
index 6dda0e2f19..5cf710a731 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html
index 20e7416a05..5cf28cb573 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/navigation_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
index ed1fe5a926..db4ebad9bb 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'};
$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_chapter_no_header_vertical'};
$result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_no_header_vertical'};
$result_nodes{'navigation_chapter_no_header_vertical'}{'node_next'} = $result_nodes{'navigation_chapter_no_header_vertical'}{'menu_child'};
-$result_nodes{'navigation_chapter_no_header_vertical'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_chapter_no_header_vertical'};
$result_menus{'navigation_chapter_no_header_vertical'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html
index bac1568285..eeff855b64 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[ &gt;&gt; ]</td>
@@ -59,7 +59,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -131,7 +131,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_abt.html
index def8e2958f..11a1b0daf3 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_abt.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -160,7 +160,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html
index c7067089f6..bb9d950111 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/navigation_toc.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl
index a363e8943d..650f944ade 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_chapter_vertical'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_vertical'}{'menu_child'};
$result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_chapter_vertical'};
$result_nodes{'navigation_chapter_vertical'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_chapter_vertical'};
$result_nodes{'navigation_chapter_vertical'}{'node_next'} = $result_nodes{'navigation_chapter_vertical'}{'menu_child'};
-$result_nodes{'navigation_chapter_vertical'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_chapter_vertical'};
$result_menus{'navigation_chapter_vertical'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html
index ef5b52ae05..e5c23aa328 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html
@@ -38,13 +38,13 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#section" title="Next section in reading order"> &gt; </a>]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -97,7 +97,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -147,7 +147,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -167,7 +167,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html
index def8e2958f..11a1b0daf3 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_abt.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -160,7 +160,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html
index c7067089f6..bb9d950111 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/navigation_toc.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl
index 59e63c23af..aef2bad6bc 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_no_header'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_no_header'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_no_header'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_no_header'}{'menu_child'};
$result_nodes{'navigation_no_header'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_no_header'};
$result_nodes{'navigation_no_header'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_no_header'};
$result_nodes{'navigation_no_header'}{'node_next'} = $result_nodes{'navigation_no_header'}{'menu_child'};
-$result_nodes{'navigation_no_header'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_no_header'};
$result_menus{'navigation_no_header'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl
index 0995efe1b8..6b3ad831d8 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_no_header_vertical'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_no_header_vertical'}{'menu_child'};
$result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_no_header_vertical'};
$result_nodes{'navigation_no_header_vertical'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_no_header_vertical'};
$result_nodes{'navigation_no_header_vertical'}{'node_next'} = $result_nodes{'navigation_no_header_vertical'}{'menu_child'};
-$result_nodes{'navigation_no_header_vertical'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_no_header_vertical'};
$result_menus{'navigation_no_header_vertical'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl
index 696dd0bb65..6e6411a785 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_node'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_node'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node'}{'menu_child'};
$result_nodes{'navigation_node'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_node'};
$result_nodes{'navigation_node'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node'};
$result_nodes{'navigation_node'}{'node_next'} = $result_nodes{'navigation_node'}{'menu_child'};
-$result_nodes{'navigation_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_node'};
$result_menus{'navigation_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html
index 52724282e1..75387079ce 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -52,7 +52,7 @@ ul.no-bullet {list-style: none}
<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="section.html#section">1.1 Section in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="section.html">1.1 Section in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html
index fc236a7fa3..16cc3ab24a 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html
@@ -36,7 +36,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -46,14 +46,14 @@ ul.no-bullet {list-style: none}
<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_abt.html
index 884329b957..c016c65cd3 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -145,7 +145,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_toc.html
index dc486e83f7..82a177ac9b 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/navigation_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -46,18 +46,18 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Section-in-chapter" href="section.html#section">1.1 Section in chapter</a>
+ <li><a id="toc-Section-in-chapter" href="section.html">1.1 Section in chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Sub-section-in-section" href="subsection.html#subsection">1.1.1 Sub section in section</a></li>
+ <li><a id="toc-Sub-section-in-section" href="subsection.html">1.1.1 Sub section in section</a></li>
</ul></li>
</ul></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html
index 9c9d2b2de3..4e5850e853 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -79,7 +79,7 @@ ul.no-bullet {list-style: none}
b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsection.html#subsection">1.1.1 Sub section in section</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsection.html">1.1.1 Sub section in section</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html
index 11ccd97329..f633c4b91e 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl
index c9643f533b..3341aa37e0 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_node_no_header'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_node_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_no_header'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_node_no_header'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_no_header'}{'menu_child'};
$result_nodes{'navigation_node_no_header'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_node_no_header'};
$result_nodes{'navigation_node_no_header'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_no_header'};
$result_nodes{'navigation_node_no_header'}{'node_next'} = $result_nodes{'navigation_node_no_header'}{'menu_child'};
-$result_nodes{'navigation_node_no_header'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_node_no_header'};
$result_menus{'navigation_node_no_header'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html
index 5ea4f64162..6f3e7c196f 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html
index 04e9c79065..e92d4be73e 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html
@@ -36,7 +36,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_abt.html
index 320d4a641c..dcb7ecfdc7 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_toc.html
index be12d4ff11..c65f5007df 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/navigation_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -46,11 +46,11 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Section-in-chapter" href="section.html#section">1.1 Section in chapter</a>
+ <li><a id="toc-Section-in-chapter" href="section.html">1.1 Section in chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Sub-section-in-section" href="subsection.html#subsection">1.1.1 Sub section in section</a></li>
+ <li><a id="toc-Sub-section-in-section" href="subsection.html">1.1.1 Sub section in section</a></li>
</ul></li>
</ul></li>
</ul>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html
index b54d4bb488..0d42d97b4b 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html
index 4b076f0db7..7e820fc53a 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl
index 83223e9c6f..091f808191 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_no_header_vertical'}{'menu_child'};
$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_node_no_header_vertical'};
$result_nodes{'navigation_node_no_header_vertical'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_no_header_vertical'};
$result_nodes{'navigation_node_no_header_vertical'}{'node_next'} = $result_nodes{'navigation_node_no_header_vertical'}{'menu_child'};
-$result_nodes{'navigation_node_no_header_vertical'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_node_no_header_vertical'};
$result_menus{'navigation_node_no_header_vertical'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html
index 6f42d01314..90e05ef645 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -51,7 +51,7 @@ ul.no-bullet {list-style: none}
<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="section.html#section">1.1 Section in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="section.html">1.1 Section in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
index b27d977745..e42525af7f 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[ &lt; ]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"> &nbsp; </td>
@@ -62,7 +62,7 @@ ul.no-bullet {list-style: none}
<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html
index 597cbf7f55..2774f144a7 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_abt.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html
index 07c36ea8d0..fc83caa203 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/navigation_toc.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -58,11 +58,11 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Section-in-chapter" href="section.html#section">1.1 Section in chapter</a>
+ <li><a id="toc-Section-in-chapter" href="section.html">1.1 Section in chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Sub-section-in-section" href="subsection.html#subsection">1.1.1 Sub section in section</a></li>
+ <li><a id="toc-Sub-section-in-section" href="subsection.html">1.1.1 Sub section in section</a></li>
</ul></li>
</ul></li>
</ul>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html
index 691e2cedaf..42ebdc8263 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -78,7 +78,7 @@ ul.no-bullet {list-style: none}
b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsection.html#subsection">1.1.1 Sub section in section</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsection.html">1.1.1 Sub section in section</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html
index 4b076f0db7..7e820fc53a 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl
index 0ebf876008..e6b799c4ca 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_node_vertical'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_node_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_vertical'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_node_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_vertical'}{'menu_child'};
$result_nodes{'navigation_node_vertical'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_node_vertical'};
$result_nodes{'navigation_node_vertical'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_node_vertical'};
$result_nodes{'navigation_node_vertical'}{'node_next'} = $result_nodes{'navigation_node_vertical'}{'menu_child'};
-$result_nodes{'navigation_node_vertical'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_node_vertical'};
$result_menus{'navigation_node_vertical'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html
index 0a695644eb..7c5c6a88a1 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html
@@ -38,16 +38,16 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[ &gt;&gt; ]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -82,7 +82,7 @@ ul.no-bullet {list-style: none}
<span id="First-chapter"></span><h1 class="chapter">1 First chapter</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="section.html#section">1.1 Section in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="section.html">1.1 Section in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html
index f18b1d2bc8..6ada835421 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[ &lt; ]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"> &nbsp; </td>
@@ -62,7 +62,7 @@ ul.no-bullet {list-style: none}
<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html
index def8e2958f..11a1b0daf3 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_abt.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -160,7 +160,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html
index e188df6c59..654918ae60 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/navigation_toc.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -58,11 +58,11 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Section-in-chapter" href="section.html#section">1.1 Section in chapter</a>
+ <li><a id="toc-Section-in-chapter" href="section.html">1.1 Section in chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Sub-section-in-section" href="subsection.html#subsection">1.1.1 Sub section in section</a></li>
+ <li><a id="toc-Sub-section-in-section" href="subsection.html">1.1.1 Sub section in section</a></li>
</ul></li>
</ul></li>
</ul>
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html
index 247e0ea901..d1d60d0411 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html
@@ -38,16 +38,16 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Next section in reading order"> &gt; </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[ &gt;&gt; ]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -109,7 +109,7 @@ ul.no-bullet {list-style: none}
b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsection.html#subsection">1.1.1 Sub section in section</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsection.html">1.1.1 Sub section in section</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html
index 1f1a8278ff..fc4a50a09f 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html
@@ -38,13 +38,13 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="section.html#section" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Previous section in reading order"> &lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="section.html#section" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Up section"> Up </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[ &gt; ]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl
index d024ad3cc5..779c3c2205 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_section'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_section'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_section'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section'}{'menu_child'};
$result_nodes{'navigation_section'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_section'};
$result_nodes{'navigation_section'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section'};
$result_nodes{'navigation_section'}{'node_next'} = $result_nodes{'navigation_section'}{'menu_child'};
-$result_nodes{'navigation_section'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_section'};
$result_menus{'navigation_section'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html
index 1950c75308..656cc9da37 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -57,9 +57,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html
index bdd807db30..7c2ee11f69 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html
@@ -36,7 +36,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -45,14 +45,14 @@ ul.no-bullet {list-style: none}
<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_abt.html
index 6dda0e2f19..5cf710a731 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_toc.html
index dbb41ef79d..0285c91379 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/navigation_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
<li><a id="toc-Section-in-chapter" href="section.html#section">1.1 Section in chapter</a>
<ul class="no-bullet">
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html
index 74077ef124..36c9bbc69b 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#subsection" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -84,7 +84,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<hr>
<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
@@ -93,7 +93,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -103,7 +103,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl
index a91d1cc813..66f839d8f7 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_section_no_header'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_section_no_header'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_no_header'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_section_no_header'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_no_header'}{'menu_child'};
$result_nodes{'navigation_section_no_header'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_section_no_header'};
$result_nodes{'navigation_section_no_header'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_no_header'};
$result_nodes{'navigation_section_no_header'}{'node_next'} = $result_nodes{'navigation_section_no_header'}{'menu_child'};
-$result_nodes{'navigation_section_no_header'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_section_no_header'};
$result_menus{'navigation_section_no_header'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html
index 915c355b96..f88772137d 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -53,9 +53,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html
index 2635c9fd92..70e8266547 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html
@@ -36,7 +36,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_abt.html
index 6dda0e2f19..5cf710a731 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html
index dbb41ef79d..0285c91379 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/navigation_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
<li><a id="toc-Section-in-chapter" href="section.html#section">1.1 Section in chapter</a>
<ul class="no-bullet">
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html
index 6b9a7e2b64..b97f241cc7 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#subsection" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -84,7 +84,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl
index 72bfd43fd1..77ef5b7d80 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_no_header_vertical'}{'menu_child'};
$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_section_no_header_vertical'};
$result_nodes{'navigation_section_no_header_vertical'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_no_header_vertical'};
$result_nodes{'navigation_section_no_header_vertical'}{'node_next'} = $result_nodes{'navigation_section_no_header_vertical'}{'menu_child'};
-$result_nodes{'navigation_section_no_header_vertical'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_section_no_header_vertical'};
$result_menus{'navigation_section_no_header_vertical'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
index 6b34dd0f4e..e0fe0b0e0f 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html
@@ -38,13 +38,13 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -91,9 +91,9 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
index f18b1d2bc8..6ada835421 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[ &lt; ]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"> &nbsp; </td>
@@ -62,7 +62,7 @@ ul.no-bullet {list-style: none}
<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_abt.html
index def8e2958f..11a1b0daf3 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_abt.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -160,7 +160,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html
index 02bcffe2ab..24e4f71c74 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/navigation_toc.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -58,7 +58,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
<li><a id="toc-Section-in-chapter" href="section.html#section">1.1 Section in chapter</a>
<ul class="no-bullet">
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html
index 2ea330bdef..8b048e9f78 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html
@@ -38,13 +38,13 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#subsection" title="Next section in reading order"> &gt; </a>]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -122,7 +122,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl
index d398f7a1be..8c1c385290 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_section_vertical'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_section_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_vertical'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_section_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_vertical'}{'menu_child'};
$result_nodes{'navigation_section_vertical'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_section_vertical'};
$result_nodes{'navigation_section_vertical'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_section_vertical'};
$result_nodes{'navigation_section_vertical'}{'node_next'} = $result_nodes{'navigation_section_vertical'}{'menu_child'};
-$result_nodes{'navigation_section_vertical'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_section_vertical'};
$result_menus{'navigation_section_vertical'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html
index 6b34dd0f4e..e0fe0b0e0f 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html
@@ -38,13 +38,13 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -91,9 +91,9 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html
index f18b1d2bc8..6ada835421 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[ &lt; ]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"> &nbsp; </td>
@@ -62,7 +62,7 @@ ul.no-bullet {list-style: none}
<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html
index def8e2958f..11a1b0daf3 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_abt.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -160,7 +160,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html
index 02bcffe2ab..24e4f71c74 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/navigation_toc.html
@@ -39,7 +39,7 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -58,7 +58,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
<li><a id="toc-Section-in-chapter" href="section.html#section">1.1 Section in chapter</a>
<ul class="no-bullet">
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html
index c60b3e4e9c..c1effe8cab 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html
@@ -38,13 +38,13 @@ ul.no-bullet {list-style: none}
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="#subsection" title="Next section in reading order"> &gt; </a>]</td>
@@ -65,7 +65,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
@@ -115,7 +115,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<hr>
<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
@@ -124,7 +124,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -137,7 +137,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl
index 0615d371ad..f7f88e7968 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl
@@ -1436,25 +1436,13 @@ $result_nodes{'navigation_vertical'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'navigation_vertical'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_vertical'}{'menu_child'}{'menu_child'};
$result_nodes{'navigation_vertical'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_vertical'}{'menu_child'};
$result_nodes{'navigation_vertical'}{'menu_child'}{'node_prev'} = $result_nodes{'navigation_vertical'};
$result_nodes{'navigation_vertical'}{'menu_child'}{'node_up'} = $result_nodes{'navigation_vertical'};
$result_nodes{'navigation_vertical'}{'node_next'} = $result_nodes{'navigation_vertical'}{'menu_child'};
-$result_nodes{'navigation_vertical'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'navigation_vertical'};
$result_menus{'navigation_vertical'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl
index f7ef1f1423..5b20fecb30 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl
+++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl
@@ -380,6 +380,7 @@ $result_trees{'no_monolithic'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -683,6 +684,7 @@ $result_sectioning{'no_monolithic'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
}
@@ -729,6 +731,7 @@ $result_nodes{'no_monolithic'} = {
'level' => 1,
'number' => 1
},
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
},
@@ -750,23 +753,11 @@ $result_nodes{'no_monolithic'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'no_monolithic'}{'menu_child'}{'node_prev'} = $result_nodes{'no_monolithic'};
$result_nodes{'no_monolithic'}{'menu_child'}{'node_up'} = $result_nodes{'no_monolithic'};
$result_nodes{'no_monolithic'}{'node_next'} = $result_nodes{'no_monolithic'}{'menu_child'};
-$result_nodes{'no_monolithic'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'no_monolithic'};
$result_menus{'no_monolithic'} = {
'cmdname' => 'node',
@@ -777,6 +768,7 @@ $result_menus{'no_monolithic'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
index 7169f29dcc..19fcee98b8 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html
@@ -49,7 +49,7 @@ ul.no-bullet {list-style: none}
<span id="index-top"></span>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#chapter">1 Chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#chapter" rel="index">1 Chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html
index ffefbbdb15..f8031a022f 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_fot.html
@@ -42,7 +42,7 @@ ul.no-bullet {list-style: none}
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="no_monolithic.html#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="no_monolithic.html#DOCF1">(1)</a></h3>
<p>my footnote</p>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html
index 0f0a37a22d..2842efa707 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html
@@ -44,7 +44,7 @@ ul.no-bullet {list-style: none}
<div class="shortcontents">
<ul class="no-bullet">
-<li><a id="stoc-Chapter" href="no_monolithic.html#chapter">1 Chapter</a></li>
+<li><a id="stoc-Chapter" href="no_monolithic.html#chapter" rel="index">1 Chapter</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html
index 36f2444f5d..687f3c306d 100644
--- a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic_toc.html
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter" href="no_monolithic.html#chapter">1 Chapter</a></li>
+ <li><a id="toc-Chapter" href="no_monolithic.html#chapter" rel="index">1 Chapter</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl b/macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl
index 47b758f91d..fba1138806 100644
--- a/macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl
+++ b/macros/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl
@@ -284,6 +284,7 @@ $result_trees{'backslash_in_arg'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -375,26 +376,16 @@ $result_sectioning{'backslash_in_arg'} = {};
$result_nodes{'backslash_in_arg'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'backslash_in_arg'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'backslash_in_arg'};
$result_menus{'backslash_in_arg'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl
index 14da5090cf..85e22fbacf 100644
--- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl
@@ -655,7 +655,7 @@ $result_trees{'macro_in_index_commands'} = {
'index_at_command' => 'codeidxindex',
'index_name' => 'codeidx',
'index_type_command' => 'codeidxindex',
- 'key' => 'a index entry te\' i^',
+ 'key' => "a index entry t\x{e9} \x{ee}",
'node' => {},
'number' => 1
},
@@ -861,6 +861,7 @@ $result_trees{'macro_in_index_commands'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1086,26 +1087,16 @@ $result_sectioning{'macro_in_index_commands'} = {};
$result_nodes{'macro_in_index_commands'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'macro_in_index_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'macro_in_index_commands'};
$result_menus{'macro_in_index_commands'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl
index 68cdb23f5c..f520f02c29 100644
--- a/macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl
@@ -4342,23 +4342,11 @@ $result_nodes{'macro_in_misc_commands'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'macro_in_misc_commands'}{'menu_child'}{'node_prev'} = $result_nodes{'macro_in_misc_commands'};
$result_nodes{'macro_in_misc_commands'}{'menu_child'}{'node_up'} = $result_nodes{'macro_in_misc_commands'};
$result_nodes{'macro_in_misc_commands'}{'node_next'} = $result_nodes{'macro_in_misc_commands'}{'menu_child'};
-$result_nodes{'macro_in_misc_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'macro_in_misc_commands'};
$result_menus{'macro_in_misc_commands'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl
index 68e84674f4..f1487d5348 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -775,21 +775,9 @@ $result_nodes{'block_commands_in_menu_description'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'block_commands_in_menu_description'}{'node_next'} = $result_nodes{'block_commands_in_menu_description'}{'menu_child'};
-$result_nodes{'block_commands_in_menu_description'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'block_commands_in_menu_description'};
$result_menus{'block_commands_in_menu_description'} = {
'cmdname' => 'node',
@@ -901,7 +889,7 @@ Text.
';
-$result_converted{'xml'}->{'block_commands_in_menu_description'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(manual)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'block_commands_in_menu_description'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(manual)</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl b/macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl
index e07e18a33a..d06b76b2cc 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl
@@ -381,23 +381,11 @@ $result_nodes{'comment_on_menu_line'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'comment_on_menu_line'}{'menu_child'}{'node_prev'} = $result_nodes{'comment_on_menu_line'};
$result_nodes{'comment_on_menu_line'}{'menu_child'}{'node_up'} = $result_nodes{'comment_on_menu_line'};
$result_nodes{'comment_on_menu_line'}{'node_next'} = $result_nodes{'comment_on_menu_line'}{'menu_child'};
-$result_nodes{'comment_on_menu_line'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'comment_on_menu_line'};
$result_menus{'comment_on_menu_line'} = {
'cmdname' => 'node',
@@ -470,7 +458,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
</div>
<table class="menu" border="0" cellspacing="0">
@@ -504,7 +492,7 @@ $result_converted_errors{'html'}->{'comment_on_menu_line'} = [
-$result_converted{'xml'}->{'comment_on_menu_line'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">first</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'comment_on_menu_line'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">first</nodenext></node>
<menu spaces=" " endspaces=" "><!-- c -->
<menuentry leadingtext="* "><menunode separator="::">first</menunode><menudescription><pre xml:space="preserve">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl
index 983552683c..6573577154 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -1792,18 +1792,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'detailmenu_on_subnodes'}{'menu_child'};
$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'menu_child'};
@@ -1814,7 +1803,6 @@ $result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_next'}{'node_up'} =
$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_prev'} = $result_nodes{'detailmenu_on_subnodes'};
$result_nodes{'detailmenu_on_subnodes'}{'menu_child'}{'node_up'} = $result_nodes{'detailmenu_on_subnodes'};
$result_nodes{'detailmenu_on_subnodes'}{'node_next'} = $result_nodes{'detailmenu_on_subnodes'}{'menu_child'};
-$result_nodes{'detailmenu_on_subnodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'detailmenu_on_subnodes'};
$result_menus{'detailmenu_on_subnodes'} = {
'cmdname' => 'node',
@@ -1971,7 +1959,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -2049,7 +2037,7 @@ Previous: <a href="#section-chap-2" accesskey="p" rel="prev">section chap 2</a>,
';
-$result_converted{'xml'}->{'detailmenu_on_subnodes'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'detailmenu_on_subnodes'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl
index 188efd99d1..7eb0a54639 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -292,20 +292,8 @@ $result_nodes{'detailmenu_unknown_node'} = {
}
}
}
- ],
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ ]
};
-$result_nodes{'detailmenu_unknown_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'detailmenu_unknown_node'};
$result_menus{'detailmenu_unknown_node'} = {
'cmdname' => 'node',
@@ -395,7 +383,7 @@ $result_converted_errors{'html'}->{'detailmenu_unknown_node'} = [
-$result_converted{'xml'}->{'detailmenu_unknown_node'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'detailmenu_unknown_node'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<menu endspaces=" ">
<detailmenu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl b/macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl
index 1b1ca8fb99..1fd8ab91b6 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -339,20 +339,8 @@ $result_nodes{'direntry_dircategory_after_first_node'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'direntry_dircategory_after_first_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'direntry_dircategory_after_first_node'};
$result_menus{'direntry_dircategory_after_first_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl b/macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl
index 58025b785c..b1acb5ef06 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl
@@ -400,21 +400,9 @@ $result_nodes{'empty_menu_entry_name'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'empty_menu_entry_name'}{'node_next'} = $result_nodes{'empty_menu_entry_name'}{'menu_child'};
-$result_nodes{'empty_menu_entry_name'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'empty_menu_entry_name'};
$result_menus{'empty_menu_entry_name'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl b/macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl
index 400a562fbe..66f2e01ef3 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl
@@ -742,25 +742,13 @@ $result_nodes{'entry_after_detailmenu'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'entry_after_detailmenu'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'entry_after_detailmenu'}{'menu_child'};
$result_nodes{'entry_after_detailmenu'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'entry_after_detailmenu'};
$result_nodes{'entry_after_detailmenu'}{'menu_child'}{'node_prev'} = $result_nodes{'entry_after_detailmenu'};
$result_nodes{'entry_after_detailmenu'}{'menu_child'}{'node_up'} = $result_nodes{'entry_after_detailmenu'};
$result_nodes{'entry_after_detailmenu'}{'node_next'} = $result_nodes{'entry_after_detailmenu'}{'menu_child'};
-$result_nodes{'entry_after_detailmenu'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'entry_after_detailmenu'};
$result_menus{'entry_after_detailmenu'} = {
'cmdname' => 'node',
@@ -851,7 +839,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
@@ -903,7 +891,7 @@ $result_converted_errors{'html'}->{'entry_after_detailmenu'} = [
-$result_converted{'xml'}->{'entry_after_detailmenu'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">first</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'entry_after_detailmenu'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">first</nodenext></node>
<menu endspaces=" ">
<detailmenu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl
index e432e9ebe7..f377016974 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl
@@ -429,21 +429,9 @@ $result_nodes{'example_in_menu_description'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'example_in_menu_description'}{'node_next'} = $result_nodes{'example_in_menu_description'}{'menu_child'};
-$result_nodes{'example_in_menu_description'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'example_in_menu_description'};
$result_menus{'example_in_menu_description'} = {
'cmdname' => 'node',
@@ -536,7 +524,7 @@ example
';
-$result_converted{'xml'}->{'example_in_menu_description'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(manual)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'example_in_menu_description'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(manual)</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl
index 806397ddd9..71f4992db2 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl
@@ -957,21 +957,9 @@ $result_nodes{'formats_in_menu'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'formats_in_menu'}{'node_next'} = $result_nodes{'formats_in_menu'}{'menu_child'};
-$result_nodes{'formats_in_menu'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'formats_in_menu'};
$result_menus{'formats_in_menu'} = {
'cmdname' => 'node',
@@ -1101,7 +1089,7 @@ $result_converted_errors{'html'}->{'formats_in_menu'} = [
-$result_converted{'xml'}->{'formats_in_menu'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(gcc)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'formats_in_menu'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(gcc)</nodenext></node>
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator=":: ">(gcc)</menunode><menudescription><pre xml:space="preserve">text
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl
index 8055848043..67d08eafda 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -402,21 +402,9 @@ $result_nodes{'inlineraw_in_menu_description'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'inlineraw_in_menu_description'}{'node_next'} = $result_nodes{'inlineraw_in_menu_description'}{'menu_child'};
-$result_nodes{'inlineraw_in_menu_description'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'inlineraw_in_menu_description'};
$result_menus{'inlineraw_in_menu_description'} = {
'cmdname' => 'node',
@@ -505,7 +493,7 @@ end inlineraw
';
-$result_converted{'xml'}->{'inlineraw_in_menu_description'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(manual)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'inlineraw_in_menu_description'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(manual)</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl b/macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl
index 24f0787230..7423001967 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -777,21 +777,9 @@ $result_nodes{'invalid_info_menu_entry'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'invalid_info_menu_entry'}{'node_next'} = $result_nodes{'invalid_info_menu_entry'}{'menu_child'};
-$result_nodes{'invalid_info_menu_entry'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'invalid_info_menu_entry'};
$result_menus{'invalid_info_menu_entry'} = {
'cmdname' => 'node',
@@ -942,7 +930,7 @@ $result_converted_errors{'html'}->{'invalid_info_menu_entry'} = [
-$result_converted{'xml'}->{'invalid_info_menu_entry'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(f)<asis>a:</asis></nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'invalid_info_menu_entry'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(f)<asis>a:</asis></nodenext></node>
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator="::">(f)<asis>a:</asis></menunode><menudescription><pre xml:space="preserve">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl
index f82076b49e..c6544490f8 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl
@@ -382,20 +382,8 @@ $result_nodes{'menu_in_deffn'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'menu_in_deffn'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'menu_in_deffn'};
$result_menus{'menu_in_deffn'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl
index 5329bd0e8c..8c4a470d8f 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl
@@ -685,20 +685,8 @@ $result_nodes{'menu_in_example'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'menu_in_example'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'menu_in_example'};
$result_menus{'menu_in_example'} = {
'cmdname' => 'node',
@@ -809,7 +797,7 @@ $result_converted_errors{'html'}->{'menu_in_example'} = [
-$result_converted{'xml'}->{'menu_in_example'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'menu_in_example'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<example endspaces=" ">
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl
index 3b1afd26a0..f1217165ee 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -374,22 +374,10 @@ $result_nodes{'menu_pointing_to_anchor'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'menu_pointing_to_anchor'}{'menu_child'}{'node_prev'} = $result_nodes{'menu_pointing_to_anchor'};
$result_nodes{'menu_pointing_to_anchor'}{'node_next'} = $result_nodes{'menu_pointing_to_anchor'}{'menu_child'};
-$result_nodes{'menu_pointing_to_anchor'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'menu_pointing_to_anchor'};
$result_menus{'menu_pointing_to_anchor'} = {
'cmdname' => 'node',
@@ -478,7 +466,7 @@ ul.no-bullet {list-style: none}
';
-$result_converted{'xml'}->{'menu_pointing_to_anchor'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">An anchor</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'menu_pointing_to_anchor'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">An anchor</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<para>Text
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl
index 6198a3aeef..8dda68b5a9 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl
@@ -316,23 +316,11 @@ $result_nodes{'menu_title_before_entries'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'menu_title_before_entries'}{'menu_child'}{'node_prev'} = $result_nodes{'menu_title_before_entries'};
$result_nodes{'menu_title_before_entries'}{'menu_child'}{'node_up'} = $result_nodes{'menu_title_before_entries'};
$result_nodes{'menu_title_before_entries'}{'node_next'} = $result_nodes{'menu_title_before_entries'}{'menu_child'};
-$result_nodes{'menu_title_before_entries'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'menu_title_before_entries'};
$result_menus{'menu_title_before_entries'} = {
'cmdname' => 'node',
@@ -403,7 +391,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#subnode" accesskey="n" rel="next">subnode</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#subnode" accesskey="n" rel="next">subnode</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
@@ -438,7 +426,7 @@ $result_converted_errors{'html'}->{'menu_title_before_entries'} = [
-$result_converted{'xml'}->{'menu_title_before_entries'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">subnode</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'menu_title_before_entries'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">subnode</nodenext></node>
<menu endspaces=" ">
<menucomment><pre xml:space="preserve">Horizontal space
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl b/macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl
index a36f9af833..218a83ab73 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl
@@ -432,21 +432,9 @@ $result_nodes{'multiple_menus'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'multiple_menus'}{'node_next'} = $result_nodes{'multiple_menus'}{'menu_child'};
-$result_nodes{'multiple_menus'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'multiple_menus'};
$result_menus{'multiple_menus'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl
index 40ff5943d4..4f3eb9913f 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl
@@ -183,20 +183,8 @@ $result_nodes{'no_colon_in_menu'} = {
}
}
}
- ],
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ ]
};
-$result_nodes{'no_colon_in_menu'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'no_colon_in_menu'};
$result_menus{'no_colon_in_menu'} = {
'cmdname' => 'node',
@@ -275,7 +263,7 @@ $result_converted_errors{'html'}->{'no_colon_in_menu'} = [
-$result_converted{'xml'}->{'no_colon_in_menu'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'no_colon_in_menu'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<menu endspaces=" ">
<menucomment><pre xml:space="preserve">* a
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl b/macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl
index dab886e58a..770a73cbdb 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl
@@ -259,21 +259,9 @@ $result_nodes{'reference_to_external_manual'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'reference_to_external_manual'}{'node_next'} = $result_nodes{'reference_to_external_manual'}{'menu_child'};
-$result_nodes{'reference_to_external_manual'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'reference_to_external_manual'};
$result_menus{'reference_to_external_manual'} = {
'cmdname' => 'node',
@@ -364,7 +352,7 @@ $result_converted_errors{'html'}->{'reference_to_external_manual'} = [
$result_converted{'xml'}->{'reference_to_external_manual'} = '
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(info)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(info)</nodenext></node>
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator="::">(info)</menunode><menudescription><pre xml:space="preserve">
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl
index a241404652..30622092ad 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl
@@ -1028,23 +1028,11 @@ $result_nodes{'sc_in_menu'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'sc_in_menu'}{'menu_child'}{'node_prev'} = $result_nodes{'sc_in_menu'};
$result_nodes{'sc_in_menu'}{'menu_child'}{'node_up'} = $result_nodes{'sc_in_menu'};
$result_nodes{'sc_in_menu'}{'node_next'} = $result_nodes{'sc_in_menu'}{'menu_child'};
-$result_nodes{'sc_in_menu'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'sc_in_menu'};
$result_menus{'sc_in_menu'} = {
'cmdname' => 'node',
@@ -1137,7 +1125,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#NODE" accesskey="n" rel="next"><small>NODE</small></a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#NODE" accesskey="n" rel="next"><small>NODE</small></a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
@@ -1191,7 +1179,7 @@ $result_converted_errors{'html'}->{'sc_in_menu'} = [
$result_converted{'xml'}->{'sc_in_menu'} = '
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on"><sc>node</sc></nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on"><sc>node</sc></nodenext></node>
<menu endspaces=" ">
<menuentry leadingtext="* "><menutitle separator=":"><sc>value</sc></menutitle><menunode separator=". "><sc>node</sc></menunode><menudescription><pre xml:space="preserve"><sc>descrip tion</sc>
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl
index 6e280ef81f..f58d88bfc9 100644
--- a/macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl
+++ b/macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl
@@ -384,21 +384,9 @@ $result_nodes{'verb_in_menu_description'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'verb_in_menu_description'}{'node_next'} = $result_nodes{'verb_in_menu_description'}{'menu_child'};
-$result_nodes{'verb_in_menu_description'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'verb_in_menu_description'};
$result_menus{'verb_in_menu_description'} = {
'cmdname' => 'node',
@@ -489,7 +477,7 @@ ul.no-bullet {list-style: none}
';
-$result_converted{'xml'}->{'verb_in_menu_description'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(manual)</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'verb_in_menu_description'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">(manual)</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl b/macros/texinfo/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index bb1a448924..ab90986e0c 100644
--- a/macros/texinfo/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/macros/texinfo/texinfo/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5007,20 +5007,8 @@ $result_nodes{'codequoteundirected_codequotebacktick'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'codequoteundirected_codequotebacktick'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'codequoteundirected_codequotebacktick'};
$result_menus{'codequoteundirected_codequotebacktick'} = {
'cmdname' => 'node',
@@ -5092,72 +5080,72 @@ $result_errors{'codequoteundirected_codequotebacktick'} = [
$result_converted{'plaintext'}->{'codequoteundirected_codequotebacktick'} = 'test quotes
***********
-"simple-double-three--four---" \'simple\' quotedblleft: ``
-code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-asis: "simple-double-three--four---" \'simple\' quotedblleft: ``
-strong: *"simple-double-three--four---" \'simple\' quotedblleft: ``*
-kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+"simple-double-three--four---" \'simple\' quotedblleft: “
+code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
+asis: "simple-double-three--four---" \'simple\' quotedblleft: “
+strong: *"simple-double-three--four---" \'simple\' quotedblleft: “*
+kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
+samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
@codequoteundirected on
@codequotebacktick on
- "simple-double-three--four---" \'simple\' quotedblleft: ``
-code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-asis: "simple-double-three--four---" \'simple\' quotedblleft: ``
-strong: *"simple-double-three--four---" \'simple\' quotedblleft: ``*
-kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+ "simple-double-three--four---" \'simple\' quotedblleft: “
+code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
+asis: "simple-double-three--four---" \'simple\' quotedblleft: “
+strong: *"simple-double-three--four---" \'simple\' quotedblleft: “*
+kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
+samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
@codequoteundirected off
@codequotebacktick off
- "simple-double-three--four---" \'simple\' quotedblleft: ``
-code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-asis: "simple-double-three--four---" \'simple\' quotedblleft: ``
-strong: *"simple-double-three--four---" \'simple\' quotedblleft: ``*
-kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
-samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+ "simple-double-three--four---" \'simple\' quotedblleft: “
+code: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
+asis: "simple-double-three--four---" \'simple\' quotedblleft: “
+strong: *"simple-double-three--four---" \'simple\' quotedblleft: “*
+kbd: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
+samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
- ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- code: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ code: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: ``*
+ strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: “*
- kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+ samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
@codequoteundirected on
@codequotebacktick on
- ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- code: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ code: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: ``*
+ strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: “*
- kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+ samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
@codequoteundirected off
@codequotebacktick off
- ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- code: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ code: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: ``*
+ strong: *``simple-double--three---four----\'\' `simple\' quotedblleft: “*
- kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: ``
+ kbd: ``simple-double--three---four----\'\' `simple\' quotedblleft: “
- samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: ``\'
+ samp: \'``simple-double--three---four----\'\' `simple\' quotedblleft: “\'
';
diff --git a/macros/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl b/macros/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl
index cc4d3e3607..3f2421d676 100644
--- a/macros/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/macros/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -104,6 +104,7 @@ $result_trees{'comment_space_command_on_line'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -730,6 +731,7 @@ $result_sectioning{'comment_space_command_on_line'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -753,26 +755,16 @@ $result_nodes{'comment_space_command_on_line'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'comment_space_command_on_line'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'comment_space_command_on_line'};
$result_menus{'comment_space_command_on_line'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -914,12 +906,17 @@ Node: Top27
Ref: label204

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted{'xml'}->{'comment_space_command_on_line'} = '<settitle spaces=" ">Settitle <spacecmd type="spc"/></settitle><!-- c settittle -->
-<node name="Top" spaces=" "><nodename trailingspaces=" ">Top</nodename><nodeup automatic="on">(dir)</nodeup></node><!-- comment @node Top -->
+<node name="Top" spaces=" "><nodename trailingspaces=" ">Top</nodename></node><!-- comment @node Top -->
<top spaces=" "><sectiontitle>top element<spacecmd type="spc"/> </sectiontitle><!-- comment @top -->
<frenchspacing value="on" line="on @c comment frenchspacing"></frenchspacing><!-- c comment frenchspacing -->
diff --git a/macros/texinfo/texinfo/tp/t/results/misc_commands/footnote_in_center.pl b/macros/texinfo/texinfo/tp/t/results/misc_commands/footnote_in_center.pl
index d8e02af138..7368f059c9 100644
--- a/macros/texinfo/texinfo/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/macros/texinfo/texinfo/tp/t/results/misc_commands/footnote_in_center.pl
@@ -326,7 +326,7 @@ $result_converted{'html_text'}->{'footnote_in_center'} = '<div align="center">Ce
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>This footnote
shows an important feature of the centered text.
</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/misc_commands/ref_in_center.pl b/macros/texinfo/texinfo/tp/t/results/misc_commands/ref_in_center.pl
index a017fadeb6..b8dd3b05e7 100644
--- a/macros/texinfo/texinfo/tp/t/results/misc_commands/ref_in_center.pl
+++ b/macros/texinfo/texinfo/tp/t/results/misc_commands/ref_in_center.pl
@@ -238,20 +238,8 @@ $result_nodes{'ref_in_center'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'ref_in_center'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_in_center'};
$result_menus{'ref_in_center'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/misc_commands/setfilename.pl b/macros/texinfo/texinfo/tp/t/results/misc_commands/setfilename.pl
index a5c81ff91f..eaedbb4e34 100644
--- a/macros/texinfo/texinfo/tp/t/results/misc_commands/setfilename.pl
+++ b/macros/texinfo/texinfo/tp/t/results/misc_commands/setfilename.pl
@@ -293,6 +293,11 @@ $result_converted{'info'}->{'setfilename'} = 'This is file_comment, produced fro
Tag Table:

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'setfilename'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl b/macros/texinfo/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 9d92d6db36..eaec05ffa3 100644
--- a/macros/texinfo/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/macros/texinfo/texinfo/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2580,20 +2580,8 @@ $result_nodes{'test_allowcodebreaks'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'test_allowcodebreaks'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'test_allowcodebreaks'};
$result_menus{'test_allowcodebreaks'} = {
'cmdname' => 'node',
@@ -2609,25 +2597,25 @@ $result_errors{'test_allowcodebreaks'} = [];
$result_converted{'plaintext'}->{'test_allowcodebreaks'} = 'Before first allowcodebreaks Out of code -- out-of-code. \'1aaa\' \'2aaa-\'
\'-3bbb\' \'4aaa-bbb\' \' 5aaa-bb\' \'6aaa-bb \' \'ccc 7aaa-bbb\' \'ccc 8aaa-bbb
-ddd\' \'9aaa-bbb rrr_vv\' \'fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
+ddd\' \'9aaa-bbb rrr_vv\' \'fff-- --- minus-b aa-ttéff_gg aar-oman anc-hor\'
in-example
After false Out of code -- out-of-code. \'1aaa\' \'2aaa-\' \'-3bbb\'
\'4aaa-bbb\' \' 5aaa-bb\' \'6aaa-bb \' \'ccc 7aaa-bbb\' \'ccc 8aaa-bbb ddd\'
-\'9aaa-bbb rrr_vv\' \'fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
+\'9aaa-bbb rrr_vv\' \'fff-- --- minus-b aa-ttéff_gg aar-oman anc-hor\'
in-example
In w:
-Out of code -- out-of-code. \'1aaa\' \'2aaa-\' \'-3bbb\' \'4aaa-bbb\' \' 5aaa-bb\' \'6aaa-bb \' \'ccc 7aaa-bbb\' \'ccc 8aaa-bbb ddd\' \'9aaa-bbb rrr_vv\' \'fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor
+Out of code -- out-of-code. \'1aaa\' \'2aaa-\' \'-3bbb\' \'4aaa-bbb\' \' 5aaa-bb\' \'6aaa-bb \' \'ccc 7aaa-bbb\' \'ccc 8aaa-bbb ddd\' \'9aaa-bbb rrr_vv\' \'fff-- --- minus-b aa-ttéff_gg aar-oman anc-hor
\'
in-example
After true Out of code -- out-of-code. \'1aaa\' \'2aaa-\' \'-3bbb\'
\'4aaa-bbb\' \' 5aaa-bb\' \'6aaa-bb \' \'ccc 7aaa-bbb\' \'ccc 8aaa-bbb ddd\'
-\'9aaa-bbb rrr_vv\' \'fff-- --- minus-b aa-tte\'ff_gg aar-oman anc-hor\'
+\'9aaa-bbb rrr_vv\' \'fff-- --- minus-b aa-ttéff_gg aar-oman anc-hor\'
in-example
';
diff --git a/macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl b/macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl
index afb1cef2bf..3f780127c2 100644
--- a/macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl
+++ b/macros/texinfo/texinfo/tp/t/results/morecoverage/formatting_fr.pl
@@ -516,6 +516,7 @@ $result_trees{'formatting_fr'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3303,6 +3304,7 @@ $result_trees{'formatting_fr'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -4241,6 +4243,7 @@ $result_sectioning{'formatting_fr'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -4344,6 +4347,7 @@ $result_sectioning{'formatting_fr'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter2',
'spaces_before_argument' => ' '
}
@@ -4385,6 +4389,7 @@ $result_nodes{'formatting_fr'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -4412,6 +4417,7 @@ $result_nodes{'formatting_fr'} = {
},
'level' => 1
},
+ 'isindex' => 1,
'normalized' => 'chapter2',
'spaces_before_argument' => ' '
},
@@ -4436,29 +4442,18 @@ $result_nodes{'formatting_fr'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'formatting_fr'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'formatting_fr'}{'menu_child'};
$result_nodes{'formatting_fr'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'formatting_fr'};
$result_nodes{'formatting_fr'}{'menu_child'}{'node_prev'} = $result_nodes{'formatting_fr'};
$result_nodes{'formatting_fr'}{'menu_child'}{'node_up'} = $result_nodes{'formatting_fr'};
$result_nodes{'formatting_fr'}{'node_next'} = $result_nodes{'formatting_fr'}{'menu_child'};
-$result_nodes{'formatting_fr'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'formatting_fr'};
$result_menus{'formatting_fr'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -4471,6 +4466,7 @@ $result_menus{'formatting_fr'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter2',
'spaces_before_argument' => ' '
},
@@ -4624,11 +4620,11 @@ $result_errors{'formatting_fr'} = [
$result_converted{'info'}->{'formatting_fr'} = 'This is formatting.info, produced from formatting.texi.
In copying
-INFO-DIR-SECTION Formatting e\' \'@ TeX\' test
+INFO-DIR-SECTION Formatting é \'@ TeX\' test
START-INFO-DIR-ENTRY
* Truc: (formatting). The GNU documentation truc.
-* \'@ e\' ==\': (formatting). "-- something"
- \'cmd\' a`
+* \'@ é ==\': (formatting). "-- something"
+ \'cmd\' à
END-INFO-DIR-ENTRY

@@ -4780,6 +4776,11 @@ Node: subsubsection three---four----\'\'2194
Node: chapter22366

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'formatting_fr'} = [
@@ -4861,7 +4862,7 @@ ul.no-bullet {list-style: none}
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl b/macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl
index cb9931704a..2f1afabbf3 100644
--- a/macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl
+++ b/macros/texinfo/texinfo/tp/t/results/morecoverage/texi_formatting.pl
@@ -516,6 +516,7 @@ $result_trees{'texi_formatting'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3303,6 +3304,7 @@ $result_trees{'texi_formatting'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -4241,6 +4243,7 @@ $result_sectioning{'texi_formatting'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -4344,6 +4347,7 @@ $result_sectioning{'texi_formatting'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter2',
'spaces_before_argument' => ' '
}
@@ -4385,6 +4389,7 @@ $result_nodes{'texi_formatting'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -4412,6 +4417,7 @@ $result_nodes{'texi_formatting'} = {
},
'level' => 1
},
+ 'isindex' => 1,
'normalized' => 'chapter2',
'spaces_before_argument' => ' '
},
@@ -4436,29 +4442,18 @@ $result_nodes{'texi_formatting'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'texi_formatting'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'texi_formatting'}{'menu_child'};
$result_nodes{'texi_formatting'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'texi_formatting'};
$result_nodes{'texi_formatting'}{'menu_child'}{'node_prev'} = $result_nodes{'texi_formatting'};
$result_nodes{'texi_formatting'}{'menu_child'}{'node_up'} = $result_nodes{'texi_formatting'};
$result_nodes{'texi_formatting'}{'node_next'} = $result_nodes{'texi_formatting'}{'menu_child'};
-$result_nodes{'texi_formatting'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'texi_formatting'};
$result_menus{'texi_formatting'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -4471,6 +4466,7 @@ $result_menus{'texi_formatting'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter2',
'spaces_before_argument' => ' '
},
@@ -4624,11 +4620,11 @@ $result_errors{'texi_formatting'} = [
$result_converted{'info'}->{'texi_formatting'} = 'This is formatting.info, produced from formatting.texi.
In copying
-INFO-DIR-SECTION Formatting e\' \'@ TeX\' test
+INFO-DIR-SECTION Formatting é \'@ TeX\' test
START-INFO-DIR-ENTRY
* Truc: (formatting). The GNU documentation truc.
-* \'@ e\' ==\': (formatting). "-- something"
- \'cmd\' a`
+* \'@ é ==\': (formatting). "-- something"
+ \'cmd\' à
END-INFO-DIR-ENTRY

@@ -4780,6 +4776,11 @@ Node: subsubsection three---four----\'\'2194
Node: chapter22366

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'texi_formatting'} = [
@@ -4838,7 +4839,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<span id="Top-section"></span><h1 class="top">Top section</h1>
@@ -4849,7 +4850,7 @@ Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.
Menu comment
-</pre></th></tr><tr><td align="left" valign="top">&bull; <a href="#chapter2" accesskey="2">description</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top">&bull; <a href="#chapter2" rel="index" accesskey="2">description</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
@@ -5138,7 +5139,7 @@ Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
@@ -5148,7 +5149,7 @@ Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="
<div class="shortcontents">
<ul class="no-bullet">
<li><a id="stoc-chapter-1" href="#toc-chapter-1">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#toc-chapter-2">chapter 2</a></li>
+<li><a id="stoc-chapter-2" href="#toc-chapter-2" rel="index">chapter 2</a></li>
</ul>
</div>
@@ -5156,7 +5157,7 @@ Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry.pl b/macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry.pl
index 558251ded4..3ca5e488be 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry.pl
@@ -429,6 +429,7 @@ $result_trees{'double_index_entry'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -574,6 +575,7 @@ $result_nodes{'double_index_entry'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'other-node',
'spaces_before_argument' => ' '
},
@@ -595,23 +597,11 @@ $result_nodes{'double_index_entry'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'double_index_entry'}{'menu_child'}{'node_prev'} = $result_nodes{'double_index_entry'};
$result_nodes{'double_index_entry'}{'menu_child'}{'node_up'} = $result_nodes{'double_index_entry'};
$result_nodes{'double_index_entry'}{'node_next'} = $result_nodes{'double_index_entry'}{'menu_child'};
-$result_nodes{'double_index_entry'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'double_index_entry'};
$result_menus{'double_index_entry'} = {
'cmdname' => 'node',
@@ -622,6 +612,7 @@ $result_menus{'double_index_entry'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'other-node',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html b/macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
index 4063d2a262..24c34147dd 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/double_index_entry/res_html/double_index_entry.html
@@ -41,7 +41,7 @@ ul.no-bullet {list-style: none}
<span id="index-aaa-1"></span>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#other-node">other node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#other-node" rel="index">other node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
index e90f6c1e56..a4ecc2be98 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter-2.html
@@ -34,8 +34,8 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Chapter-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Previous section in reading order"> &lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[ Up ]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index.html#top-section" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="chapter">2 Chapter 2</h1>
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
</p>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
@@ -63,7 +63,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index.html#top-section" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
index 69a58887c8..35278c9600 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/Chapter.html
@@ -37,15 +37,15 @@ ul.no-bullet {list-style: none}
<tr><td valign="middle" align="left">[<a href="index.html#top-section" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="index.html#second" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[ Up ]</td>
-<td valign="middle" align="left">[<a href="Chapter-2.html#Chapter-2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter-2.html#Chapter-2" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter-2.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter-2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index.html#top-section" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="chapter">1 Chapter</h1>
@@ -79,11 +79,11 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="index.html#index-top-section-4">top section</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a href="index.html#index-top-section-5">top section</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a href="index.html#index-top-section1">top section1</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#top-section">top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-truc">truc</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-truc">truc</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Chapter_cp_letter-U">U</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered">unnumbered</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered-after-text">unnumbered after text</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered">unnumbered</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered-after-text">unnumbered after text</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Chapter_cp_letter-C"><b>C</b></a>
@@ -101,7 +101,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="index.html#top-section" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter-2.html#Chapter-2" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter-2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
@@ -109,7 +109,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index.html#top-section" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index.html
index 803b806e74..b53fd44027 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index.html
@@ -34,11 +34,11 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="top-section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Previous section in reading order"> &lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="unnumbered.html" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#second" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="unnumbered">top section</h1>
@@ -64,8 +64,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-S">S</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-second">second</a></td><td>&nbsp;</td><td valign="top"><a href="#second">second</a></td></tr>
@@ -79,11 +79,11 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-top-section-4">top section</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-top-section-5">top section</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-top-section1">top section1</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-truc">truc</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-truc">truc</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-U">U</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered">unnumbered</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered-after-text">unnumbered after text</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered">unnumbered</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered-after-text">unnumbered after text</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#top-section_cp_letter-C"><b>C</b></a>
@@ -104,15 +104,15 @@ ul.no-bullet {list-style: none}
<tr><td valign="middle" align="left">[<a href="#top-section" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#top-section" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#top-section" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="#top-section" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h2 class="section">second</h2>
@@ -130,8 +130,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_cp_letter-S">S</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-second">second</a></td><td>&nbsp;</td><td valign="top"><a href="#second">second</a></td></tr>
@@ -145,11 +145,11 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-top-section-4">top section</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-top-section-5">top section</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-top-section1">top section1</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-truc">truc</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-truc">truc</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_cp_letter-U">U</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered">unnumbered</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered-after-text">unnumbered after text</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered">unnumbered</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered-after-text">unnumbered after text</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#second_cp_letter-C"><b>C</b></a>
@@ -178,8 +178,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_cp_letter-S">S</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-second">second</a></td><td>&nbsp;</td><td valign="top"><a href="#second">second</a></td></tr>
@@ -193,11 +193,11 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-top-section-4">top section</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-top-section-5">top section</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-top-section1">top section1</a></td><td>&nbsp;</td><td valign="top"><a href="#top-section">top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-truc">truc</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-truc">truc</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_cp_letter-U">U</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered">unnumbered</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
-<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered-after-text">unnumbered after text</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered">unnumbered</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a href="unnumbered.html#index-unnumbered-after-text">unnumbered after text</a></td><td>&nbsp;</td><td valign="top"><a href="unnumbered.html">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#second_cp_letter-C"><b>C</b></a>
@@ -212,7 +212,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#top-section" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
@@ -220,7 +220,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="#top-section" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_no_node_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html
index 59d2a91687..e183f95d98 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/index_no_node_abt.html
@@ -37,7 +37,7 @@ ul.no-bullet {list-style: none}
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="index.html#top-section" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -146,7 +146,7 @@ ul.no-bullet {list-style: none}
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="index.html#top-section" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="unnumbered.html#unnumbered" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="unnumbered.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
index 7f60f13f54..4df135d848 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_no_node/res_html/unnumbered.html
@@ -49,8 +49,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="unnumbered_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="unnumbered_cp_letter-S">S</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="index.html#index-second">second</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#second">second</a></td></tr>
@@ -116,8 +116,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="unnumbered_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-chapter">chapter</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-Chapter2">Chapter2</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="unnumbered_cp_letter-S">S</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="index.html#index-second">second</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#second">second</a></td></tr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split.pl b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split.pl
index 6c61cfd7dc..54ca525f35 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split.pl
@@ -92,6 +92,7 @@ $result_trees{'index_split'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -876,6 +877,7 @@ $result_trees{'index_split'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1477,6 +1479,7 @@ $result_trees{'index_split'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1963,6 +1966,7 @@ $result_trees{'index_split'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2282,6 +2286,7 @@ $result_trees{'index_split'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2838,6 +2843,7 @@ $result_trees{'index_split'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3771,6 +3777,7 @@ $result_sectioning{'index_split'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3785,6 +3792,7 @@ $result_sectioning{'index_split'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
}
@@ -3800,6 +3808,7 @@ $result_sectioning{'index_split'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'section-1',
'spaces_before_argument' => ' '
}
@@ -3831,6 +3840,7 @@ $result_sectioning{'index_split'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'subsection-2',
'spaces_before_argument' => ' '
}
@@ -3868,6 +3878,7 @@ $result_sectioning{'index_split'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'section-3',
'spaces_before_argument' => ' '
}
@@ -3935,6 +3946,7 @@ $result_nodes{'index_split'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -3955,27 +3967,16 @@ $result_nodes{'index_split'} = {
}
],
'node_next' => {},
- 'node_prev' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_prev' => {}
};
$result_nodes{'index_split'}{'menu_child'} = $result_nodes{'index_split'};
$result_nodes{'index_split'}{'node_next'} = $result_nodes{'index_split'};
$result_nodes{'index_split'}{'node_prev'} = $result_nodes{'index_split'};
-$result_nodes{'index_split'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_split'};
$result_menus{'index_split'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -3983,12 +3984,14 @@ $result_menus{'index_split'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'section-1',
'spaces_before_argument' => ' '
},
@@ -4001,6 +4004,7 @@ $result_menus{'index_split'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'subsection-2',
'spaces_before_argument' => ' '
},
@@ -4024,6 +4028,7 @@ $result_menus{'index_split'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'section-3',
'spaces_before_argument' => ' '
},
@@ -4036,6 +4041,7 @@ $result_menus{'index_split'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node-2-in-section-3',
'spaces_before_argument' => ' '
},
@@ -4126,15 +4132,6 @@ $result_menus{'index_split'}{'menu_up'} = $result_menus{'index_split'};
$result_errors{'index_split'} = [
{
- 'error_line' => 'index_split.texi:5: warning: for `Top\', up in menu `Top\' and up `(dir)\' don\'t match
-',
- 'file_name' => 'index_split.texi',
- 'line_nr' => 5,
- 'macro' => '',
- 'text' => 'for `Top\', up in menu `Top\' and up `(dir)\' don\'t match',
- 'type' => 'warning'
- },
- {
'error_line' => 'index_split.texi:23: warning: node `Top\' is prev for `first\' in menu but not in sectioning
',
'file_name' => 'index_split.texi',
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/first.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/first.html
index 849fb135d6..3a008ff8d9 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/first.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/first.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#section-1" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
@@ -86,7 +86,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#section-3">1.3 Section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="First-chapter_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">split indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">split indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
@@ -158,15 +158,15 @@ ul.no-bullet {list-style: none}
<span id="index-somewhere"></span>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#section-1">1.1 Section 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#section-1" rel="index">1.1 Section 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top"><a href="#section-2">1.2 Section 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="#section-3">1.3 Section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#section-3" rel="index">1.3 Section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#node-in-section-3">node in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="#node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#node-2-in-section-3" rel="index">node 2 in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -178,14 +178,14 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#first" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#first" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#subsection-1" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Section-1"></span><h2 class="section">1.1 Section 1</h2>
@@ -195,7 +195,7 @@ ul.no-bullet {list-style: none}
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#subsection-1">1.1.1 Subsection 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="#subsection-2">1.1.2 Subsection 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#subsection-2" rel="index">1.1.2 Subsection 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<p>The index once more
@@ -231,7 +231,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#section-3">1.3 Section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Section-1_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">split indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">split indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
@@ -275,14 +275,14 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#section-1" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section-1" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#subsection-2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Subsection-1"></span><h3 class="subsection">1.1.1 Subsection 1</h3>
@@ -295,14 +295,14 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#subsection-1" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section-1" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#section-2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Subsection-2"></span><h3 class="subsection">1.1.2 Subsection 2</h3>
@@ -342,7 +342,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#section-3">1.3 Section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Subsection-2_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">split indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">split indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
@@ -386,14 +386,14 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#subsection-2" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#first" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#section-3" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Section-2"></span><h2 class="section">1.2 Section 2</h2>
@@ -405,15 +405,15 @@ ul.no-bullet {list-style: none}
<tr><td valign="middle" align="left">[<a href="#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#section-2" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Section-3"></span><h2 class="section">1.3 Section 3</h2>
@@ -451,7 +451,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#section-3">1.3 Section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Section-3_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">split indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">split indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
@@ -526,7 +526,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#section-3">1.3 Section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Section-3_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">split indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">split indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
@@ -595,7 +595,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#section-3">1.3 Section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Section-3_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">split indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">split indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
@@ -639,15 +639,15 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index.html
index 248c8bcad8..63765cdecb 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index.html
@@ -210,11 +210,11 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#Top">split indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">back to the current top node
+<tr><td align="left" valign="top"><a href="#Top" rel="index">split indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">back to the current top node
</td></tr>
-<tr><td align="left" valign="top"><a href="first.html#first">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="first.html#first" rel="index">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="second-chapter.html#second-chapter">2 Second chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="second-chapter.html">2 Second chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index_split_abt.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index_split_abt.html
index 29fd921e46..4423ca2acb 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index_split_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/index_split_abt.html
@@ -35,9 +35,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -144,9 +144,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/second-chapter.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/second-chapter.html
index dd909641f3..ee0f24dd72 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/second-chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split/res_html/second-chapter.html
@@ -36,16 +36,16 @@ ul.no-bullet {list-style: none}
<span id="second-chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="first.html#section-3" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Second-chapter"></span><h1 class="chapter">2 Second chapter</h1>
@@ -61,9 +61,9 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes.pl b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes.pl
index 8d088e90e4..9740f33255 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes.pl
@@ -92,6 +92,7 @@ $result_trees{'index_split_nodes'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -876,6 +877,7 @@ $result_trees{'index_split_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1477,6 +1479,7 @@ $result_trees{'index_split_nodes'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1963,6 +1966,7 @@ $result_trees{'index_split_nodes'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2282,6 +2286,7 @@ $result_trees{'index_split_nodes'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2838,6 +2843,7 @@ $result_trees{'index_split_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3771,6 +3777,7 @@ $result_sectioning{'index_split_nodes'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3785,6 +3792,7 @@ $result_sectioning{'index_split_nodes'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
}
@@ -3800,6 +3808,7 @@ $result_sectioning{'index_split_nodes'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'section-1',
'spaces_before_argument' => ' '
}
@@ -3831,6 +3840,7 @@ $result_sectioning{'index_split_nodes'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'subsection-2',
'spaces_before_argument' => ' '
}
@@ -3868,6 +3878,7 @@ $result_sectioning{'index_split_nodes'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'section-3',
'spaces_before_argument' => ' '
}
@@ -3935,6 +3946,7 @@ $result_nodes{'index_split_nodes'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -3955,27 +3967,16 @@ $result_nodes{'index_split_nodes'} = {
}
],
'node_next' => {},
- 'node_prev' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_prev' => {}
};
$result_nodes{'index_split_nodes'}{'menu_child'} = $result_nodes{'index_split_nodes'};
$result_nodes{'index_split_nodes'}{'node_next'} = $result_nodes{'index_split_nodes'};
$result_nodes{'index_split_nodes'}{'node_prev'} = $result_nodes{'index_split_nodes'};
-$result_nodes{'index_split_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'index_split_nodes'};
$result_menus{'index_split_nodes'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
@@ -3983,12 +3984,14 @@ $result_menus{'index_split_nodes'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'section-1',
'spaces_before_argument' => ' '
},
@@ -4001,6 +4004,7 @@ $result_menus{'index_split_nodes'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'subsection-2',
'spaces_before_argument' => ' '
},
@@ -4024,6 +4028,7 @@ $result_menus{'index_split_nodes'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'section-3',
'spaces_before_argument' => ' '
},
@@ -4036,6 +4041,7 @@ $result_menus{'index_split_nodes'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node-2-in-section-3',
'spaces_before_argument' => ' '
},
@@ -4126,15 +4132,6 @@ $result_menus{'index_split_nodes'}{'menu_up'} = $result_menus{'index_split_nodes
$result_errors{'index_split_nodes'} = [
{
- 'error_line' => 'index_split.texi:5: warning: for `Top\', up in menu `Top\' and up `(dir)\' don\'t match
-',
- 'file_name' => 'index_split.texi',
- 'line_nr' => 5,
- 'macro' => '',
- 'text' => 'for `Top\', up in menu `Top\' and up `(dir)\' don\'t match',
- 'type' => 'warning'
- },
- {
'error_line' => 'index_split.texi:23: warning: node `Top\' is prev for `first\' in menu but not in sectioning
',
'file_name' => 'index_split.texi',
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/first.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/first.html
index 8acca2b6ac..e99f0ff207 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/first.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/first.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section-1.html#section-1" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section-1.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -80,30 +80,30 @@ ul.no-bullet {list-style: none}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html">node 3 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html">node in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html#section-3">section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html">section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#first_cp_symbol-1"><b>!</b></a>
@@ -159,34 +159,34 @@ ul.no-bullet {list-style: none}
<span id="index-somewhere"></span>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="section-1.html#section-1">section 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="section-1.html" rel="index">section 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="section-2.html#section-2">section 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="section-2.html">section 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="section-3.html#section-3">section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="section-3.html" rel="index">section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="node-in-section-3.html">node in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="node-2-in-section-3.html" rel="index">node 2 in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="node-3-in-section-3.html">node 3 in section 3</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section-1.html#section-1" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section-1.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index.html
index d75123c676..49e8ce1a07 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index.html
@@ -36,7 +36,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -66,34 +66,34 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-E">E</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html">node 3 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html">node in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html#section-3">section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html">section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_symbol-1"><b>!</b></a>
@@ -124,13 +124,13 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_fn_letter-A"><b>A</b></a>
@@ -163,34 +163,34 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-E">E</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html">node 3 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html">node in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html#section-3">section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html">section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_symbol-1"><b>!</b></a>
@@ -211,18 +211,18 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#Top">Top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">back to the current top node
+<tr><td align="left" valign="top">&bull; <a href="#Top" rel="index">Top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">back to the current top node
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="first.html#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="first.html" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="second-chapter.html#second-chapter">second chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="second-chapter.html">second chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html
index db6d6e848b..c45648f1d2 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/index_split_abt.html
@@ -35,9 +35,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -145,9 +145,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
index e49af34e28..9ae814543f 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-2-in-section-3.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="node-2-in-section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="node-in-section-3.html#node-in-section-3" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="node-3-in-section-3.html#node-3-in-section-3" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-in-section-3.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="node-3-in-section-3.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -74,34 +74,34 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#node-2-in-section-3">node 2 in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-N">N</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html">node 3 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html">node in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html#section-3">section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html">section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#node-2-in-section-3_cp_symbol-1"><b>!</b></a>
@@ -143,34 +143,34 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#node-2-in-section-3">node 2 in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-N">N</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html">node 3 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html">node in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-2-in-section-3_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html#section-3">section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html">section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#node-2-in-section-3_cp_symbol-1"><b>!</b></a>
@@ -195,17 +195,17 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="node-in-section-3.html#node-in-section-3" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="node-3-in-section-3.html#node-3-in-section-3" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-in-section-3.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="node-3-in-section-3.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
index 173b1656c6..a5c6b5c5ea 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-3-in-section-3.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="node-3-in-section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="node-2-in-section-3.html#node-2-in-section-3" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-2-in-section-3.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
index a7a2962613..6e34c24148 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/node-in-section-3.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="node-in-section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="section-3.html#section-3" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="node-2-in-section-3.html#node-2-in-section-3" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="section-3.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="node-2-in-section-3.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
index 987bc3d6a6..c756a8dfa9 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/second-chapter.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="second-chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="node-3-in-section-3.html#node-3-in-section-3" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-3-in-section-3.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
index b81ea53aa4..3e62c78711 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-1.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection-1.html#subsection-1" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection-1.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -54,9 +54,9 @@ ul.no-bullet {list-style: none}
<span id="index-something"></span>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="subsection-1.html#subsection-1">subsection 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="subsection-1.html">subsection 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="subsection-2.html#subsection-2">subsection 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="subsection-2.html" rel="index">subsection 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<p>The index once more
@@ -81,34 +81,34 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-1_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-1_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="#section-1">section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-1_cp_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-1_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-1_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html">node 3 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html">node in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-1_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html#section-3">section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html">section 3</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="#section-1">section 1</a></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#section-1_cp_symbol-1"><b>!</b></a>
@@ -132,18 +132,18 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection-1.html#subsection-1" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection-1.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
index f67fe084d9..073f05a15b 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-2.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection-2.html#subsection-2" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section-3.html#section-3" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection-2.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section-3.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
index 871600f6b8..4e7b1131e9 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/section-3.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section-3"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section-2.html#section-2" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="node-in-section-3.html#node-in-section-3" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section-2.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="node-in-section-3.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -73,34 +73,34 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-3_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-3_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-3_cp_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-3_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-3_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html">node 3 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html">node in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-3_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="section-3_cp_letter-S">S</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="#section-3">section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
-<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html#subsection-2">subsection 2</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="subsection-2.html#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="subsection-2.html">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#section-3_cp_symbol-1"><b>!</b></a>
@@ -122,18 +122,18 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section-2.html#section-2" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="node-in-section-3.html#node-in-section-3" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section-2.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="node-in-section-3.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
index 55cb6ce1fb..38614827d0 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-1.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsection-1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section-1.html#section-1" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section-1.html#section-1" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection-2.html#subsection-2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section-1.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section-1.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection-2.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
index 2e87b1ce05..8837409db5 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/index_split_nodes/res_html/subsection-2.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsection-2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection-1.html#subsection-1" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section-1.html#section-1" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section-2.html#section-2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection-1.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section-1.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section-2.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -75,33 +75,33 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="subsection-2_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="subsection-2_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-a-concept-in-first">a concept in first</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-after-second-printindex-node-in-section-3">after second printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="subsection-2_cp_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-between-printindex-node-in-section-3">between printindex node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="subsection-2_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="subsection-2_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html#node-2-in-section-3">node 2 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html#node-3-in-section-3">node 3 in section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html#node-in-section-3">node in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-2-in-section-3.html#index-node-2-in-section-3">node 2 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-2-in-section-3.html">node 2 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-3-in-section-3.html#index-node-3-in-section-3">node 3 in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-3-in-section-3.html">node 3 in section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-section-3.html#index-node-in-section-3">node in section 3</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-section-3.html">node in section 3</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="subsection-2_cp_letter-P">P</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-printindex-subsection-2">printindex subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="#subsection-2">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="subsection-2_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html#section-3">section 3</a></td></tr>
-<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html#section-1">section 1</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-3.html#index-section-3">section 3</a></td><td>&nbsp;</td><td valign="top"><a href="section-3.html">section 3</a></td></tr>
+<tr><td></td><td valign="top"><a href="section-1.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="section-1.html">section 1</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-subsection-2">subsection 2</a></td><td>&nbsp;</td><td valign="top"><a href="#subsection-2">subsection 2</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
@@ -126,18 +126,18 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="first.html#first" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection-1.html#subsection-1" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="section-1.html#section-1" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section-2.html#section-2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="second-chapter.html#second-chapter" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="first.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection-1.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="section-1.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section-2.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second-chapter.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_split_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top.pl b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top.pl
index 91237ac8c7..21402962dd 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top.pl
@@ -337,6 +337,7 @@ $result_trees{'nodes_before_top'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -557,6 +558,7 @@ $result_trees{'nodes_before_top'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -914,6 +916,7 @@ $result_trees{'nodes_before_top'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1280,6 +1283,7 @@ $result_trees{'nodes_before_top'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1563,6 +1567,7 @@ $result_trees{'nodes_before_top'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2071,6 +2076,7 @@ $result_trees{'nodes_before_top'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2553,24 +2559,28 @@ $result_sectioning{'nodes_before_top'} = {};
$result_nodes{'nodes_before_top'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'a-node',
'spaces_before_argument' => ' '
},
@@ -2638,12 +2648,14 @@ $result_nodes{'nodes_before_top'} = {
'node_prev' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first-before-top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node-in-menu-before-top',
'spaces_before_argument' => ' '
},
@@ -2688,24 +2700,28 @@ $result_nodes{'nodes_before_top'}{'node_prev'}{'node_next'} = $result_nodes{'nod
$result_menus{'nodes_before_top'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'a-node',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
index ea2c508854..51609de7ea 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/first-before-top.html
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -79,7 +79,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="#another">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first-before-top_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
@@ -114,7 +114,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<p>in first node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" rel="index">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -123,13 +123,13 @@ ul.no-bullet {list-style: none}
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -164,7 +164,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="#another">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-in-menu-before-top_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
@@ -205,15 +205,15 @@ ul.no-bullet {list-style: none}
<hr size="6">
<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#second" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -251,7 +251,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="#another">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
@@ -286,7 +286,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#second">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -301,14 +301,14 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h3 class="node-heading">second</h3>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#a-node">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -353,7 +353,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -375,7 +375,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -410,7 +410,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="#another">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
@@ -474,7 +474,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="#another">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
@@ -517,7 +517,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/index.html
index 28dc2a6b4c..9a568d5e78 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/index.html
@@ -197,7 +197,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="first-before-top.html#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="first-before-top.html#first" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html
index 942bae324b..a6926dd6b8 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top/res_html/nodes_before_top_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
index 999ac18b41..3d5439dfa5 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
@@ -396,6 +396,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -627,6 +628,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -873,6 +875,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1564,6 +1567,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1847,6 +1851,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2355,6 +2360,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2432,6 +2438,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -3251,6 +3258,7 @@ $result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
@@ -3265,6 +3273,7 @@ $result_sectioning{'nodes_before_top_and_sections_monolithic'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
}
@@ -3297,24 +3306,28 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} = {
},
'level' => 0
},
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'a-node',
'spaces_before_argument' => ' '
},
@@ -3382,12 +3395,14 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} = {
'node_prev' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first-before-top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node-in-menu-before-top',
'spaces_before_argument' => ' '
},
@@ -3432,24 +3447,28 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'}{'node_prev'}{'node_nex
$result_menus{'nodes_before_top_and_sections_monolithic'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'a-node',
'spaces_before_argument' => ' '
},
@@ -3478,6 +3497,7 @@ $result_menus{'nodes_before_top_and_sections_monolithic'} = {
'menu_next' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'chapter',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
index edb4b5d3df..d83f1e5d92 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic/res_html/nodes_before_top_and_sections.html
@@ -185,7 +185,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<p>after second printindex in first node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" rel="index">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -441,9 +441,9 @@ ul.no-bullet {list-style: none}
<p>in top section
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#first" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="#chapter">1 A chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#chapter" rel="index">1 A chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#node-in-chapter">node in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -524,12 +524,12 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#second">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<span id="second"></span><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#a-node">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes.pl b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
index 6f67ee0806..3d3f62c57e 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -337,6 +337,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -557,6 +558,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -914,6 +916,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1280,6 +1283,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1563,6 +1567,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2071,6 +2076,7 @@ $result_trees{'nodes_before_top_no_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2553,24 +2559,28 @@ $result_sectioning{'nodes_before_top_no_nodes'} = {};
$result_nodes{'nodes_before_top_no_nodes'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'a-node',
'spaces_before_argument' => ' '
},
@@ -2638,12 +2648,14 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
'node_prev' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first-before-top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node-in-menu-before-top',
'spaces_before_argument' => ' '
},
@@ -2688,24 +2700,28 @@ $result_nodes{'nodes_before_top_no_nodes'}{'node_prev'}{'node_next'} = $result_n
$result_menus{'nodes_before_top_no_nodes'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'a-node',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
index 4c15d68f66..7a7b1fb365 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_no_nodes/res_html/index.html
@@ -98,7 +98,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<p>in first node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" rel="index">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -324,7 +324,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#first" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -395,12 +395,12 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#second">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<span id="second"></span><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#a-node">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes.pl b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes.pl
index 546eb391a3..139f8b1d11 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -337,6 +337,7 @@ $result_trees{'nodes_before_top_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -557,6 +558,7 @@ $result_trees{'nodes_before_top_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -914,6 +916,7 @@ $result_trees{'nodes_before_top_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1280,6 +1283,7 @@ $result_trees{'nodes_before_top_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1563,6 +1567,7 @@ $result_trees{'nodes_before_top_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2071,6 +2076,7 @@ $result_trees{'nodes_before_top_nodes'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -2553,24 +2559,28 @@ $result_sectioning{'nodes_before_top_nodes'} = {};
$result_nodes{'nodes_before_top_nodes'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'a-node',
'spaces_before_argument' => ' '
},
@@ -2638,12 +2648,14 @@ $result_nodes{'nodes_before_top_nodes'} = {
'node_prev' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first-before-top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'node-in-menu-before-top',
'spaces_before_argument' => ' '
},
@@ -2688,24 +2700,28 @@ $result_nodes{'nodes_before_top_nodes'}{'node_prev'}{'node_next'} = $result_node
$result_menus{'nodes_before_top_nodes'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'second',
'spaces_before_argument' => ' '
},
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'a-node',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
index 1ac70f2230..ddba368914 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/a-node.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="a-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="another.html#another" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="another.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -72,28 +72,28 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html#first-before-top">first before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html">first before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -136,28 +136,28 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html#first-before-top">first before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html">first before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -180,17 +180,17 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="another.html#another" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="another.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
index cd66031be3..ccfb6f5b2b 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/another.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="another"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="a-node.html#a-node" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="a-node.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
index 4db7cad9b4..cf9a8caa43 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first-before-top.html
@@ -39,13 +39,13 @@ ul.no-bullet {list-style: none}
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
<td valign="middle" align="left">[ &lt; ]</td>
<td valign="middle" align="left">[<a href="../dir/index.html" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="node-in-menu-before-top.html#node-in-menu-before-top" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-in-menu-before-top.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -73,28 +73,28 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first-before-top_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first-before-top_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first-before-top_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first-before-top_cp_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#first-before-top">first before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first-before-top_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first-before-top_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first-before-top_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#first-before-top_cp_symbol-1"><b>!</b></a>
@@ -115,7 +115,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<p>in first node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="node-in-menu-before-top.html" rel="index">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -124,13 +124,13 @@ ul.no-bullet {list-style: none}
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
<td valign="middle" align="left">[ &lt; ]</td>
<td valign="middle" align="left">[<a href="../dir/index.html" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="node-in-menu-before-top.html#node-in-menu-before-top" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-in-menu-before-top.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first-before-top" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
index 9963dddbee..de6112bfe2 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/first.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -78,25 +78,25 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html#first-before-top">first before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html">first before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#first_cp_symbol-1"><b>!</b></a>
@@ -117,24 +117,24 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="second.html#second">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="second.html" rel="index">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
index b59ccecbcf..625900dbcb 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/index.html
@@ -34,11 +34,11 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="node-in-menu-before-top.html#node-in-menu-before-top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="node-in-menu-before-top.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -65,28 +65,28 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-E">E</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html#first-before-top">first before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html">first before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_symbol-1"><b>!</b></a>
@@ -117,13 +117,13 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_fn_letter-A"><b>A</b></a>
@@ -156,28 +156,28 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-E">E</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html#first-before-top">first before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html">first before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html#node-in-menu-before-top">node in menu before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-in-menu-before-top.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="node-in-menu-before-top.html">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_symbol-1"><b>!</b></a>
@@ -198,17 +198,17 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="first.html#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="first.html" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="node-in-menu-before-top.html#node-in-menu-before-top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="node-in-menu-before-top.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
index 9d26752641..49f26303c2 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/node-in-menu-before-top.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="node-in-menu-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -72,19 +72,19 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-in-menu-before-top_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-in-menu-before-top_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-in-menu-before-top_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-in-menu-before-top_cp_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html#first-before-top">first before top</a></td></tr>
+<tr><td></td><td valign="top"><a href="first-before-top.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="first-before-top.html">first before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-in-menu-before-top_cp_letter-N">N</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#node-in-menu-before-top">node in menu before top</a></td></tr>
@@ -93,7 +93,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#node-in-menu-before-top">node in menu before top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-in-menu-before-top_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#node-in-menu-before-top_cp_symbol-1"><b>!</b></a>
@@ -120,17 +120,17 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
index 95e7662c72..3238e3687b 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/nodes_before_top_abt.html
@@ -35,9 +35,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -145,9 +145,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
index fe6a2e3df7..17d96bb61c 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/nodes_before_top_nodes/res_html/second.html
@@ -35,25 +35,25 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="second"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="another.html#another" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="another.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="first-before-top.html#first-before-top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="first-before-top.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
<h3 class="node-heading">second</h3>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="a-node.html#a-node">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-node.html" rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="another.html#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="another.html">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -68,13 +68,13 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_fn_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#second_fn_letter-A"><b>A</b></a>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index.pl b/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index.pl
index 21ec5769f3..2701089b62 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index.pl
@@ -348,6 +348,7 @@ $result_trees{'split_chapter_index'} = {
'cmdname' => 'node',
'contents' => [],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -1678,6 +1679,7 @@ $result_sectioning{'split_chapter_index'} = {
'associated_node' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
}
@@ -1762,6 +1764,7 @@ $result_nodes{'split_chapter_index'} = {
'level' => 1,
'number' => 1
},
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
@@ -1845,25 +1848,13 @@ $result_nodes{'split_chapter_index'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'split_chapter_index'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'split_chapter_index'}{'menu_child'}{'menu_child'};
$result_nodes{'split_chapter_index'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'split_chapter_index'}{'menu_child'};
$result_nodes{'split_chapter_index'}{'menu_child'}{'node_prev'} = $result_nodes{'split_chapter_index'};
$result_nodes{'split_chapter_index'}{'menu_child'}{'node_up'} = $result_nodes{'split_chapter_index'};
$result_nodes{'split_chapter_index'}{'node_next'} = $result_nodes{'split_chapter_index'}{'menu_child'};
-$result_nodes{'split_chapter_index'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'split_chapter_index'};
$result_menus{'split_chapter_index'} = {
'cmdname' => 'node',
@@ -1874,6 +1865,7 @@ $result_menus{'split_chapter_index'} = {
'menu_child' => {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'first',
'spaces_before_argument' => ' '
},
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/first.html b/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/first.html
index 2b4c50c8b7..c8d1b033a7 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/first.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/first.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#section-1" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -79,7 +79,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="#section-1">1.1 Section 1</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="First-chapter_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">split indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">split indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">1 First chapter</a></td></tr>
@@ -126,7 +126,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -153,7 +153,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -173,7 +173,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#first" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="split_chapter_index_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/index.html
index 0bbb7d85ba..c122f89e70 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/index.html
@@ -49,7 +49,7 @@ ul.no-bullet {list-style: none}
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="first.html#first">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="first.html#first" rel="index">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html b/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
index f81df3d7b8..2fdee76cb8 100644
--- a/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/moreindices/split_chapter_index/res_html/split_chapter_index_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="first.html#first" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="first.html#first" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes.pl
index 62ffd8a485..dcb2caa13c 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -915,23 +915,11 @@ $result_nodes{'equivalent_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'equivalent_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'equivalent_nodes'};
$result_nodes{'equivalent_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'equivalent_nodes'};
$result_nodes{'equivalent_nodes'}{'node_next'} = $result_nodes{'equivalent_nodes'}{'menu_child'};
-$result_nodes{'equivalent_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'equivalent_nodes'};
$result_menus{'equivalent_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes_no_node.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index 35a2eda8bd..3dc531e678 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -915,23 +915,11 @@ $result_nodes{'equivalent_nodes_no_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'equivalent_nodes_no_node'}{'menu_child'}{'node_prev'} = $result_nodes{'equivalent_nodes_no_node'};
$result_nodes{'equivalent_nodes_no_node'}{'menu_child'}{'node_up'} = $result_nodes{'equivalent_nodes_no_node'};
$result_nodes{'equivalent_nodes_no_node'}{'node_next'} = $result_nodes{'equivalent_nodes_no_node'}{'menu_child'};
-$result_nodes{'equivalent_nodes_no_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'equivalent_nodes_no_node'};
$result_menus{'equivalent_nodes_no_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/more_sections_than_nodes.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/more_sections_than_nodes.pl
index d3aaf740c5..ef6b97d123 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -1796,18 +1796,7 @@ $result_nodes{'more_sections_than_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'};
$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'};
@@ -1817,7 +1806,6 @@ $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_up'}
$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'more_sections_than_nodes'};
$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'more_sections_than_nodes'};
$result_nodes{'more_sections_than_nodes'}{'node_next'} = $result_nodes{'more_sections_than_nodes'}{'menu_child'};
-$result_nodes{'more_sections_than_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'more_sections_than_nodes'};
$result_menus{'more_sections_than_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end.pl
index 7b9fb1d82f..d5f7d5770f 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end.pl
@@ -1495,18 +1495,7 @@ $result_nodes{'node_footnote_end'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_prev'} = $result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'};
$result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_next'};
@@ -1518,7 +1507,6 @@ $result_nodes{'node_footnote_end'}{'menu_child'}{'node_next'}{'node_up'} = $resu
$result_nodes{'node_footnote_end'}{'menu_child'}{'node_prev'} = $result_nodes{'node_footnote_end'};
$result_nodes{'node_footnote_end'}{'menu_child'}{'node_up'} = $result_nodes{'node_footnote_end'};
$result_nodes{'node_footnote_end'}{'node_next'} = $result_nodes{'node_footnote_end'}{'menu_child'};
-$result_nodes{'node_footnote_end'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_footnote_end'};
$result_menus{'node_footnote_end'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
index 9caa03fca1..5848c2101c 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_end/res_html/node_footnote.html
@@ -69,11 +69,11 @@ Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>foot 1 &aacute;</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>foot 2 &acirc;</p>
-<h3><a id="FOOT3" href="#DOCF3">(3)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3>
<p>foot 3 &agrave;</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated.pl
index ee1a0bf524..0edd0cf01c 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -1495,18 +1495,7 @@ $result_nodes{'node_footnote_separated'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_prev'} = $result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'};
$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_next'};
@@ -1518,7 +1507,6 @@ $result_nodes{'node_footnote_separated'}{'menu_child'}{'node_next'}{'node_up'} =
$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_prev'} = $result_nodes{'node_footnote_separated'};
$result_nodes{'node_footnote_separated'}{'menu_child'}{'node_up'} = $result_nodes{'node_footnote_separated'};
$result_nodes{'node_footnote_separated'}{'node_next'} = $result_nodes{'node_footnote_separated'}{'menu_child'};
-$result_nodes{'node_footnote_separated'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_footnote_separated'};
$result_menus{'node_footnote_separated'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
index 9caa03fca1..5848c2101c 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_separated/res_html/node_footnote.html
@@ -69,11 +69,11 @@ Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>foot 1 &aacute;</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>foot 2 &acirc;</p>
-<h3><a id="FOOT3" href="#DOCF3">(3)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3>
<p>foot 3 &agrave;</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node.pl
index d0de9f1280..da97cd1b60 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -1495,18 +1495,7 @@ $result_nodes{'node_footnote_use_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_prev'} = $result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'};
$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_next'};
@@ -1518,7 +1507,6 @@ $result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_next'}{'node_up'} =
$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_prev'} = $result_nodes{'node_footnote_use_node'};
$result_nodes{'node_footnote_use_node'}{'menu_child'}{'node_up'} = $result_nodes{'node_footnote_use_node'};
$result_nodes{'node_footnote_use_node'}{'node_next'} = $result_nodes{'node_footnote_use_node'}{'menu_child'};
-$result_nodes{'node_footnote_use_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_footnote_use_node'};
$result_menus{'node_footnote_use_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
index 0faf56972e..897e36bdb1 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/a.html
@@ -35,15 +35,15 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e1"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#g_t_00e2" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -58,14 +58,14 @@ Footnote 1<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
<span id="g_t_00e2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
<td valign="middle" align="left">[<a href="#g_t_00e1" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -79,23 +79,23 @@ Footnote 2<a id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>foot 1 &aacute;</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>foot 2 &acirc;</p>
</div>
<hr>
<span id="g_t_00e0"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -109,7 +109,7 @@ Footnote 3<a id="DOCF3" href="#FOOT3"><sup>3</sup></a>.
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT3" href="#DOCF3">(3)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3>
<p>foot 3 &agrave;</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html
index a5b33c3be1..a9eae6d3e4 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/chapter.html
@@ -36,14 +36,14 @@ ul.no-bullet {list-style: none}
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
<td valign="middle" align="left">[<a href="a.html#g_t_00e2" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="a.html#g_t_00e0" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="node_footnote_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
index 6dbc06619f..e04bbc900f 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/index.html
@@ -50,7 +50,7 @@ ul.no-bullet {list-style: none}
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="a.html#g_t_00e2">&acirc;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="chapter.html#chapter">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="chapter.html">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="a.html#g_t_00e0">&agrave;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/node_footnote_abt.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/node_footnote_abt.html
index 5538f544f6..ee8ab78a1d 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/node_footnote_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/node_footnote_use_node/res_html/node_footnote_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -145,7 +145,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
index 49834d7c9c..5622e1af3f 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -744,25 +744,13 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_chapter'}{'menu_child'};
$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_chapter'};
$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_chapter'};
$result_nodes{'nodes_after_top_before_chapter'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_chapter'};
$result_nodes{'nodes_after_top_before_chapter'}{'node_next'} = $result_nodes{'nodes_after_top_before_chapter'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_chapter'};
$result_menus{'nodes_after_top_before_chapter'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
index 011d8ff19f..a6fe62bc17 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
@@ -744,25 +744,13 @@ $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'};
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'node_next'} = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
index 2b4f79a90a..62a914cb02 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
@@ -48,7 +48,7 @@ ul.no-bullet {list-style: none}
</p><table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">&bull; <a href="#second-node">second node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="third-node.html#third-node">third node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="third-node.html">third node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -57,7 +57,7 @@ ul.no-bullet {list-style: none}
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
<td valign="middle" align="left">[<a href="#Top" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="third-node.html#third-node" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="third-node.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section.pl
index 944af7d845..b68a6e13a3 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -744,25 +744,13 @@ $result_nodes{'nodes_after_top_before_section'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_section'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section'}{'menu_child'};
$result_nodes{'nodes_after_top_before_section'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_section'};
$result_nodes{'nodes_after_top_before_section'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section'};
$result_nodes{'nodes_after_top_before_section'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_section'};
$result_nodes{'nodes_after_top_before_section'}{'node_next'} = $result_nodes{'nodes_after_top_before_section'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_section'};
$result_menus{'nodes_after_top_before_section'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
index c34ddf7ad0..b83e9513ac 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
@@ -744,25 +744,13 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'};
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_section_use_nodes'};
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section_use_nodes'};
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_section_use_nodes'};
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'node_next'} = $result_nodes{'nodes_after_top_before_section_use_nodes'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_section_use_nodes'};
$result_menus{'nodes_after_top_before_section_use_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
index 9f43ec5dd5..b1cc3e6584 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
@@ -744,25 +744,13 @@ $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'};
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'node_next'} = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
$result_menus{'nodes_after_top_before_section_use_nodes_chapter'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
index 7c5e970756..27500aa866 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
@@ -72,7 +72,7 @@ ul.no-bullet {list-style: none}
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>In footnote.
</p>
<span id="Anchor-in-footnote"></span>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
index b5413436d5..387fb855e8 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/First-node.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="First-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -68,12 +68,12 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#First-node" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#First-node" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered-sub" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -97,12 +97,12 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#unnumbered" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#numbered-sub" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -115,12 +115,12 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#unnumbered-sub" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered-sub2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -133,12 +133,12 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#numbered-sub" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#numbered-sub2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -151,12 +151,12 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#unnumbered-sub2" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -169,12 +169,12 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#numbered-sub2" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#First-node" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#numbered-sub3" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -192,12 +192,12 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[<a href="#unnumbered2" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#unnumbered2" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#numbered" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -210,13 +210,13 @@ ul.no-bullet {list-style: none}
<tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#numbered-sub3" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#First-node" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -229,13 +229,13 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#First-node" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html
index b5c7fdf527..e3d36d6435 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Second-node.html
@@ -36,14 +36,14 @@ ul.no-bullet {list-style: none}
<span id="Second-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="First-node.html#First-node" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="First-node.html#numbered" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Third-node-unnumbered.html#Third-node-unnumbered" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Third-node-unnumbered.html#Third-node-unnumbered" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="Third-node-unnumbered.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Third-node-unnumbered.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -58,13 +58,13 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="First-node.html#First-node" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Third-node-unnumbered.html#Third-node-unnumbered" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Third-node-unnumbered.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
index b327dbe673..db5e5b0e40 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/Third-node-unnumbered.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Third-node-unnumbered"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Second-node.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Second-node.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -56,14 +56,14 @@ ul.no-bullet {list-style: none}
<span id="Last-node-no-description"></span>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Second-node.html#Second-node" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Second-node.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
index 9dbd298777..7329113423 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/index.html
@@ -58,13 +58,13 @@ node in between
heading
or not ?
-</pre></th></tr><tr><td align="left" valign="top"><a href="Second-node.html#Second-node">2 second node chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">node 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="Second-node.html">2 second node chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">node 2
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
heading with spaces around
-</pre></th></tr><tr><td align="left" valign="top"><a href="Third-node-unnumbered.html#Third-node-unnumbered">unnumbered chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">unnumbered in Top menu
+</pre></th></tr><tr><td align="left" valign="top"><a href="Third-node-unnumbered.html">unnumbered chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">unnumbered in Top menu
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="Third-node-unnumbered.html#Last-node-no-description">Last node no description</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_abt.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_abt.html
index a9621b66c4..64bdc4521d 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_abt.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html
index 91268d3e94..47b4410a18 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_ovr.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Overview"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -45,13 +45,13 @@ ul.no-bullet {list-style: none}
<div class="shortcontents">
<ul class="no-bullet">
<li><a id="stoc-first-node-chapter" href="First-node.html#First-node">1 first node chapter</a></li>
-<li><a id="stoc-second-node-chapter" href="Second-node.html#Second-node">2 second node chapter</a></li>
-<li><a id="stoc-unnumbered-chapter" href="Third-node-unnumbered.html#Third-node-unnumbered">unnumbered chapter</a></li>
+<li><a id="stoc-second-node-chapter" href="Second-node.html">2 second node chapter</a></li>
+<li><a id="stoc-unnumbered-chapter" href="Third-node-unnumbered.html">unnumbered chapter</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="sectioning_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html
index cdce503dfa..c38c322955 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/sectioning_frames/res_html/sectioning_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -60,13 +60,13 @@ ul.no-bullet {list-style: none}
</ul></li>
<li><a id="toc-numbered-section" href="First-node.html#numbered">1.1 numbered section</a></li>
</ul></li>
- <li><a id="toc-second-node-chapter" href="Second-node.html#Second-node">2 second node chapter</a></li>
- <li><a id="toc-unnumbered-chapter" href="Third-node-unnumbered.html#Third-node-unnumbered">unnumbered chapter</a></li>
+ <li><a id="toc-second-node-chapter" href="Second-node.html">2 second node chapter</a></li>
+ <li><a id="toc-unnumbered-chapter" href="Third-node-unnumbered.html">unnumbered chapter</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="sectioning_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_explicit.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_explicit.pl
index b2f18b7f79..307a202d61 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -210,8 +210,7 @@ $result_trees{'top_node_up_explicit'} = {
{
'manual_content' => [
{}
- ],
- 'top_node_up' => {}
+ ]
}
],
'normalized' => 'Top',
@@ -535,7 +534,6 @@ $result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0] = $result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[1]{'contents'}[1];
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0] = $result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[2]{'contents'}[1];
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0] = $result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'top_node_up'} = $result_trees{'top_node_up_explicit'}{'contents'}[1];
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'parent'} = $result_trees{'top_node_up_explicit'};
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'top_node_up_explicit'}{'contents'}[2]{'args'}[0];
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'top_node_up_explicit'}{'contents'}[2];
@@ -730,13 +728,11 @@ $result_nodes{'top_node_up_explicit'} = {
{
'text' => 'dir'
}
- ],
- 'top_node_up' => {}
+ ]
}
}
};
$result_nodes{'top_node_up_explicit'}{'menu_child'}{'node_up'} = $result_nodes{'top_node_up_explicit'};
-$result_nodes{'top_node_up_explicit'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_node_up_explicit'};
$result_menus{'top_node_up_explicit'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_implicit.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_implicit.pl
index d15e45770f..7b173441a4 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -593,23 +593,11 @@ $result_nodes{'top_node_up_implicit'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'top_node_up_implicit'}{'menu_child'}{'node_prev'} = $result_nodes{'top_node_up_implicit'};
$result_nodes{'top_node_up_implicit'}{'menu_child'}{'node_up'} = $result_nodes{'top_node_up_implicit'};
$result_nodes{'top_node_up_implicit'}{'node_next'} = $result_nodes{'top_node_up_implicit'}{'menu_child'};
-$result_nodes{'top_node_up_implicit'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_node_up_implicit'};
$result_menus{'top_node_up_implicit'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index 2c02fe563b..78b7cd964e 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -855,23 +855,11 @@ $result_nodes{'two_footnotes_in_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'two_footnotes_in_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'two_footnotes_in_nodes'};
$result_nodes{'two_footnotes_in_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'two_footnotes_in_nodes'};
$result_nodes{'two_footnotes_in_nodes'}{'node_next'} = $result_nodes{'two_footnotes_in_nodes'}{'menu_child'};
-$result_nodes{'two_footnotes_in_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'two_footnotes_in_nodes'};
$result_menus{'two_footnotes_in_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
index 55a0ab61cc..5507c02d9e 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
@@ -85,19 +85,19 @@ ul.no-bullet {list-style: none}
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>Footnote Top/1
</p>
<p>para2</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>Footnote Top/2
</p>
<p>para2</p>
-<h3><a id="FOOT3" href="#DOCF3">(3)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3>
<p>Footnote chapter/1
</p>
<p>para2</p>
-<h3><a id="FOOT4" href="#DOCF4">(4)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(4)</a></h3>
<p>Footnote chapter/2
</p>
<p>para2</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl b/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
index ebe489e75b..5561b54ece 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -855,23 +855,11 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'two_footnotes_in_nodes_separated'}{'menu_child'}{'node_prev'} = $result_nodes{'two_footnotes_in_nodes_separated'};
$result_nodes{'two_footnotes_in_nodes_separated'}{'menu_child'}{'node_up'} = $result_nodes{'two_footnotes_in_nodes_separated'};
$result_nodes{'two_footnotes_in_nodes_separated'}{'node_next'} = $result_nodes{'two_footnotes_in_nodes_separated'}{'menu_child'};
-$result_nodes{'two_footnotes_in_nodes_separated'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'two_footnotes_in_nodes_separated'};
$result_menus{'two_footnotes_in_nodes_separated'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html b/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
index 55a0ab61cc..5507c02d9e 100644
--- a/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
+++ b/macros/texinfo/texinfo/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
@@ -85,19 +85,19 @@ ul.no-bullet {list-style: none}
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>Footnote Top/1
</p>
<p>para2</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>Footnote Top/2
</p>
<p>para2</p>
-<h3><a id="FOOT3" href="#DOCF3">(3)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(3)</a></h3>
<p>Footnote chapter/1
</p>
<p>para2</p>
-<h3><a id="FOOT4" href="#DOCF4">(4)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(4)</a></h3>
<p>Footnote chapter/2
</p>
<p>para2</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/multitable/ref_in_multitable.pl b/macros/texinfo/texinfo/tp/t/results/multitable/ref_in_multitable.pl
index ca33635bf6..472003f32f 100644
--- a/macros/texinfo/texinfo/tp/t/results/multitable/ref_in_multitable.pl
+++ b/macros/texinfo/texinfo/tp/t/results/multitable/ref_in_multitable.pl
@@ -691,7 +691,7 @@ XXX XXX XXX XXX XXX XXX XXX XXX XX&rsquo;.
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>&lsquo;XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XX
XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XX&rsquo;</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/paragraph/image_in_paragraph.pl b/macros/texinfo/texinfo/tp/t/results/paragraph/image_in_paragraph.pl
index e8d8d89e2b..2ea24e4c65 100644
--- a/macros/texinfo/texinfo/tp/t/results/paragraph/image_in_paragraph.pl
+++ b/macros/texinfo/texinfo/tp/t/results/paragraph/image_in_paragraph.pl
@@ -68,7 +68,9 @@ $result_trees{'image_in_paragraph'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
diff --git a/macros/texinfo/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl b/macros/texinfo/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl
index 988f2854a7..d5ce3ee2c8 100644
--- a/macros/texinfo/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl
@@ -98,7 +98,9 @@ $result_trees{'no_paragraph_commands'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
diff --git a/macros/texinfo/texinfo/tp/t/results/paragraph/paragraph_command.pl b/macros/texinfo/texinfo/tp/t/results/paragraph/paragraph_command.pl
index 6b8f844f2c..0463feee4e 100644
--- a/macros/texinfo/texinfo/tp/t/results/paragraph/paragraph_command.pl
+++ b/macros/texinfo/texinfo/tp/t/results/paragraph/paragraph_command.pl
@@ -396,9 +396,9 @@ $result_converted{'plaintext'}->{'paragraph_command'} = '@
aaa.
- i also dotless i.
+ ı also dotless i.
- U+0075 also U+0075.
+ u also U+0075.
<m1> email.
@@ -431,7 +431,7 @@ $result_converted{'html_text'}->{'paragraph_command'} = '<p>@
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>lone footnote</p>
</div>
';
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl
index c53d6be6fd..7d94f47b73 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/accent_command_punctuation.pl
@@ -57,7 +57,7 @@ $result_errors{'accent_command_punctuation'} = [];
-$result_converted{'plaintext'}->{'accent_command_punctuation'} = 'e. after
+$result_converted{'plaintext'}->{'accent_command_punctuation'} = 'Ä— after
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl
index 041692933b..291d58c429 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/all_spaces.pl
@@ -779,20 +779,8 @@ $result_nodes{'all_spaces'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'all_spaces'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'all_spaces'};
$result_menus{'all_spaces'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index 2650a97c74..439c13f4ba 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -697,7 +697,7 @@ $result_converted{'plaintext'}->{'at_commands_glued_in_example'} = ' at@.
emailmali <somebody>email.
ref*note Top::ref.
Foornote(1)after footnote.
- accenti^accent.
+ accentîaccent.
and star
star.
noindentafter noindent
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index cda0d95d0e..36330952e8 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -636,7 +636,7 @@ $result_errors{'at_commands_glued_in_paragraph'} = [
$result_converted{'plaintext'}->{'at_commands_glued_in_paragraph'} = 'at@. TeXTeXTeX. code\'in code\'code. acronymABC (aaa bb cc)acronym.
acronym2ABCacronym. emailmali <somebody>email. ref*note Top::ref.
-Foornote(1)after footnote. accenti^accent. and star
+Foornote(1)after footnote. accentîaccent. and star
star. noindentafter noindent sp
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl
index f17b625001..c703497f24 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/before_accent_punctuation.pl
@@ -57,7 +57,7 @@ $result_errors{'before_accent_punctuation'} = [];
-$result_converted{'plaintext'}->{'before_accent_punctuation'} = 'a. a^
+$result_converted{'plaintext'}->{'before_accent_punctuation'} = 'a. â
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
index 564f210a20..a9d9bf0682 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl
@@ -478,7 +478,7 @@ $result_converted{'plaintext'}->{'characters_and_commands_in_var'} = 'AAA. DLKS
SOMETHINGF VVAR.
- AAC, R( E` AA.
+ AAÇ R̆ È Å.
AAA(1)
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
index 50375ee276..a0c920ebbf 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -504,20 +504,8 @@ $result_nodes{'chinese_mixed_with_en'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'chinese_mixed_with_en'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'chinese_mixed_with_en'};
$result_menus{'chinese_mixed_with_en'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
index 0aa7cf79c8..04c0446388 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/invalid_accent_punctuation.pl
@@ -58,7 +58,7 @@ $result_errors{'invalid_accent_punctuation'} = [
-$result_converted{'plaintext'}->{'invalid_accent_punctuation'} = 'a. ^@
+$result_converted{'plaintext'}->{'invalid_accent_punctuation'} = 'a. Ì‚@
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl
index f7164ed2f9..d2bc505ec9 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -1139,25 +1139,13 @@ $result_nodes{'japanese_utf8'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'japanese_utf8'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'japanese_utf8'}{'menu_child'};
$result_nodes{'japanese_utf8'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'japanese_utf8'};
$result_nodes{'japanese_utf8'}{'menu_child'}{'node_prev'} = $result_nodes{'japanese_utf8'};
$result_nodes{'japanese_utf8'}{'menu_child'}{'node_up'} = $result_nodes{'japanese_utf8'};
$result_nodes{'japanese_utf8'}{'node_next'} = $result_nodes{'japanese_utf8'}{'menu_child'};
-$result_nodes{'japanese_utf8'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'japanese_utf8'};
$result_menus{'japanese_utf8'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl
index 298c39cd90..6a3d8a6fa9 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -2968,21 +2968,9 @@ $result_nodes{'line_passed_and_formats'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'line_passed_and_formats'}{'node_next'} = $result_nodes{'line_passed_and_formats'}{'menu_child'};
-$result_nodes{'line_passed_and_formats'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'line_passed_and_formats'};
$result_menus{'line_passed_and_formats'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl
index 3a3efe1e68..3163ecb2a6 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -26,7 +26,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -79,7 +81,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -132,7 +136,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
@@ -185,7 +191,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 7,
@@ -253,7 +261,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 11,
@@ -297,7 +307,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 13,
@@ -324,7 +336,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -365,7 +379,9 @@ $result_trees{'multiline_image_and_align'} = {
],
'cmdname' => 'image',
'contents' => [],
- 'extra' => {},
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 16,
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl
index f87003d078..81921de32a 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/non_break_spaces.pl
@@ -152,20 +152,8 @@ $result_nodes{'non_break_spaces'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'non_break_spaces'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'non_break_spaces'};
$result_menus{'non_break_spaces'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
index cbbdce7c03..f7a3a24683 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_code_style_commands.pl
@@ -382,8 +382,8 @@ $result_errors{'punctuation_and_code_style_commands'} = [];
-$result_converted{'plaintext'}->{'punctuation_and_code_style_commands'} = '\'aaa\'. \'e~\'. \'aa\'. \'AAA\'. \'E~\'. \'AA\'. \'double AAA\'. \'double E~\'.
-\'double AA\'. End.
+$result_converted{'plaintext'}->{'punctuation_and_code_style_commands'} = '\'aaa\'. \'ẽ\'. \'å\'. \'AAA\'. \'Ẽ\'. \'Å\'. \'double AAA\'. \'double Ẽ\'.
+\'double Ã…\'. End.
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
index a53ebd1cc7..5d4d05a7c3 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/punctuation_and_upper_case_commands.pl
@@ -762,10 +762,9 @@ $result_errors{'punctuation_and_upper_case_commands'} = [];
-$result_converted{'plaintext'}->{'punctuation_and_upper_case_commands'} = 'AAA. E~. AA. AAA. E~. AA. DOUBLE AAA. DOUBLE E~. DOUBLE AA.
-End.
+$result_converted{'plaintext'}->{'punctuation_and_upper_case_commands'} = 'AAA. Ẽ. Å. AAA. Ẽ. Å. DOUBLE AAA. DOUBLE Ẽ. DOUBLE Å. End.
- AAA. E~. AA. AAA. E~. AA. DOUBLE AAA. DOUBLE E~. DOUBLE AA. End.
+ AAA. Ẽ. Å. AAA. Ẽ. Å. DOUBLE AAA. DOUBLE Ẽ. DOUBLE Å. End.
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl
index 4e140a2d88..271c8f1523 100644
--- a/macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/macros/texinfo/texinfo/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -1926,18 +1926,7 @@ $result_nodes{'quote_node_names'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_next'};
$result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'quote_node_names'};
@@ -1948,7 +1937,6 @@ $result_nodes{'quote_node_names'}{'menu_child'}{'node_next'}{'node_up'} = $resul
$result_nodes{'quote_node_names'}{'menu_child'}{'node_prev'} = $result_nodes{'quote_node_names'};
$result_nodes{'quote_node_names'}{'menu_child'}{'node_up'} = $result_nodes{'quote_node_names'};
$result_nodes{'quote_node_names'}{'node_next'} = $result_nodes{'quote_node_names'}{'menu_child'};
-$result_nodes{'quote_node_names'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'quote_node_names'};
$result_menus{'quote_node_names'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/raw/verbatim_and_verbatiminclude.pl b/macros/texinfo/texinfo/tp/t/results/raw/verbatim_and_verbatiminclude.pl
index ab3ca906a3..53f529f131 100644
--- a/macros/texinfo/texinfo/tp/t/results/raw/verbatim_and_verbatiminclude.pl
+++ b/macros/texinfo/texinfo/tp/t/results/raw/verbatim_and_verbatiminclude.pl
@@ -292,6 +292,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'verb.txt'
},
@@ -350,6 +351,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'verb.txt'
},
@@ -437,6 +439,7 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
],
'cmdname' => 'verbatiminclude',
'extra' => {
+ 'input_perl_encoding' => 'utf-8',
'spaces_before_argument' => ' ',
'text_arg' => 'verb.txt'
},
diff --git a/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying.pl b/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying.pl
index d02361d202..7b8618df71 100644
--- a/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying.pl
@@ -357,20 +357,8 @@ $result_nodes{'anchor_in_copying'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'anchor_in_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_in_copying'};
$result_menus{'anchor_in_copying'} = {
'cmdname' => 'node',
@@ -404,6 +392,11 @@ Node: Top37
Ref: Copying information79

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'anchor_in_copying'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl
index a1d6b6fcfb..11c79a8ec8 100644
--- a/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -392,20 +392,8 @@ $result_nodes{'anchor_in_copying_in_footnote'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'anchor_in_copying_in_footnote'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_in_copying_in_footnote'};
$result_menus{'anchor_in_copying_in_footnote'} = {
'cmdname' => 'node',
@@ -451,6 +439,11 @@ Ref: Copying footnote245
Ref: Top-Footnote-2247

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'anchor_in_copying_in_footnote'} = [
@@ -522,10 +515,10 @@ ul.no-bullet {list-style: none}
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>In footnote.
<span id="Copying-footnote"></span></p>
-<h3><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h3>
+<h5><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h3>
<p>In footnote.
<span id="Copying-footnote"></span></p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage.pl b/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage.pl
index c7b587178c..9d6f147d44 100644
--- a/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage.pl
@@ -308,20 +308,8 @@ $result_nodes{'anchor_in_titlepage'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'anchor_in_titlepage'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_in_titlepage'};
$result_menus{'anchor_in_titlepage'} = {
'cmdname' => 'node',
@@ -350,6 +338,11 @@ Tag Table:
Node: Top36

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage_titlepage.pl b/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index b054d7243d..ca9d1ecb16 100644
--- a/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/macros/texinfo/texinfo/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -308,20 +308,8 @@ $result_nodes{'anchor_in_titlepage_titlepage'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'anchor_in_titlepage_titlepage'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_in_titlepage_titlepage'};
$result_menus{'anchor_in_titlepage_titlepage'} = {
'cmdname' => 'node',
@@ -350,6 +338,11 @@ Tag Table:
Node: Top36

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage.pl b/macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage.pl
index 0bbd2ff199..9c70d7b838 100644
--- a/macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage.pl
+++ b/macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage.pl
@@ -248,20 +248,8 @@ $result_nodes{'format_in_titlepage'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'format_in_titlepage'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'format_in_titlepage'};
$result_menus{'format_in_titlepage'} = {
'cmdname' => 'node',
@@ -286,6 +274,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage_titlepage.pl b/macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage_titlepage.pl
index ea942078b7..d756b20001 100644
--- a/macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/macros/texinfo/texinfo/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -248,20 +248,8 @@ $result_nodes{'format_in_titlepage_titlepage'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'format_in_titlepage_titlepage'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'format_in_titlepage_titlepage'};
$result_menus{'format_in_titlepage_titlepage'} = {
'cmdname' => 'node',
@@ -286,6 +274,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/regions/ref_in_copying.pl b/macros/texinfo/texinfo/tp/t/results/regions/ref_in_copying.pl
index 2e5d1f63bf..ae3582e60d 100644
--- a/macros/texinfo/texinfo/tp/t/results/regions/ref_in_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/regions/ref_in_copying.pl
@@ -586,23 +586,11 @@ $result_nodes{'ref_in_copying'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'ref_in_copying'}{'menu_child'}{'node_prev'} = $result_nodes{'ref_in_copying'};
$result_nodes{'ref_in_copying'}{'menu_child'}{'node_up'} = $result_nodes{'ref_in_copying'};
$result_nodes{'ref_in_copying'}{'node_next'} = $result_nodes{'ref_in_copying'}{'menu_child'};
-$result_nodes{'ref_in_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_in_copying'};
$result_menus{'ref_in_copying'} = {
'cmdname' => 'node',
@@ -657,6 +645,11 @@ Node: Top41
Node: GFDL130

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -699,7 +692,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#GFDL" accesskey="n" rel="next">GFDL</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#GFDL" accesskey="n" rel="next">GFDL</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/regions/today_in_copying.pl b/macros/texinfo/texinfo/tp/t/results/regions/today_in_copying.pl
index 3307932a92..ff3c9daa0d 100644
--- a/macros/texinfo/texinfo/tp/t/results/regions/today_in_copying.pl
+++ b/macros/texinfo/texinfo/tp/t/results/regions/today_in_copying.pl
@@ -272,20 +272,8 @@ $result_nodes{'today_in_copying'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'today_in_copying'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'today_in_copying'};
$result_menus{'today_in_copying'} = {
'cmdname' => 'node',
@@ -316,6 +304,11 @@ Tag Table:
Node: Top41

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote.pl
index 7424a786a6..1409c6b5bf 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -588,23 +588,11 @@ $result_nodes{'anchor_in_footnote'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'anchor_in_footnote'}{'menu_child'}{'node_prev'} = $result_nodes{'anchor_in_footnote'};
$result_nodes{'anchor_in_footnote'}{'menu_child'}{'node_up'} = $result_nodes{'anchor_in_footnote'};
$result_nodes{'anchor_in_footnote'}{'node_next'} = $result_nodes{'anchor_in_footnote'}{'menu_child'};
-$result_nodes{'anchor_in_footnote'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_in_footnote'};
$result_menus{'anchor_in_footnote'} = {
'cmdname' => 'node',
@@ -664,6 +652,11 @@ Ref: Anchor in footnote178
Node: chapter182

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -704,7 +697,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="Top-1"></span><h1 class="top">Top</h1>
@@ -727,7 +720,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote
<span id="Anchor-in-footnote"></span>.
</p>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote_separate.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index 8a703dcdea..353d80d2f9 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -624,23 +624,11 @@ $result_nodes{'anchor_in_footnote_separate'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'anchor_in_footnote_separate'}{'menu_child'}{'node_prev'} = $result_nodes{'anchor_in_footnote_separate'};
$result_nodes{'anchor_in_footnote_separate'}{'menu_child'}{'node_up'} = $result_nodes{'anchor_in_footnote_separate'};
$result_nodes{'anchor_in_footnote_separate'}{'node_next'} = $result_nodes{'anchor_in_footnote_separate'}{'menu_child'};
-$result_nodes{'anchor_in_footnote_separate'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_in_footnote_separate'};
$result_menus{'anchor_in_footnote_separate'} = {
'cmdname' => 'node',
@@ -702,6 +690,11 @@ Ref: Anchor in footnote209
Node: chapter213

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -742,7 +735,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="Top-1"></span><h1 class="top">Top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_zero.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_zero.pl
index a559d59ac6..edeb7afc15 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_zero.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/anchor_zero.pl
@@ -191,20 +191,8 @@ $result_nodes{'anchor_zero'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'anchor_zero'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'anchor_zero'};
$result_menus{'anchor_zero'} = {
'cmdname' => 'node',
@@ -233,6 +221,11 @@ Node: Top27
Ref: 061

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl
index 2639a01d79..7cfb5a5ab9 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -620,23 +620,11 @@ $result_nodes{'chapter_between_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'chapter_between_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'chapter_between_nodes'};
$result_nodes{'chapter_between_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'chapter_between_nodes'};
$result_nodes{'chapter_between_nodes'}{'node_next'} = $result_nodes{'chapter_between_nodes'}{'menu_child'};
-$result_nodes{'chapter_between_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'chapter_between_nodes'};
$result_menus{'chapter_between_nodes'} = {
'cmdname' => 'node',
@@ -696,6 +684,11 @@ Node: Top27
Node: section node177

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -738,7 +731,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#section-node" accesskey="n" rel="next">section node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="#section-node" accesskey="n" rel="next">section node</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="top-section"></span><h1 class="top">top section</h1>
<p>Top node
@@ -784,7 +777,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
$result_converted{'xml'}->{'chapter_between_nodes'} = '
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">section node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">section node</nodenext></node>
<top spaces=" "><sectiontitle>top section</sectiontitle>
<para>Top node
</para>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
index 65150d95fc..671ad81090 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl
@@ -534,23 +534,11 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'chapter_node_before_and_after_part'}{'menu_child'}{'node_prev'} = $result_nodes{'chapter_node_before_and_after_part'};
$result_nodes{'chapter_node_before_and_after_part'}{'menu_child'}{'node_up'} = $result_nodes{'chapter_node_before_and_after_part'};
$result_nodes{'chapter_node_before_and_after_part'}{'node_next'} = $result_nodes{'chapter_node_before_and_after_part'}{'menu_child'};
-$result_nodes{'chapter_node_before_and_after_part'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'chapter_node_before_and_after_part'};
$result_menus{'chapter_node_before_and_after_part'} = {
'cmdname' => 'node',
@@ -623,6 +611,11 @@ Node: Top27
Node: after116

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -665,7 +658,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#after" accesskey="n" rel="next">after</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="#after" accesskey="n" rel="next">after</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="chapter"></span><h2 class="chapter">1 chapter</h2>
@@ -718,7 +711,7 @@ $result_converted_errors{'html'}->{'chapter_node_before_and_after_part'} = [
$result_converted{'xml'}->{'chapter_node_before_and_after_part'} = '
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">after</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">after</nodenext></node>
<chapter spaces=" "><sectiontitle>chapter</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_node.pl
index 304e705667..6e6694373a 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_node.pl
@@ -495,20 +495,8 @@ $result_nodes{'character_and_spaces_in_node'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'character_and_spaces_in_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'character_and_spaces_in_node'};
$result_menus{'character_and_spaces_in_node'} = {
'cmdname' => 'node',
@@ -549,6 +537,11 @@ Node: /;<=>?[\\]^_`|~230
Node: local node323

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -590,7 +583,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+ &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl
index cc3abef56f..b045154241 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -480,7 +480,7 @@ $result_trees{'character_and_spaces_in_refs'} = {
'contents' => [
{
'parent' => {},
- 'text' => '../manual/doc.texi'
+ 'text' => '../manual/doc'
}
],
'extra' => {
@@ -1611,7 +1611,7 @@ $result_texis{'character_and_spaces_in_refs'} = '@node Top
@ref{:,,,manual}
@ref{ top ,,, manual}
@ref{(texinfo)Cross References}
-@ref{node,,, ../manual/doc.texi}
+@ref{node,,, ../manual/doc}
@subheading Testing local nodes
@@ -1806,18 +1806,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'character_and_spaces_in_refs'}{'menu_child'};
@@ -1829,7 +1818,6 @@ $result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'node_next'} = $resu
$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'node_prev'} = $result_nodes{'character_and_spaces_in_refs'};
$result_nodes{'character_and_spaces_in_refs'}{'menu_child'}{'node_up'} = $result_nodes{'character_and_spaces_in_refs'};
$result_nodes{'character_and_spaces_in_refs'}{'node_next'} = $result_nodes{'character_and_spaces_in_refs'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'character_and_spaces_in_refs'};
$result_menus{'character_and_spaces_in_refs'} = {
'cmdname' => 'node',
@@ -1911,7 +1899,7 @@ Testing distant nodes
---------------------
*note (manual)a node:: *note (manual)::: *note (manual)top:: *note
-(texinfo)Cross References:: *note (../manual/doc.texi)node::
+(texinfo)Cross References:: *note (../manual/doc)node::
Testing local nodes
-------------------
@@ -1944,12 +1932,17 @@ File: , Node: local node, Prev: /;<=>?[\\]^_`|~, Up: other nodes

Tag Table:
Node: Top27
-Node: other nodes421
-Node: !_"#$%&\'()*+-.602
-Node: /;<=>?[\\]^_`|~696
-Node: local node789
+Node: other nodes416
+Node: !_"#$%&\'()*+-.597
+Node: /;<=>?[\\]^_`|~691
+Node: local node784

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'character_and_spaces_in_refs'} = [
@@ -2003,7 +1996,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#other-nodes" accesskey="n" rel="next">other nodes</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#other-nodes" accesskey="n" rel="next">other nodes</a> &nbsp; </p>
</div>
<span id="Test-refs"></span><h1 class="top">Test refs</h1>
@@ -2018,7 +2011,7 @@ Next: <a href="#other-nodes" accesskey="n" rel="next">other nodes</a>, Up: <a hr
<a href="manual.html#g_t_003a">(manual):</a>
<a href="manual.html#Top">(manual)top</a>
<a href="texinfo.html#Cross-References">(texinfo)Cross References</a>
-<a href="doc.html#node">(../manual/doc.texi)node</a>
+<a href="doc.html#node">(../manual/doc)node</a>
</p>
<span id="Testing-local-nodes"></span><h4 class="subheading">Testing local nodes</h4>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
index 29878c2fc6..fac9dbb3a5 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
@@ -481,7 +481,7 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
'contents' => [
{
'parent' => {},
- 'text' => '../manual/doc.texi'
+ 'text' => '../manual/doc'
}
],
'extra' => {
@@ -1675,7 +1675,7 @@ $result_texis{'character_and_spaces_in_refs_out'} = '@node Top
@ref{:,,,manual}
@ref{ top ,,, manual}
@ref{(texinfo)Cross References}
-@ref{node,,, ../manual/doc.texi}
+@ref{node,,, ../manual/doc}
@subheading Testing local nodes
@@ -1870,18 +1870,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'};
@@ -1893,7 +1882,6 @@ $result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'node_next'} = $
$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'node_prev'} = $result_nodes{'character_and_spaces_in_refs_out'};
$result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'}{'node_up'} = $result_nodes{'character_and_spaces_in_refs_out'};
$result_nodes{'character_and_spaces_in_refs_out'}{'node_next'} = $result_nodes{'character_and_spaces_in_refs_out'}{'menu_child'};
-$result_nodes{'character_and_spaces_in_refs_out'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'character_and_spaces_in_refs_out'};
$result_menus{'character_and_spaces_in_refs_out'} = {
'cmdname' => 'node',
@@ -2093,17 +2081,6 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
'Forward' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {},
@@ -2171,7 +2148,6 @@ $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'Forward'} = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'};
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'character_and_spaces_in_refs_out'}[0];
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'element_command'} = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'};
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'} = $result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'};
@@ -2187,7 +2163,6 @@ $result_directions_text{'character_and_spaces_in_refs_out'} = 'element: @node To
Forward: @node other nodes
NodeForward: @node other nodes
NodeNext: @node other nodes
- NodeUp: (dir)
This: @node Top
element: @node other nodes
Back: @node Top
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
index ea8021af0e..a348ab9adf 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="!_&quot;#$%&amp;'()*+-. (Test refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="other-nodes.html#other-nodes" rel="up" title="other nodes">
-<link href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" rel="next" title="/;&lt;=&gt;?[\]^_`|~">
-<link href="other-nodes.html#other-nodes" rel="prev" title="other nodes">
+<link href="index.html" rel="start" title="Top">
+<link href="other-nodes.html" rel="up" title="other nodes">
+<link href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" rel="next" title="/;&lt;=&gt;?[\]^_`|~">
+<link href="other-nodes.html" rel="prev" title="other nodes">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e"></span><div class="header">
<p>
-Next: <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" accesskey="n" rel="next">/;&lt;=&gt;?[\]^_`|~</a>, Previous: <a href="other-nodes.html#other-nodes" accesskey="p" rel="prev">other nodes</a>, Up: <a href="other-nodes.html#other-nodes" accesskey="u" rel="up">other nodes</a> &nbsp; </p>
+Next: <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" accesskey="n" rel="next">/;&lt;=&gt;?[\]^_`|~</a>, Previous: <a href="other-nodes.html" accesskey="p" rel="prev">other nodes</a>, Up: <a href="other-nodes.html" accesskey="u" rel="up">other nodes</a> &nbsp; </p>
</div>
<hr>
<h4 class="node-heading">!_&quot;#$%&amp;'()*+-.</h4>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
index 76b1206928..64ff658aca 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="/;&lt;=&gt;?[\]^_`|~ (Test refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="other-nodes.html#other-nodes" rel="up" title="other nodes">
-<link href="local-node.html#local-node" rel="next" title="local node">
-<link href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" rel="prev" title="!_&quot;#$%&amp;'()*+-.">
+<link href="index.html" rel="start" title="Top">
+<link href="other-nodes.html" rel="up" title="other nodes">
+<link href="local-node.html" rel="next" title="local node">
+<link href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" rel="prev" title="!_&quot;#$%&amp;'()*+-.">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e"></span><div class="header">
<p>
-Next: <a href="local-node.html#local-node" accesskey="n" rel="next">local node</a>, Previous: <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" accesskey="p" rel="prev">!_&quot;#$%&amp;'()*+-.</a>, Up: <a href="other-nodes.html#other-nodes" accesskey="u" rel="up">other nodes</a> &nbsp; </p>
+Next: <a href="local-node.html" accesskey="n" rel="next">local node</a>, Previous: <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" accesskey="p" rel="prev">!_&quot;#$%&amp;'()*+-.</a>, Up: <a href="other-nodes.html" accesskey="u" rel="up">other nodes</a> &nbsp; </p>
</div>
<hr>
<h4 class="node-heading">/;&lt;=&gt;?[\]^_`|~</h4>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html
index 77762898e1..04ff36cccb 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/index.html
@@ -10,8 +10,7 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="other-nodes.html#other-nodes" rel="next" title="other nodes">
+<link href="other-nodes.html" rel="next" title="other nodes">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -37,13 +36,13 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="other-nodes.html#other-nodes" accesskey="n" rel="next">other nodes</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="other-nodes.html" accesskey="n" rel="next">other nodes</a> &nbsp; </p>
</div>
<hr>
<span id="Test-refs"></span><h1 class="top">Test refs</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="other-nodes.html#other-nodes" accesskey="1">other nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="other-nodes.html" accesskey="1">other nodes</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -53,19 +52,19 @@ Next: <a href="other-nodes.html#other-nodes" accesskey="n" rel="next">other node
<a href="../manual/_003a.html#g_t_003a">(manual):</a>
<a href="../manual/index.html#Top">(manual)top</a>
<a href="../texinfo/Cross-References.html#Cross-References">(texinfo)Cross References</a>
-<a href="../doc/node.html#node">(../manual/doc.texi)node</a>
+<a href="../doc/node.html#node">(../manual/doc)node</a>
</p>
<span id="Testing-local-nodes"></span><h4 class="subheading">Testing local nodes</h4>
-<p><a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e">!_&quot;#$%&amp;'()*+-.</a>
-<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e">/;&lt;=&gt;?[\]^_`|~</a>
+<p><a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html">!_&quot;#$%&amp;'()*+-.</a>
+<a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html">/;&lt;=&gt;?[\]^_`|~</a>
<a href="#Top">Top</a>
-<a href="local-node.html#local-node">local node</a>
+<a href="local-node.html">local node</a>
</p>
<hr>
<div class="header">
<p>
-Next: <a href="other-nodes.html#other-nodes" accesskey="n" rel="next">other nodes</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="other-nodes.html" accesskey="n" rel="next">other nodes</a> &nbsp; </p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
index 9fa060e59b..2619b390de 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/local-node.html
@@ -9,9 +9,9 @@
<meta name="keywords" content="local node (Test refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="other-nodes.html#other-nodes" rel="up" title="other nodes">
-<link href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" rel="prev" title="/;&lt;=&gt;?[\]^_`|~">
+<link href="index.html" rel="start" title="Top">
+<link href="other-nodes.html" rel="up" title="other nodes">
+<link href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" rel="prev" title="/;&lt;=&gt;?[\]^_`|~">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -37,7 +37,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="local-node"></span><div class="header">
<p>
-Previous: <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" accesskey="p" rel="prev">/;&lt;=&gt;?[\]^_`|~</a>, Up: <a href="other-nodes.html#other-nodes" accesskey="u" rel="up">other nodes</a> &nbsp; </p>
+Previous: <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" accesskey="p" rel="prev">/;&lt;=&gt;?[\]^_`|~</a>, Up: <a href="other-nodes.html" accesskey="u" rel="up">other nodes</a> &nbsp; </p>
</div>
<hr>
<h4 class="node-heading">local node</h4>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html
index c592fde62c..95d6d05fc0 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs_out/res_html/other-nodes.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="other nodes (Test refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" rel="next" title="!_&quot;#$%&amp;'()*+-.">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" rel="next" title="!_&quot;#$%&amp;'()*+-.">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,17 +38,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="other-nodes"></span><div class="header">
<p>
-Next: <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" accesskey="n" rel="next">!_&quot;#$%&amp;'()*+-.</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" accesskey="n" rel="next">!_&quot;#$%&amp;'()*+-.</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<span id="Chapter-with-nodes"></span><h2 class="chapter">1 Chapter with nodes</h2>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html#g_t_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e" accesskey="1">!_&quot;#$%&amp;'()*+-.</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e.html" accesskey="1">!_&quot;#$%&amp;'()*+-.</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html#g_t_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e" accesskey="2">/;&lt;=&gt;?[\]^_`|~</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e.html" accesskey="2">/;&lt;=&gt;?[\]^_`|~</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="local-node.html#local-node" accesskey="3">local node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="local-node.html" accesskey="3">local node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_document_begin.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_document_begin.pl
index 2fc3e94341..db1918bc26 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -327,20 +327,8 @@ $result_nodes{'contents_at_document_begin'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'contents_at_document_begin'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'contents_at_document_begin'};
$result_menus{'contents_at_document_begin'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document.pl
index 5dadb12d06..76d94c9fbe 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document.pl
@@ -327,20 +327,8 @@ $result_nodes{'contents_at_end_document'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'contents_at_end_document'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'contents_at_end_document'};
$result_menus{'contents_at_end_document'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document_after_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document_after_node.pl
index e5963045ba..baac3b4643 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document_after_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_at_end_document_after_node.pl
@@ -580,23 +580,11 @@ $result_nodes{'contents_at_end_document_after_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'contents_at_end_document_after_node'}{'menu_child'}{'node_prev'} = $result_nodes{'contents_at_end_document_after_node'};
$result_nodes{'contents_at_end_document_after_node'}{'menu_child'}{'node_up'} = $result_nodes{'contents_at_end_document_after_node'};
$result_nodes{'contents_at_end_document_after_node'}{'node_next'} = $result_nodes{'contents_at_end_document_after_node'}{'menu_child'};
-$result_nodes{'contents_at_end_document_after_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'contents_at_end_document_after_node'};
$result_menus{'contents_at_end_document_after_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_in_document.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_in_document.pl
index e1ff7f38df..348120eb8b 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_in_document.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_in_document.pl
@@ -327,20 +327,8 @@ $result_nodes{'contents_in_document'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'contents_in_document'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'contents_in_document'};
$result_menus{'contents_in_document'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_no_section.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_no_section.pl
index 013e935f1c..4dcba666b4 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_no_section.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_no_section.pl
@@ -201,20 +201,8 @@ $result_nodes{'contents_no_section'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'contents_no_section'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'contents_no_section'};
$result_menus{'contents_no_section'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_with_only_top_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_with_only_top_node.pl
index f5b0ceb6f9..856eb1ed6e 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/contents_with_only_top_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/contents_with_only_top_node.pl
@@ -114,20 +114,8 @@ $result_nodes{'contents_with_only_top_node'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'contents_with_only_top_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'contents_with_only_top_node'};
$result_menus{'contents_with_only_top_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl
index 304f44cb8a..5e5878947f 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -839,6 +839,11 @@ Ref: anchor151
Ref: float163

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'double_node_anchor_float'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/double_part.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/double_part.pl
index 0df91e5ac8..8fe335cb45 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/double_part.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/double_part.pl
@@ -636,23 +636,11 @@ $result_nodes{'double_part'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'double_part'}{'menu_child'}{'node_prev'} = $result_nodes{'double_part'};
$result_nodes{'double_part'}{'menu_child'}{'node_up'} = $result_nodes{'double_part'};
$result_nodes{'double_part'}{'node_next'} = $result_nodes{'double_part'}{'menu_child'};
-$result_nodes{'double_part'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'double_part'};
$result_menus{'double_part'} = {
'cmdname' => 'node',
@@ -782,17 +770,6 @@ $result_elements{'double_part'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -831,7 +808,6 @@ $result_elements{'double_part'}[0]{'extra'}{'directions'}{'Forward'} = $result_e
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'double_part'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'double_part'}[0];
$result_elements{'double_part'}[0]{'extra'}{'first_in_page'} = $result_elements{'double_part'}[0];
$result_elements{'double_part'}[0]{'extra'}{'node'} = $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
@@ -847,7 +823,6 @@ $result_directions_text{'double_part'} = 'element: @top top
Next: @part part first
NodeForward: @chapter chapter after 2 parts
NodeNext: @chapter chapter after 2 parts
- NodeUp: (dir)
This: @top top
element: @part part first
Back: @top top
@@ -915,7 +890,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#node-chapter" accesskey="n" rel="next">node chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#node-chapter" accesskey="n" rel="next">node chapter</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -948,7 +923,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
';
-$result_converted{'xml'}->{'double_part'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">node chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'double_part'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">node chapter</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/double_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/double_top.pl
index 0f3b72ea0c..f9f830af07 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/double_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/double_top.pl
@@ -308,7 +308,7 @@ $result_errors{'double_top'} = [
$result_converted{'info'}->{'double_top'} = 'This is , produced from .

-File: , Node: Top, Next: Top
+File: , Node: Top, Next: Top, Up: (dir)
.
@@ -317,6 +317,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/empty_ref_arg.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/empty_ref_arg.pl
index d2a40c6b21..c84668a32f 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/empty_ref_arg.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/empty_ref_arg.pl
@@ -453,20 +453,8 @@ $result_nodes{'empty_ref_arg'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'empty_ref_arg'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'empty_ref_arg'};
$result_menus{'empty_ref_arg'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/empty_top_node_up.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/empty_top_node_up.pl
index b28c4274d3..0dea1bf983 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/empty_top_node_up.pl
@@ -357,18 +357,11 @@ $result_nodes{'empty_top_node_up'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'empty_top_node_up'}{'menu_child'}{'node_prev'} = $result_nodes{'empty_top_node_up'};
$result_nodes{'empty_top_node_up'}{'menu_child'}{'node_up'} = $result_nodes{'empty_top_node_up'};
$result_nodes{'empty_top_node_up'}{'node_next'} = $result_nodes{'empty_top_node_up'}{'menu_child'};
-$result_nodes{'empty_top_node_up'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'empty_top_node_up'};
$result_menus{'empty_top_node_up'} = {
'cmdname' => 'node',
@@ -416,6 +409,11 @@ Node: Top27
Node: first127

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_labels.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_labels.pl
index fc642adfa5..2afacd3895 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_labels.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_labels.pl
@@ -516,22 +516,10 @@ $result_nodes{'equivalent_labels'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'equivalent_labels'}{'menu_child'}{'node_prev'} = $result_nodes{'equivalent_labels'};
$result_nodes{'equivalent_labels'}{'node_next'} = $result_nodes{'equivalent_labels'}{'menu_child'};
-$result_nodes{'equivalent_labels'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'equivalent_labels'};
$result_menus{'equivalent_labels'} = {
'cmdname' => 'node',
@@ -659,6 +647,11 @@ Ref: anch74
Ref: floa77

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_nodes.pl
index 3e711e619d..5ad04e9fcc 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/equivalent_nodes.pl
@@ -485,7 +485,7 @@ $result_errors{'equivalent_nodes'} = [
$result_converted{'info'}->{'equivalent_nodes'} = 'This is , produced from .

-File: , Node: Top, Next: node
+File: , Node: Top, Next: node, Up: (dir)
* Menu:
@@ -499,9 +499,14 @@ File: , Node: node, Up: Top

Tag Table:
Node: Top27
-Node: node83
+Node: node95

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/explicit_node_directions.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/explicit_node_directions.pl
index 03c5ccb754..ee524fb91b 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/explicit_node_directions.pl
@@ -596,25 +596,13 @@ $result_nodes{'explicit_node_directions'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'explicit_node_directions'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'explicit_node_directions'}{'menu_child'};
$result_nodes{'explicit_node_directions'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'explicit_node_directions'};
$result_nodes{'explicit_node_directions'}{'menu_child'}{'node_prev'} = $result_nodes{'explicit_node_directions'};
$result_nodes{'explicit_node_directions'}{'menu_child'}{'node_up'} = $result_nodes{'explicit_node_directions'};
$result_nodes{'explicit_node_directions'}{'node_next'} = $result_nodes{'explicit_node_directions'}{'menu_child'};
-$result_nodes{'explicit_node_directions'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'explicit_node_directions'};
$result_menus{'explicit_node_directions'} = {
'cmdname' => 'node',
@@ -718,17 +706,6 @@ $result_elements{'explicit_node_directions'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {},
@@ -759,7 +736,6 @@ $result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'explicit_node_directions'}[0];
$result_elements{'explicit_node_directions'}[0]{'extra'}{'element_command'} = $result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'} = $result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
@@ -772,7 +748,6 @@ $result_directions_text{'explicit_node_directions'} = 'element: @node Top
Forward: @node second node
NodeForward: @node second node
NodeNext: @node second node
- NodeUp: (dir)
This: @node Top
element: @node second node
Back: @node Top
@@ -819,6 +794,11 @@ Node: second node131
Node: third node215

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -859,7 +839,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#second-node" accesskey="n" rel="next">second node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
<p>Top node
@@ -904,7 +884,7 @@ $result_converted_errors{'html'}->{'explicit_node_directions'} = [
-$result_converted{'xml'}->{'explicit_node_directions'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">second node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'explicit_node_directions'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">second node</nodenext></node>
<para>Top node
</para><menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator="::">second node</menunode><menudescription><pre xml:space="preserve">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/internal_top_node_up.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/internal_top_node_up.pl
index 36bf168780..5c6565dee3 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/internal_top_node_up.pl
@@ -380,19 +380,11 @@ $result_nodes{'internal_top_node_up'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'normalized' => 'node_0040-node',
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'internal_top_node_up'}{'menu_child'}{'node_prev'} = $result_nodes{'internal_top_node_up'};
$result_nodes{'internal_top_node_up'}{'menu_child'}{'node_up'} = $result_nodes{'internal_top_node_up'};
$result_nodes{'internal_top_node_up'}{'node_next'} = $result_nodes{'internal_top_node_up'}{'menu_child'};
-$result_nodes{'internal_top_node_up'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'internal_top_node_up'};
$result_menus{'internal_top_node_up'} = {
'cmdname' => 'node',
@@ -455,13 +447,6 @@ $result_elements{'internal_top_node_up'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'normalized' => 'node_0040-node',
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- },
'This' => {}
},
'element_command' => {},
@@ -488,7 +473,6 @@ $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'e
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'internal_top_node_up'}[0];
$result_elements{'internal_top_node_up'}[0]{'extra'}{'element_command'} = $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'internal_top_node_up'}[0]{'extra'}{'node'} = $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
@@ -500,7 +484,6 @@ $result_directions_text{'internal_top_node_up'} = 'element: @node Top
Forward: @node first
NodeForward: @node first
NodeNext: @node first
- NodeUp: No associated command (type top_node_up)
This: @node Top
element: @node first
Back: @node Top
@@ -515,7 +498,7 @@ element: @node first
$result_converted{'info'}->{'internal_top_node_up'} = 'This is , produced from .

-File: , Node: Top, Next: first, Up: node@ node
+File: , Node: Top, Next: first, Up: node@@ node
internal top node up
********************
@@ -531,9 +514,14 @@ File: , Node: first, Prev: Top, Up: Top

Tag Table:
Node: Top27
-Node: first143
+Node: first144

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -574,7 +562,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="#node_0040-node" accesskey="u" rel="up">node@ node</a> &nbsp; </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
</div>
<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/lone_Top_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/lone_Top_node.pl
index c244d0f850..fd8d9df649 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/lone_Top_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/lone_Top_node.pl
@@ -370,23 +370,11 @@ $result_nodes{'lone_Top_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'lone_Top_node'}{'menu_child'}{'node_prev'} = $result_nodes{'lone_Top_node'};
$result_nodes{'lone_Top_node'}{'menu_child'}{'node_up'} = $result_nodes{'lone_Top_node'};
$result_nodes{'lone_Top_node'}{'node_next'} = $result_nodes{'lone_Top_node'}{'menu_child'};
-$result_nodes{'lone_Top_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'lone_Top_node'};
$result_menus{'lone_Top_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/loop_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/loop_nodes.pl
index 747272dfc0..fc7deac539 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/loop_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/loop_nodes.pl
@@ -869,25 +869,13 @@ $result_nodes{'loop_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'loop_nodes'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'loop_nodes'}{'menu_child'}{'menu_child'};
$result_nodes{'loop_nodes'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'loop_nodes'}{'menu_child'};
$result_nodes{'loop_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'loop_nodes'};
$result_nodes{'loop_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'loop_nodes'}{'menu_child'}{'menu_child'}{'menu_child'};
$result_nodes{'loop_nodes'}{'node_next'} = $result_nodes{'loop_nodes'}{'menu_child'};
-$result_nodes{'loop_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'loop_nodes'};
$result_menus{'loop_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/lowered_subsubsection.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/lowered_subsubsection.pl
index 3d2e680cd3..7727b599bb 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/lowered_subsubsection.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/lowered_subsubsection.pl
@@ -1820,18 +1820,7 @@ $result_nodes{'lowered_subsubsection'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'menu_child'}{'node_prev'} = $result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'};
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'menu_child'};
@@ -1844,7 +1833,6 @@ $result_nodes{'lowered_subsubsection'}{'menu_child'}{'menu_child'}{'node_up'} =
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'node_prev'} = $result_nodes{'lowered_subsubsection'};
$result_nodes{'lowered_subsubsection'}{'menu_child'}{'node_up'} = $result_nodes{'lowered_subsubsection'};
$result_nodes{'lowered_subsubsection'}{'node_next'} = $result_nodes{'lowered_subsubsection'}{'menu_child'};
-$result_nodes{'lowered_subsubsection'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'lowered_subsubsection'};
$result_menus{'lowered_subsubsection'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl
index 87a32b7f7e..c2cf7f2078 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl
@@ -1698,18 +1698,7 @@ $result_nodes{'more_sections_than_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'};
$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'};
@@ -1719,7 +1708,6 @@ $result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_next'}{'node_up'}
$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'more_sections_than_nodes'};
$result_nodes{'more_sections_than_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'more_sections_than_nodes'};
$result_nodes{'more_sections_than_nodes'}{'node_next'} = $result_nodes{'more_sections_than_nodes'}{'menu_child'};
-$result_nodes{'more_sections_than_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'more_sections_than_nodes'};
$result_menus{'more_sections_than_nodes'} = {
'cmdname' => 'node',
@@ -1785,7 +1773,7 @@ $result_errors{'more_sections_than_nodes'} = [];
-$result_converted{'xml'}->{'more_sections_than_nodes'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">n c2</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'more_sections_than_nodes'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">n c2</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/next_in_menu_is_below.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/next_in_menu_is_below.pl
index 5f94ac94d8..afb4eab9dd 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -1060,18 +1060,7 @@ $result_nodes{'next_in_menu_is_below'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_prev'} = $result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'};
$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'};
@@ -1080,7 +1069,6 @@ $result_nodes{'next_in_menu_is_below'}{'menu_child'}{'menu_child'}{'node_up'} =
$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'node_prev'} = $result_nodes{'next_in_menu_is_below'};
$result_nodes{'next_in_menu_is_below'}{'menu_child'}{'node_up'} = $result_nodes{'next_in_menu_is_below'};
$result_nodes{'next_in_menu_is_below'}{'node_next'} = $result_nodes{'next_in_menu_is_below'}{'menu_child'};
-$result_nodes{'next_in_menu_is_below'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'next_in_menu_is_below'};
$result_menus{'next_in_menu_is_below'} = {
'cmdname' => 'node',
@@ -1202,6 +1190,11 @@ Node: section214
Node: subsection323

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1242,7 +1235,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/next_no_prev_to_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/next_no_prev_to_node.pl
index 5d94d704ee..acca43d13d 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -509,24 +509,12 @@ $result_nodes{'next_no_prev_to_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'next_no_prev_to_node'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'next_no_prev_to_node'};
$result_nodes{'next_no_prev_to_node'}{'menu_child'}{'node_prev'} = $result_nodes{'next_no_prev_to_node'};
$result_nodes{'next_no_prev_to_node'}{'menu_child'}{'node_up'} = $result_nodes{'next_no_prev_to_node'};
$result_nodes{'next_no_prev_to_node'}{'node_next'} = $result_nodes{'next_no_prev_to_node'}{'menu_child'};
-$result_nodes{'next_no_prev_to_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'next_no_prev_to_node'};
$result_menus{'next_no_prev_to_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/no_element.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/no_element.pl
index 381efa20d3..fbf491ac94 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/no_element.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/no_element.pl
@@ -1029,7 +1029,7 @@ ul.no-bullet {list-style: none}
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>In footnote.
</p>
<span id="Anchor-in-footnote"></span>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/no_menu.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/no_menu.pl
index c6219f87a8..e298a1280e 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/no_menu.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/no_menu.pl
@@ -469,20 +469,8 @@ $result_nodes{'no_menu'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'no_menu'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'no_menu'};
$result_menus{'no_menu'} = {
'cmdname' => 'node',
@@ -534,6 +522,11 @@ Node: c2145
Node: c3209

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -574,7 +567,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+ &nbsp; </p>
</div>
<span id="SEC_Top"></span>
<table class="menu" border="0" cellspacing="0">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/node_nested_parentheses.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/node_nested_parentheses.pl
index 975d8e68ef..2045f6405b 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -547,21 +547,9 @@ $result_nodes{'node_nested_parentheses'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'node_nested_parentheses'}{'node_next'} = $result_nodes{'node_nested_parentheses'}{'menu_child'};
-$result_nodes{'node_nested_parentheses'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_nested_parentheses'};
$result_menus{'node_nested_parentheses'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index 5c3d3b1483..05d55622ff 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -776,25 +776,13 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'node_part_chapter_after_chapter'}{'menu_child'};
$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'node_part_chapter_after_chapter'};
$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'}{'node_prev'} = $result_nodes{'node_part_chapter_after_chapter'};
$result_nodes{'node_part_chapter_after_chapter'}{'menu_child'}{'node_up'} = $result_nodes{'node_part_chapter_after_chapter'};
$result_nodes{'node_part_chapter_after_chapter'}{'node_next'} = $result_nodes{'node_part_chapter_after_chapter'}{'menu_child'};
-$result_nodes{'node_part_chapter_after_chapter'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_part_chapter_after_chapter'};
$result_menus{'node_part_chapter_after_chapter'} = {
'cmdname' => 'node',
@@ -937,17 +925,6 @@ $result_elements{'node_part_chapter_after_chapter'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -991,7 +968,6 @@ $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'F
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'node_part_chapter_after_chapter'}[0];
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'} = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'section'} = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'element_command'};
@@ -1006,7 +982,6 @@ $result_directions_text{'node_part_chapter_after_chapter'} = 'element: @top top
Next: @chapter chapter with part node
NodeForward: @chapter chapter node
NodeNext: @chapter chapter node
- NodeUp: (dir)
This: @top top
element: @chapter chapter node
Back: @top top
@@ -1079,6 +1054,11 @@ Node: chapter node140
Node: part chapter node250

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1120,7 +1100,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -1175,7 +1155,7 @@ Previous: <a href="#chapter-node" accesskey="p" rel="prev">chapter node</a>, Up:
';
-$result_converted{'xml'}->{'node_part_chapter_after_chapter'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'node_part_chapter_after_chapter'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl
index 39d77f39b5..51fc327265 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -520,23 +520,11 @@ $result_nodes{'node_part_chapter_after_top'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'node_part_chapter_after_top'}{'menu_child'}{'node_prev'} = $result_nodes{'node_part_chapter_after_top'};
$result_nodes{'node_part_chapter_after_top'}{'menu_child'}{'node_up'} = $result_nodes{'node_part_chapter_after_top'};
$result_nodes{'node_part_chapter_after_top'}{'node_next'} = $result_nodes{'node_part_chapter_after_top'}{'menu_child'};
-$result_nodes{'node_part_chapter_after_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_part_chapter_after_top'};
$result_menus{'node_part_chapter_after_top'} = {
'cmdname' => 'node',
@@ -626,17 +614,6 @@ $result_elements{'node_part_chapter_after_top'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -665,7 +642,6 @@ $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'Forwa
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'node_part_chapter_after_top'}[0];
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'node'} = $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'section'} = $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'element_command'};
@@ -679,7 +655,6 @@ $result_directions_text{'node_part_chapter_after_top'} = 'element: @top top
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
- NodeUp: (dir)
This: @top top
element: @chapter chapter
Back: @top top
@@ -716,6 +691,11 @@ Node: Top27
Node: chapter node118

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -756,7 +736,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -783,7 +763,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
';
-$result_converted{'xml'}->{'node_part_chapter_after_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'node_part_chapter_after_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/node_too_much_args.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/node_too_much_args.pl
index d1240c3cdf..1d3b1e714f 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/node_too_much_args.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/node_too_much_args.pl
@@ -78,8 +78,7 @@ $result_trees{'node_too_much_args'} = {
{
'manual_content' => [
{}
- ],
- 'top_node_up' => {}
+ ]
}
],
'normalized' => 'Top',
@@ -107,7 +106,6 @@ $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3]{'parent'} = $resul
$result_trees{'node_too_much_args'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'node_too_much_args'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'node_too_much_args'}{'contents'}[1]{'extra'}{'node_content'};
$result_trees{'node_too_much_args'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0] = $result_trees{'node_too_much_args'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'node_too_much_args'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'top_node_up'} = $result_trees{'node_too_much_args'}{'contents'}[1];
$result_trees{'node_too_much_args'}{'contents'}[1]{'parent'} = $result_trees{'node_too_much_args'};
$result_texis{'node_too_much_args'} = '@node Top, , , (dir)';
@@ -129,12 +127,10 @@ $result_nodes{'node_too_much_args'} = {
{
'text' => 'dir'
}
- ],
- 'top_node_up' => {}
+ ]
}
}
};
-$result_nodes{'node_too_much_args'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_too_much_args'};
$result_menus{'node_too_much_args'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
index 91101b0f99..8027555fd0 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/node_up_direction_for_top_with_manual.pl
@@ -162,6 +162,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/node_up_external_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/node_up_external_node.pl
index 43d1f84a9f..a2a2c7bf13 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/node_up_external_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/node_up_external_node.pl
@@ -432,21 +432,9 @@ $result_nodes{'node_up_external_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'node_up_external_node'}{'node_next'} = $result_nodes{'node_up_external_node'}{'menu_child'};
-$result_nodes{'node_up_external_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_up_external_node'};
$result_menus{'node_up_external_node'} = {
'cmdname' => 'node',
@@ -552,17 +540,6 @@ $result_elements{'node_up_external_node'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {},
@@ -580,7 +557,6 @@ $result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'node_up_external_node'}[0];
$result_elements{'node_up_external_node'}[0]{'extra'}{'element_command'} = $result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'node_up_external_node'}[0]{'extra'}{'node'} = $result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
@@ -592,7 +568,6 @@ $result_directions_text{'node_up_external_node'} = 'element: @node Top
Forward: @node first
NodeForward: @node first
NodeNext: @node first
- NodeUp: (dir)
This: @node Top
element: @node first
Back: @node Top
@@ -645,7 +620,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl
index 7322634259..2dbe8311eb 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl
@@ -1140,18 +1140,7 @@ $result_nodes{'nodename_parentheses'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'};
$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'nodename_parentheses'};
@@ -1160,7 +1149,6 @@ $result_nodes{'nodename_parentheses'}{'menu_child'}{'node_next'}{'node_up'} = $r
$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_prev'} = $result_nodes{'nodename_parentheses'};
$result_nodes{'nodename_parentheses'}{'menu_child'}{'node_up'} = $result_nodes{'nodename_parentheses'};
$result_nodes{'nodename_parentheses'}{'node_next'} = $result_nodes{'nodename_parentheses'}{'menu_child'};
-$result_nodes{'nodename_parentheses'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodename_parentheses'};
$result_menus{'nodename_parentheses'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index 5522d0875d..f619e7320e 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -664,25 +664,13 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'};
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_chapter_nodes'};
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_chapter_nodes'};
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_chapter_nodes'};
$result_nodes{'nodes_after_top_before_chapter_nodes'}{'node_next'} = $result_nodes{'nodes_after_top_before_chapter_nodes'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_chapter_nodes'};
$result_menus{'nodes_after_top_before_chapter_nodes'} = {
'cmdname' => 'node',
@@ -794,17 +782,6 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {},
@@ -835,7 +812,6 @@ $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'nodes_after_top_before_chapter_nodes'}[0];
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'element_command'} = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'} = $result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
@@ -848,7 +824,6 @@ $result_directions_text{'nodes_after_top_before_chapter_nodes'} = 'element: @nod
Forward: @node second node
NodeForward: @node second node
NodeNext: @node second node
- NodeUp: (dir)
This: @node Top
element: @node second node
Back: @node Top
@@ -898,6 +873,11 @@ Node: second node131
Node: third node215

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -938,7 +918,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#second-node" accesskey="n" rel="next">second node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
<p>Top node
@@ -983,7 +963,7 @@ $result_converted_errors{'html'}->{'nodes_after_top_before_chapter_nodes'} = [
-$result_converted{'xml'}->{'nodes_after_top_before_chapter_nodes'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">second node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'nodes_after_top_before_chapter_nodes'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">second node</nodenext></node>
<para>Top node
</para><menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator="::">second node</menunode><menudescription><pre xml:space="preserve">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index bf0c42272b..815956c768 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -638,25 +638,13 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'};
$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_chapter_sections'};
$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_chapter_sections'};
$result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_chapter_sections'};
$result_nodes{'nodes_after_top_before_chapter_sections'}{'node_next'} = $result_nodes{'nodes_after_top_before_chapter_sections'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_sections'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_chapter_sections'};
$result_menus{'nodes_after_top_before_chapter_sections'} = {
'cmdname' => 'node',
@@ -793,6 +781,11 @@ Node: second node131
Node: third node215

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -833,7 +826,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#second-node" accesskey="n" rel="next">second node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
<p>Top node
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index 1e126b1f67..06a0b68025 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -664,25 +664,13 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'};
$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_section_nodes'};
$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section_nodes'};
$result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_section_nodes'};
$result_nodes{'nodes_after_top_before_section_nodes'}{'node_next'} = $result_nodes{'nodes_after_top_before_section_nodes'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_section_nodes'};
$result_menus{'nodes_after_top_before_section_nodes'} = {
'cmdname' => 'node',
@@ -795,17 +783,6 @@ $result_elements{'nodes_after_top_before_section_nodes'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {},
@@ -836,7 +813,6 @@ $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'nodes_after_top_before_section_nodes'}[0];
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'element_command'} = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'} = $result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
@@ -849,7 +825,6 @@ $result_directions_text{'nodes_after_top_before_section_nodes'} = 'element: @nod
Forward: @node second node
NodeForward: @node second node
NodeNext: @node second node
- NodeUp: (dir)
This: @node Top
element: @node second node
Back: @node Top
@@ -900,6 +875,11 @@ Node: second node131
Node: third node215

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -940,7 +920,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#second-node" accesskey="n" rel="next">second node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
<p>Top node
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index 59021dfdd4..d507e959b1 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -638,25 +638,13 @@ $result_nodes{'nodes_after_top_before_section_sections'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'};
$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'nodes_after_top_before_section_sections'};
$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'}{'node_prev'} = $result_nodes{'nodes_after_top_before_section_sections'};
$result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'}{'node_up'} = $result_nodes{'nodes_after_top_before_section_sections'};
$result_nodes{'nodes_after_top_before_section_sections'}{'node_next'} = $result_nodes{'nodes_after_top_before_section_sections'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_sections'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'nodes_after_top_before_section_sections'};
$result_menus{'nodes_after_top_before_section_sections'} = {
'cmdname' => 'node',
@@ -795,6 +783,11 @@ Node: second node131
Node: third node215

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -835,7 +828,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#second-node" accesskey="n" rel="next">second node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
<p>Top node
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index aaa897cb1a..abcd4ffd58 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -575,6 +575,11 @@ Node: first27
Node: second node101

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'nodes_no_node_top_explicit_directions'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index 0f123c359d..12930a8999 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -204,8 +204,7 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
{},
{}
],
- 'normalized' => 'GNU-manuals',
- 'top_node_up' => {}
+ 'normalized' => 'GNU-manuals'
}
],
'normalized' => 'Top',
@@ -559,7 +558,6 @@ $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[1] = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0] = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0];
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'node_content'}[1] = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'top_node_up'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1];
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0];
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'args'}[0];
@@ -691,18 +689,10 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'normalized' => 'GNU-manuals',
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'non_automatic_internal_top_node_up'}{'menu_child'}{'node_prev'} = $result_nodes{'non_automatic_internal_top_node_up'};
$result_nodes{'non_automatic_internal_top_node_up'}{'node_next'} = $result_nodes{'non_automatic_internal_top_node_up'}{'menu_child'};
-$result_nodes{'non_automatic_internal_top_node_up'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'non_automatic_internal_top_node_up'};
$result_menus{'non_automatic_internal_top_node_up'} = {
'cmdname' => 'node',
@@ -735,6 +725,15 @@ $result_errors{'non_automatic_internal_top_node_up'} = [
'type' => 'error'
},
{
+ 'error_line' => ':1: Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals\'
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals\'',
+ 'type' => 'error'
+ },
+ {
'error_line' => ':8: Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals\'
',
'file_name' => '',
@@ -783,13 +782,6 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'normalized' => 'GNU-manuals',
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- },
'This' => {}
},
'element_command' => {},
@@ -815,7 +807,6 @@ $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'non_automatic_internal_top_node_up'}[0];
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'element_command'} = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'} = $result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
@@ -827,7 +818,6 @@ $result_directions_text{'non_automatic_internal_top_node_up'} = 'element: @node
Forward: @node first
NodeForward: @node first
NodeNext: @node first
- NodeUp: No associated command (type top_node_up)
This: @node Top
element: @node first
Back: @node Top
@@ -841,7 +831,7 @@ element: @node first
$result_converted{'info'}->{'non_automatic_internal_top_node_up'} = 'This is , produced from .

-File: , Node: Top, Next: first, Up: GNU (GNU\'s Not Unix) manuals
+File: , Node: Top, Next: first, Up: @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
internal top node up
********************
@@ -857,9 +847,14 @@ File: , Node: first, Prev: Top

Tag Table:
Node: Top27
-Node: first161
+Node: first180

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -900,7 +895,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="#GNU-manuals" accesskey="u" rel="up"><acronym title="GNU&rsquo;s Not Unix">GNU</acronym> (<acronym title="GNU&rsquo;s Not Unix">GNU</acronym>\'s Not Unix) manuals</a> &nbsp; </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a> &nbsp; </p>
</div>
<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index 919bc3e415..f60f9ca3f1 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -204,8 +204,7 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
{},
{}
],
- 'normalized' => 'GNU-manuals',
- 'top_node_up' => {}
+ 'normalized' => 'GNU-manuals'
}
],
'normalized' => 'Top',
@@ -559,7 +558,6 @@ $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'n
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[1] = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0] = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0];
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'node_content'}[1] = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'top_node_up'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1];
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'line_nr'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0];
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'args'}[0];
@@ -691,18 +689,10 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'normalized' => 'GNU-manuals',
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'non_automatic_top_node_up_and_url'}{'menu_child'}{'node_prev'} = $result_nodes{'non_automatic_top_node_up_and_url'};
$result_nodes{'non_automatic_top_node_up_and_url'}{'node_next'} = $result_nodes{'non_automatic_top_node_up_and_url'}{'menu_child'};
-$result_nodes{'non_automatic_top_node_up_and_url'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'non_automatic_top_node_up_and_url'};
$result_menus{'non_automatic_top_node_up_and_url'} = {
'cmdname' => 'node',
@@ -735,6 +725,15 @@ $result_errors{'non_automatic_top_node_up_and_url'} = [
'type' => 'error'
},
{
+ 'error_line' => ':1: Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals\'
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals\'',
+ 'type' => 'error'
+ },
+ {
'error_line' => ':8: Up reference to nonexistent `@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals\'
',
'file_name' => '',
@@ -783,13 +782,6 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'normalized' => 'GNU-manuals',
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- },
'This' => {}
},
'element_command' => {},
@@ -815,7 +807,6 @@ $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'non_automatic_top_node_up_and_url'}[0];
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'element_command'} = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'} = $result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
@@ -827,7 +818,6 @@ $result_directions_text{'non_automatic_top_node_up_and_url'} = 'element: @node T
Forward: @node first
NodeForward: @node first
NodeNext: @node first
- NodeUp: No associated command (type top_node_up)
This: @node Top
element: @node first
Back: @node Top
@@ -841,7 +831,7 @@ element: @node first
$result_converted{'info'}->{'non_automatic_top_node_up_and_url'} = 'This is , produced from .

-File: , Node: Top, Next: first, Up: GNU (GNU\'s Not Unix) manuals
+File: , Node: Top, Next: first, Up: @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
internal top node up
********************
@@ -857,9 +847,14 @@ File: , Node: first, Prev: Top

Tag Table:
Node: Top27
-Node: first161
+Node: first180

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -875,6 +870,7 @@ $result_converted{'html'}->{'non_automatic_top_node_up_and_url'} = '<!DOCTYPE ht
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
+<link href="http://www.gnu.org/manual/" rel="up" title="@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -900,7 +896,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="http://www.gnu.org/manual/" accesskey="u" rel="up"><acronym title="GNU&rsquo;s Not Unix">GNU</acronym> (<acronym title="GNU&rsquo;s Not Unix">GNU</acronym>\'s Not Unix) manuals</a> &nbsp; </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="http://www.gnu.org/manual/" accesskey="u" rel="up">@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals</a> &nbsp; </p>
</div>
<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_url.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index bbf0af539f..109934a37e 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -108,8 +108,7 @@ $result_trees{'non_automatic_top_node_up_url'} = [
{
'manual_content' => [
{}
- ],
- 'top_node_up' => {}
+ ]
}
],
'normalized' => 'Top',
@@ -403,7 +402,6 @@ $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'extra'}{'nodes
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0] = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0] = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[2]{'contents'}[1];
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0] = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'top_node_up'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1];
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0];
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2];
@@ -549,14 +547,12 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
{
'text' => 'dir'
}
- ],
- 'top_node_up' => {}
+ ]
}
}
};
$result_nodes{'non_automatic_top_node_up_url'}{'menu_child'}{'node_prev'} = $result_nodes{'non_automatic_top_node_up_url'};
$result_nodes{'non_automatic_top_node_up_url'}{'node_next'} = $result_nodes{'non_automatic_top_node_up_url'}{'menu_child'};
-$result_nodes{'non_automatic_top_node_up_url'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'non_automatic_top_node_up_url'};
$result_menus{'non_automatic_top_node_up_url'} = {
'cmdname' => 'node',
@@ -654,8 +650,7 @@ $result_elements{'non_automatic_top_node_up_url'} = [
{
'text' => 'dir'
}
- ],
- 'top_node_up' => {}
+ ]
},
'type' => 'external_node'
},
@@ -684,7 +679,6 @@ $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'For
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'non_automatic_top_node_up_url'}[0];
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'element_command'} = $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'} = $result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
@@ -731,6 +725,11 @@ Node: Top27
Node: first152

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -746,6 +745,7 @@ $result_converted{'html'}->{'non_automatic_top_node_up_url'} = '<!DOCTYPE html P
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
+<link href="http://www.gnu.org/manual/" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -771,7 +771,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Previous: <a href="http://www.gnu.org/manual/" accesskey="p" rel="prev">(dir)</a>, Up: <a href="http://www.gnu.org/manual/" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a>, Previous: <a href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
</div>
<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
@@ -783,7 +783,7 @@ Next: <a href="#first" accesskey="n" rel="next">first</a>, Previous: <a href="ht
<hr>
<span id="first"></span><div class="header">
<p>
-Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="http://www.gnu.org/manual/" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
</div>
<h4 class="node-heading">first</h4>
<hr>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
index 11670a46f3..b30b509f58 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/one_node_explicit_directions_anchor.pl
@@ -299,6 +299,11 @@ Node: one node27
Ref: ref89

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'one_node_explicit_directions_anchor'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/one_subsection_and_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/one_subsection_and_node.pl
index 31bc24f3f9..77791d68d1 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/one_subsection_and_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/one_subsection_and_node.pl
@@ -169,6 +169,11 @@ Tag Table:
Node: one node27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'one_subsection_and_node'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl
index 8ceece29ef..5abe8e6b9d 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -520,23 +520,11 @@ $result_nodes{'part_chapter_after_top'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_chapter_after_top'}{'menu_child'}{'node_prev'} = $result_nodes{'part_chapter_after_top'};
$result_nodes{'part_chapter_after_top'}{'menu_child'}{'node_up'} = $result_nodes{'part_chapter_after_top'};
$result_nodes{'part_chapter_after_top'}{'node_next'} = $result_nodes{'part_chapter_after_top'}{'menu_child'};
-$result_nodes{'part_chapter_after_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_chapter_after_top'};
$result_menus{'part_chapter_after_top'} = {
'cmdname' => 'node',
@@ -616,17 +604,6 @@ $result_elements{'part_chapter_after_top'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -655,7 +632,6 @@ $result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'Forward'}
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_chapter_after_top'}[0];
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'node'} = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'section'} = $result_elements{'part_chapter_after_top'}[0]{'extra'}{'element_command'};
@@ -669,7 +645,6 @@ $result_directions_text{'part_chapter_after_top'} = 'element: @top top
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
- NodeUp: (dir)
This: @top top
element: @chapter chapter
Back: @top top
@@ -706,6 +681,11 @@ Node: Top27
Node: chapter108

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -746,7 +726,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -773,7 +753,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
';
-$result_converted{'xml'}->{'part_chapter_after_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'part_chapter_after_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_after_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_after_top.pl
index 4928831781..f55eb72dfe 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_after_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_after_top.pl
@@ -427,23 +427,11 @@ $result_nodes{'part_node_after_top'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_node_after_top'}{'menu_child'}{'node_prev'} = $result_nodes{'part_node_after_top'};
$result_nodes{'part_node_after_top'}{'menu_child'}{'node_up'} = $result_nodes{'part_node_after_top'};
$result_nodes{'part_node_after_top'}{'node_next'} = $result_nodes{'part_node_after_top'}{'menu_child'};
-$result_nodes{'part_node_after_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_node_after_top'};
$result_menus{'part_node_after_top'} = {
'cmdname' => 'node',
@@ -515,34 +503,6 @@ $result_elements{'part_node_after_top'} = [
'NodeBack' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top',
- 'spaces_before_argument' => ' '
- },
- 'menu_child' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'part-node-after-top',
- 'spaces_before_argument' => ' '
- },
- 'menu_up' => {},
- 'menu_up_hash' => {
- 'Top' => 1
- }
- }
- }
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -552,7 +512,24 @@ $result_elements{'part_node_after_top'} = [
},
'level' => 0
},
- 'node' => {},
+ 'node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'part-node-after-top',
+ 'spaces_before_argument' => ' '
+ },
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ }
+ },
'section' => {}
},
'type' => 'element'
@@ -569,9 +546,8 @@ $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'Next'} = $res
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeBack'} = $result_elements{'part_node_after_top'}[0];
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_node_after_top'}[0];
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_node_after_top'}[0];
-$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'}{'menu_child'}{'menu_up'} = $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'};
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_node_after_top'}[0];
-$result_elements{'part_node_after_top'}[0]{'extra'}{'node'} = $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'};
+$result_elements{'part_node_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'} = $result_elements{'part_node_after_top'}[0]{'extra'}{'node'};
$result_elements{'part_node_after_top'}[0]{'extra'}{'section'} = $result_elements{'part_node_after_top'}[0]{'extra'}{'element_command'};
$result_elements{'part_node_after_top'}[1] = $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
@@ -584,7 +560,6 @@ $result_directions_text{'part_node_after_top'} = 'element: @top top
NodeBack: @top top
NodeForward: @top top
NodeNext: @top top
- NodeUp: (dir)
This: @top top
element: @part part
Back: @top top
@@ -616,6 +591,11 @@ Node: Top27
Node: part node after top132

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -656,7 +636,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#part-node-after-top" accesskey="n" rel="next">part node after top</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#part-node-after-top" accesskey="n" rel="next">part node after top</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -682,7 +662,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
';
-$result_converted{'xml'}->{'part_node_after_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">part node after top</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'part_node_after_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">part node after top</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl
index a66f55b8a4..ed79877a88 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl
@@ -477,24 +477,12 @@ $result_nodes{'part_node_before_top'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_node_before_top'}{'menu_child'}{'node_next'} = $result_nodes{'part_node_before_top'};
$result_nodes{'part_node_before_top'}{'menu_child'}{'node_prev'} = $result_nodes{'part_node_before_top'};
$result_nodes{'part_node_before_top'}{'menu_child'}{'node_up'} = $result_nodes{'part_node_before_top'};
$result_nodes{'part_node_before_top'}{'node_next'} = $result_nodes{'part_node_before_top'}{'menu_child'};
-$result_nodes{'part_node_before_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_node_before_top'};
$result_menus{'part_node_before_top'} = {
'cmdname' => 'node',
@@ -545,34 +533,6 @@ $result_elements{'part_node_before_top'} = [
'NodeBack' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top',
- 'spaces_before_argument' => ' '
- },
- 'menu_child' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'part-node-before-top',
- 'spaces_before_argument' => ' '
- },
- 'menu_up' => {},
- 'menu_up_hash' => {
- 'Top' => 1
- }
- }
- }
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -589,7 +549,24 @@ $result_elements{'part_node_before_top'} = [
},
'level' => 0
},
- 'node' => {},
+ 'node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'part-node-before-top',
+ 'spaces_before_argument' => ' '
+ },
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ }
+ },
'section' => {}
},
'type' => 'element'
@@ -598,9 +575,8 @@ $result_elements{'part_node_before_top'} = [
$result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeBack'} = $result_elements{'part_node_before_top'}[0];
$result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_node_before_top'}[0];
$result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_node_before_top'}[0];
-$result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'}{'menu_child'}{'menu_up'} = $result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'};
$result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_node_before_top'}[0];
-$result_elements{'part_node_before_top'}[0]{'extra'}{'node'} = $result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'};
+$result_elements{'part_node_before_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'} = $result_elements{'part_node_before_top'}[0]{'extra'}{'node'};
$result_elements{'part_node_before_top'}[0]{'extra'}{'section'} = $result_elements{'part_node_before_top'}[0]{'extra'}{'element_command'};
@@ -609,7 +585,6 @@ $result_directions_text{'part_node_before_top'} = 'element: @top top
NodeBack: @top top
NodeForward: @top top
NodeNext: @top top
- NodeUp: (dir)
This: @top top
';
@@ -635,6 +610,11 @@ Node: part node before top27
Node: Top100

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -681,7 +661,7 @@ Next: <a href="#Top" accesskey="n" rel="next">Top</a>, Previous: <a href="#Top"
<hr>
<span id="part"></span><div class="header">
<p>
-Next: <a href="#part-node-before-top" accesskey="n" rel="next">part node before top</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#part-node-before-top" accesskey="n" rel="next">part node before top</a> &nbsp; </p>
</div>
<h1 class="part">part</h1>
<hr>
@@ -705,7 +685,7 @@ $result_converted{'xml'}->{'part_node_before_top'} = '<node name="part-node-befo
<part spaces=" "><sectiontitle>part</sectiontitle>
</part>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">part node before top</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">part node before top</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl
index 2fd41b13b4..ed3c5d202e 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -781,25 +781,13 @@ $result_nodes{'part_node_chapter_after_top'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_node_chapter_after_top'}{'menu_child'}{'node_next'}{'node_next'} = $result_nodes{'part_node_chapter_after_top'}{'menu_child'};
$result_nodes{'part_node_chapter_after_top'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'part_node_chapter_after_top'};
$result_nodes{'part_node_chapter_after_top'}{'menu_child'}{'node_prev'} = $result_nodes{'part_node_chapter_after_top'};
$result_nodes{'part_node_chapter_after_top'}{'menu_child'}{'node_up'} = $result_nodes{'part_node_chapter_after_top'};
$result_nodes{'part_node_chapter_after_top'}{'node_next'} = $result_nodes{'part_node_chapter_after_top'}{'menu_child'};
-$result_nodes{'part_node_chapter_after_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_node_chapter_after_top'};
$result_menus{'part_node_chapter_after_top'} = {
'cmdname' => 'node',
@@ -906,17 +894,6 @@ $result_elements{'part_node_chapter_after_top'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -948,7 +925,6 @@ $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'Forwa
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_node_chapter_after_top'}[0];
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'} = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'section'} = $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'element_command'};
@@ -962,7 +938,6 @@ $result_directions_text{'part_node_chapter_after_top'} = 'element: @top top
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
- NodeUp: (dir)
This: @top top
element: @chapter chapter
Back: @top top
@@ -1007,6 +982,11 @@ Node: a node after part140
Node: chapter239

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1047,7 +1027,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#a-node-after-part" accesskey="n" rel="next">a node after part</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#a-node-after-part" accesskey="n" rel="next">a node after part</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -1084,7 +1064,7 @@ Next: <a href="#a-node-after-part" accesskey="n" rel="next">a node after part</a
';
-$result_converted{'xml'}->{'part_node_chapter_after_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">a node after part</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'part_node_chapter_after_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">a node after part</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl
index eb69903918..14106c7fc9 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -596,23 +596,11 @@ $result_nodes{'part_node_chapter_appendix'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_node_chapter_appendix'}{'menu_child'}{'node_prev'} = $result_nodes{'part_node_chapter_appendix'};
$result_nodes{'part_node_chapter_appendix'}{'menu_child'}{'node_up'} = $result_nodes{'part_node_chapter_appendix'};
$result_nodes{'part_node_chapter_appendix'}{'node_next'} = $result_nodes{'part_node_chapter_appendix'}{'menu_child'};
-$result_nodes{'part_node_chapter_appendix'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_node_chapter_appendix'};
$result_menus{'part_node_chapter_appendix'} = {
'cmdname' => 'node',
@@ -713,17 +701,6 @@ $result_elements{'part_node_chapter_appendix'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -759,7 +736,6 @@ $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'Forwar
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_node_chapter_appendix'}[0];
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'node'} = $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'section'} = $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'element_command'};
@@ -774,7 +750,6 @@ $result_directions_text{'part_node_chapter_appendix'} = 'element: @top top
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
- NodeUp: (dir)
This: @top top
element: @chapter chapter
Back: @top top
@@ -821,6 +796,11 @@ Node: Top27
Node: chapter node118

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -861,7 +841,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -890,7 +870,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
';
-$result_converted{'xml'}->{'part_node_chapter_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'part_node_chapter_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
index 449af0d4d9..66efb5d9f9 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -736,25 +736,13 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'part_node_chapter_node_appendix'}{'menu_child'};
$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'part_node_chapter_node_appendix'};
$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'}{'node_prev'} = $result_nodes{'part_node_chapter_node_appendix'};
$result_nodes{'part_node_chapter_node_appendix'}{'menu_child'}{'node_up'} = $result_nodes{'part_node_chapter_node_appendix'};
$result_nodes{'part_node_chapter_node_appendix'}{'node_next'} = $result_nodes{'part_node_chapter_node_appendix'}{'menu_child'};
-$result_nodes{'part_node_chapter_node_appendix'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_node_chapter_node_appendix'};
$result_menus{'part_node_chapter_node_appendix'} = {
'cmdname' => 'node',
@@ -887,17 +875,6 @@ $result_elements{'part_node_chapter_node_appendix'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -941,7 +918,6 @@ $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'F
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_node_chapter_node_appendix'}[0];
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'} = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'section'} = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'element_command'};
@@ -956,7 +932,6 @@ $result_directions_text{'part_node_chapter_node_appendix'} = 'element: @top top
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
- NodeUp: (dir)
This: @top top
element: @chapter chapter
Back: @top top
@@ -1013,6 +988,11 @@ Node: chapter node136
Node: appendix node232

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1053,7 +1033,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -1089,7 +1069,7 @@ Previous: <a href="#chapter-node" accesskey="p" rel="prev">chapter node</a>, Up:
';
-$result_converted{'xml'}->{'part_node_chapter_node_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'part_node_chapter_node_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl
index 5cfb11978f..9ce31f8986 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -806,25 +806,13 @@ $result_nodes{'part_node_node_part_appendix'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_node_node_part_appendix'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'part_node_node_part_appendix'}{'menu_child'};
$result_nodes{'part_node_node_part_appendix'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'part_node_node_part_appendix'};
$result_nodes{'part_node_node_part_appendix'}{'menu_child'}{'node_prev'} = $result_nodes{'part_node_node_part_appendix'};
$result_nodes{'part_node_node_part_appendix'}{'menu_child'}{'node_up'} = $result_nodes{'part_node_node_part_appendix'};
$result_nodes{'part_node_node_part_appendix'}{'node_next'} = $result_nodes{'part_node_node_part_appendix'}{'menu_child'};
-$result_nodes{'part_node_node_part_appendix'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_node_node_part_appendix'};
$result_menus{'part_node_node_part_appendix'} = {
'cmdname' => 'node',
@@ -973,17 +961,6 @@ $result_elements{'part_node_node_part_appendix'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -1026,7 +1003,6 @@ $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'Forw
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_node_node_part_appendix'}[0];
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'} = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'section'} = $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'element_command'};
@@ -1041,7 +1017,6 @@ $result_directions_text{'part_node_node_part_appendix'} = 'element: @top top
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
- NodeUp: (dir)
This: @top top
element: @chapter chapter
Back: @top top
@@ -1097,6 +1072,11 @@ Node: chapter node136
Node: appendix part232

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1137,7 +1117,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -1176,7 +1156,7 @@ Previous: <a href="#chapter-node" accesskey="p" rel="prev">chapter node</a>, Up:
';
-$result_converted{'xml'}->{'part_node_node_part_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'part_node_node_part_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl
index b76871d5d9..f4ceed108f 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -659,23 +659,11 @@ $result_nodes{'part_node_part_appendix'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_node_part_appendix'}{'menu_child'}{'node_prev'} = $result_nodes{'part_node_part_appendix'};
$result_nodes{'part_node_part_appendix'}{'menu_child'}{'node_up'} = $result_nodes{'part_node_part_appendix'};
$result_nodes{'part_node_part_appendix'}{'node_next'} = $result_nodes{'part_node_part_appendix'}{'menu_child'};
-$result_nodes{'part_node_part_appendix'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_node_part_appendix'};
$result_menus{'part_node_part_appendix'} = {
'cmdname' => 'node',
@@ -782,17 +770,6 @@ $result_elements{'part_node_part_appendix'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -827,7 +804,6 @@ $result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'Forward'}
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_node_part_appendix'}[0];
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'node'} = $result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'section'} = $result_elements{'part_node_part_appendix'}[0]{'extra'}{'element_command'};
@@ -842,7 +818,6 @@ $result_directions_text{'part_node_part_appendix'} = 'element: @top top
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
- NodeUp: (dir)
This: @top top
element: @chapter chapter
Back: @top top
@@ -888,6 +863,11 @@ Node: Top27
Node: chapter node118

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -928,7 +908,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -960,7 +940,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
';
-$result_converted{'xml'}->{'part_node_part_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'part_node_part_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl
index 79fc70dcaa..e5f311caf3 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -806,25 +806,13 @@ $result_nodes{'part_node_part_node_appendix'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'part_node_part_node_appendix'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'part_node_part_node_appendix'}{'menu_child'};
$result_nodes{'part_node_part_node_appendix'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'part_node_part_node_appendix'};
$result_nodes{'part_node_part_node_appendix'}{'menu_child'}{'node_prev'} = $result_nodes{'part_node_part_node_appendix'};
$result_nodes{'part_node_part_node_appendix'}{'menu_child'}{'node_up'} = $result_nodes{'part_node_part_node_appendix'};
$result_nodes{'part_node_part_node_appendix'}{'node_next'} = $result_nodes{'part_node_part_node_appendix'}{'menu_child'};
-$result_nodes{'part_node_part_node_appendix'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'part_node_part_node_appendix'};
$result_menus{'part_node_part_node_appendix'} = {
'cmdname' => 'node',
@@ -963,17 +951,6 @@ $result_elements{'part_node_part_node_appendix'} = [
'Next' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -1016,7 +993,6 @@ $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'Forw
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'part_node_part_node_appendix'}[0];
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'} = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'section'} = $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'element_command'};
@@ -1031,7 +1007,6 @@ $result_directions_text{'part_node_part_node_appendix'} = 'element: @top top
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
- NodeUp: (dir)
This: @top top
element: @chapter chapter
Back: @top top
@@ -1087,6 +1062,11 @@ Node: chapter node136
Node: appendix node232

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -1127,7 +1107,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -1166,7 +1146,7 @@ Previous: <a href="#chapter-node" accesskey="p" rel="prev">chapter node</a>, Up:
';
-$result_converted{'xml'}->{'part_node_part_node_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'part_node_part_node_appendix'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter node</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_element.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_element.pl
index 73aa932bee..5ae5f0d729 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_element.pl
@@ -1040,6 +1040,11 @@ Ref: float anchor109
Ref: Anchor in footnote401

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'placed_things_before_element'} = [
@@ -1157,7 +1162,7 @@ ul.no-bullet {list-style: none}
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>In footnote.
</p>
<span id="Anchor-in-footnote"></span>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_node.pl
index ce4c038c95..3a271a868d 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_node.pl
@@ -1006,20 +1006,8 @@ $result_nodes{'placed_things_before_node'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'placed_things_before_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'placed_things_before_node'};
$result_menus{'placed_things_before_node'} = {
'cmdname' => 'node',
@@ -1130,6 +1118,11 @@ Ref: Top-Footnote-1445
Ref: Anchor in footnote466

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'placed_things_before_node'} = [
@@ -1233,7 +1226,7 @@ ul.no-bullet {list-style: none}
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>In footnote.
</p>
<span id="Anchor-in-footnote"></span>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/protected_node_parentheses.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/protected_node_parentheses.pl
index d049fe201b..3c50e05669 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -573,23 +573,11 @@ $result_nodes{'protected_node_parentheses'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'protected_node_parentheses'}{'menu_child'}{'node_prev'} = $result_nodes{'protected_node_parentheses'};
$result_nodes{'protected_node_parentheses'}{'menu_child'}{'node_up'} = $result_nodes{'protected_node_parentheses'};
$result_nodes{'protected_node_parentheses'}{'node_next'} = $result_nodes{'protected_node_parentheses'}{'menu_child'};
-$result_nodes{'protected_node_parentheses'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'protected_node_parentheses'};
$result_menus{'protected_node_parentheses'} = {
'cmdname' => 'node',
@@ -639,6 +627,11 @@ Node: (manual) name120
Ref: (manual2) name2174

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -680,7 +673,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#g_t_0028manual_0029-name" accesskey="n" rel="next">(manual) name</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#g_t_0028manual_0029-name" accesskey="n" rel="next">(manual) name</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl
index 185d90d01c..3a1710fb15 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl
@@ -1746,18 +1746,7 @@ $result_nodes{'raiselowersections'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'};
$result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'raiselowersections'}{'menu_child'}{'menu_child'};
@@ -1767,7 +1756,6 @@ $result_nodes{'raiselowersections'}{'menu_child'}{'node_next'}{'node_up'} = $res
$result_nodes{'raiselowersections'}{'menu_child'}{'node_prev'} = $result_nodes{'raiselowersections'};
$result_nodes{'raiselowersections'}{'menu_child'}{'node_up'} = $result_nodes{'raiselowersections'};
$result_nodes{'raiselowersections'}{'node_next'} = $result_nodes{'raiselowersections'}{'menu_child'};
-$result_nodes{'raiselowersections'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'raiselowersections'};
$result_menus{'raiselowersections'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/rec_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/rec_nodes.pl
index 2890055c0b..5718de2584 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/rec_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/rec_nodes.pl
@@ -1386,25 +1386,13 @@ $result_nodes{'rec_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'rec_nodes'}{'menu_child'}{'menu_child'}{'menu_child'} = $result_nodes{'rec_nodes'}{'menu_child'}{'menu_child'};
$result_nodes{'rec_nodes'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'rec_nodes'}{'menu_child'};
$result_nodes{'rec_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'rec_nodes'};
$result_nodes{'rec_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'rec_nodes'};
$result_nodes{'rec_nodes'}{'node_next'} = $result_nodes{'rec_nodes'}{'menu_child'};
-$result_nodes{'rec_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'rec_nodes'};
$result_menus{'rec_nodes'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/ref_to_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/ref_to_top.pl
index c87009b96a..9452628bcf 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/ref_to_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/ref_to_top.pl
@@ -208,20 +208,8 @@ $result_nodes{'ref_to_top'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'ref_to_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'ref_to_top'};
$result_menus{'ref_to_top'} = {
'cmdname' => 'node',
@@ -260,6 +248,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl
index 93fa66e66e..adb457433d 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl
@@ -457,23 +457,11 @@ $result_nodes{'section_before_top'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'section_before_top'}{'menu_child'}{'node_prev'} = $result_nodes{'section_before_top'};
$result_nodes{'section_before_top'}{'menu_child'}{'node_up'} = $result_nodes{'section_before_top'};
$result_nodes{'section_before_top'}{'node_next'} = $result_nodes{'section_before_top'}{'menu_child'};
-$result_nodes{'section_before_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'section_before_top'};
$result_menus{'section_before_top'} = {
'cmdname' => 'node',
@@ -533,6 +521,11 @@ Node: section node27
Node: Top101

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -580,7 +573,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
<hr>
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#section-node" accesskey="n" rel="next">section node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#section-node" accesskey="n" rel="next">section node</a> &nbsp; </p>
</div>
<span id="top"></span><h3 class="unnumberedsec">top</h3>
@@ -601,7 +594,7 @@ $result_converted{'xml'}->{'section_before_top'} = '<node name="section-node" sp
<section spaces=" "><sectiontitle>section </sectiontitle>
</section>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">section node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">section node</nodenext></node>
<unnumberedsec originalcommand="top" spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl
index 1ba8c88a67..9ece316575 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -822,24 +822,12 @@ $result_nodes{'section_below_unnumbered'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'section_below_unnumbered'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'section_below_unnumbered'}{'menu_child'};
$result_nodes{'section_below_unnumbered'}{'menu_child'}{'node_prev'} = $result_nodes{'section_below_unnumbered'};
$result_nodes{'section_below_unnumbered'}{'menu_child'}{'node_up'} = $result_nodes{'section_below_unnumbered'};
$result_nodes{'section_below_unnumbered'}{'node_next'} = $result_nodes{'section_below_unnumbered'}{'menu_child'};
-$result_nodes{'section_below_unnumbered'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'section_below_unnumbered'};
$result_menus{'section_below_unnumbered'} = {
'cmdname' => 'node',
@@ -949,7 +937,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#Unn" accesskey="n" rel="next">Unn</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="#Unn" accesskey="n" rel="next">Unn</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="Top-1"></span><h1 class="top">Top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/section_chapter_before_top_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index ce0a4a7eef..00648445fe 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -719,18 +719,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'menu_child'}{'node_next'} = $result_nodes{'section_chapter_before_top_nodes'}{'menu_child'};
$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'section_chapter_before_top_nodes'}{'menu_child'};
@@ -738,7 +727,6 @@ $result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'node_next'} = $
$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'section_chapter_before_top_nodes'};
$result_nodes{'section_chapter_before_top_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'section_chapter_before_top_nodes'};
$result_nodes{'section_chapter_before_top_nodes'}{'node_next'} = $result_nodes{'section_chapter_before_top_nodes'}{'menu_child'};
-$result_nodes{'section_chapter_before_top_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'section_chapter_before_top_nodes'};
$result_menus{'section_chapter_before_top_nodes'} = {
'cmdname' => 'node',
@@ -849,6 +837,11 @@ Node: chapter node119
Node: Top232

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -908,7 +901,7 @@ Next: <a href="#Top" accesskey="n" rel="next">Top</a>, Previous: <a href="#Top"
<hr>
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-node" accesskey="n" rel="next">chapter node</a> &nbsp; </p>
</div>
<span id="top"></span><h3 class="unnumberedsec">top</h3>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_info.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_info.pl
index a7be3a3c22..0212bc3d5b 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -7371,18 +7371,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'section_in_unnumbered_info'}{'menu_child'};
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'};
@@ -7435,7 +7424,6 @@ $result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_next'}{'node_up'
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_prev'} = $result_nodes{'section_in_unnumbered_info'};
$result_nodes{'section_in_unnumbered_info'}{'menu_child'}{'node_up'} = $result_nodes{'section_in_unnumbered_info'};
$result_nodes{'section_in_unnumbered_info'}{'node_next'} = $result_nodes{'section_in_unnumbered_info'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_info'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'section_in_unnumbered_info'};
$result_menus{'section_in_unnumbered_info'} = {
'cmdname' => 'node',
@@ -8160,6 +8148,11 @@ Node: unnumbered sub2 44315
Node: numbered sub2 44471

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -8202,7 +8195,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="Test-section-in-unnumbered"></span><h1 class="top">Test section in unnumbered</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index 7ce93d1bee..6a94c9aeaf 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -7371,18 +7371,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'};
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'menu_child'}{'node_up'} = $result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'};
@@ -7435,7 +7424,6 @@ $result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_next'}{'nod
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_prev'} = $result_nodes{'section_in_unnumbered_plaintext'};
$result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'}{'node_up'} = $result_nodes{'section_in_unnumbered_plaintext'};
$result_nodes{'section_in_unnumbered_plaintext'}{'node_next'} = $result_nodes{'section_in_unnumbered_plaintext'}{'menu_child'};
-$result_nodes{'section_in_unnumbered_plaintext'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'section_in_unnumbered_plaintext'};
$result_menus{'section_in_unnumbered_plaintext'} = {
'cmdname' => 'node',
@@ -8029,7 +8017,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter" accesskey="n" rel="next">chapter</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="Test-section-in-unnumbered"></span><h1 class="top">Test section in unnumbered</h1>
@@ -8428,7 +8416,7 @@ Previous: <a href="#unnumbered-sub2-4" accesskey="p" rel="prev">unnumbered sub2
$result_converted{'xml'}->{'section_in_unnumbered_plaintext'} = '
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext></node>
<top spaces=" "><sectiontitle>Test section in unnumbered</sectiontitle>
<contents></contents>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/section_node_before_part.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/section_node_before_part.pl
index 7a9cc9f823..7be3d285c4 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/section_node_before_part.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/section_node_before_part.pl
@@ -205,20 +205,8 @@ $result_nodes{'section_node_before_part'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'section_node_before_part'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'section_node_before_part'};
$result_menus{'section_node_before_part'} = {
'cmdname' => 'node',
@@ -265,6 +253,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -328,7 +321,7 @@ $result_converted_errors{'html'}->{'section_node_before_part'} = [
$result_converted{'xml'}->{'section_node_before_part'} = '
-<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
<section spaces=" "><sectiontitle>section </sectiontitle>
</section>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/semi_auto.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/semi_auto.pl
index 0913290bb5..248448d5f3 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/semi_auto.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/semi_auto.pl
@@ -954,18 +954,7 @@ $result_nodes{'semi_auto'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'semi_auto'}{'menu_child'}{'menu_child'}{'node_next'}{'node_prev'} = $result_nodes{'semi_auto'}{'menu_child'};
$result_nodes{'semi_auto'}{'menu_child'}{'menu_child'}{'node_next'}{'node_up'} = $result_nodes{'semi_auto'};
@@ -974,7 +963,6 @@ $result_nodes{'semi_auto'}{'menu_child'}{'node_next'} = $result_nodes{'semi_auto
$result_nodes{'semi_auto'}{'menu_child'}{'node_prev'} = $result_nodes{'semi_auto'};
$result_nodes{'semi_auto'}{'menu_child'}{'node_up'} = $result_nodes{'semi_auto'};
$result_nodes{'semi_auto'}{'node_next'} = $result_nodes{'semi_auto'}{'menu_child'};
-$result_nodes{'semi_auto'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'semi_auto'};
$result_menus{'semi_auto'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
index 85660c845b..ce299b174b 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
@@ -205,20 +205,8 @@ $result_nodes{'setfilename_on_top_and_after_node'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'setfilename_on_top_and_after_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'setfilename_on_top_and_after_node'};
$result_menus{'setfilename_on_top_and_after_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/space_in_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/space_in_node.pl
index 880bc5fee5..6bff889732 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/space_in_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/space_in_node.pl
@@ -598,18 +598,7 @@ $result_nodes{'space_in_node'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'space_in_node'}{'menu_child'}{'node_next'};
$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'space_in_node'};
@@ -618,7 +607,6 @@ $result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_up'} = $result_n
$result_nodes{'space_in_node'}{'menu_child'}{'node_prev'} = $result_nodes{'space_in_node'};
$result_nodes{'space_in_node'}{'menu_child'}{'node_up'} = $result_nodes{'space_in_node'};
$result_nodes{'space_in_node'}{'node_next'} = $result_nodes{'space_in_node'}{'menu_child'};
-$result_nodes{'space_in_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'space_in_node'};
$result_menus{'space_in_node'} = {
'cmdname' => 'node',
@@ -701,6 +689,11 @@ Node: Test title253
Node: Last with spaces341

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -742,7 +735,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#Chap-first-here" accesskey="n" rel="next">Chap first here</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#Chap-first-here" accesskey="n" rel="next">Chap first here</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_node.pl
index f97eeda92c..287762aeb7 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_node.pl
@@ -150,6 +150,11 @@ Tag Table:
Node: start27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'top_no_argument_and_node'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_top_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_top_node.pl
index bd8c1cca7a..a7597eb2a2 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_top_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/top_no_argument_and_top_node.pl
@@ -124,20 +124,8 @@ $result_nodes{'top_no_argument_and_top_node'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'top_no_argument_and_top_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_no_argument_and_top_node'};
$result_menus{'top_no_argument_and_top_node'} = {
'cmdname' => 'node',
@@ -162,6 +150,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_no_menu_direction.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_no_menu_direction.pl
index c2227a5502..6ba5d9738b 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -408,23 +408,11 @@ $result_nodes{'top_node_no_menu_direction'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'top_node_no_menu_direction'}{'menu_child'}{'node_prev'} = $result_nodes{'top_node_no_menu_direction'};
$result_nodes{'top_node_no_menu_direction'}{'menu_child'}{'node_up'} = $result_nodes{'top_node_no_menu_direction'};
$result_nodes{'top_node_no_menu_direction'}{'node_next'} = $result_nodes{'top_node_no_menu_direction'}{'menu_child'};
-$result_nodes{'top_node_no_menu_direction'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_node_no_menu_direction'};
$result_menus{'top_node_no_menu_direction'} = {
'cmdname' => 'node',
@@ -466,15 +454,6 @@ $result_errors{'top_node_no_menu_direction'} = [
'type' => 'warning'
},
{
- 'error_line' => ':1: warning: for `Top\', up in menu `Top\' and up `(dir)\' don\'t match
-',
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => '',
- 'text' => 'for `Top\', up in menu `Top\' and up `(dir)\' don\'t match',
- 'type' => 'warning'
- },
- {
'error_line' => ':8: warning: Prev pointer `top\' (for node `second node\') different from node name `Top\'
',
'file_name' => '',
@@ -516,6 +495,11 @@ Node: Top27
Node: second node122

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -556,7 +540,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#second-node" accesskey="n" rel="next">second node</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#second-node" accesskey="n" rel="next">second node</a> &nbsp; </p>
</div>
<h1 class="node-heading">Top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_part_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_part_top.pl
index aeef6eceae..d1455e7404 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_part_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_part_top.pl
@@ -227,20 +227,8 @@ $result_nodes{'top_node_part_top'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'top_node_part_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_node_part_top'};
$result_menus{'top_node_part_top'} = {
'cmdname' => 'node',
@@ -276,23 +264,6 @@ $result_elements{'top_node_part_top'} = [
{
'extra' => {
'directions' => {
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top',
- 'spaces_before_argument' => ' '
- }
- }
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -309,20 +280,24 @@ $result_elements{'top_node_part_top'} = [
},
'level' => 0
},
- 'node' => {},
+ 'node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+ },
'section' => {}
},
'type' => 'element'
}
];
$result_elements{'top_node_part_top'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'top_node_part_top'}[0];
-$result_elements{'top_node_part_top'}[0]{'extra'}{'node'} = $result_elements{'top_node_part_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'};
$result_elements{'top_node_part_top'}[0]{'extra'}{'section'} = $result_elements{'top_node_part_top'}[0]{'extra'}{'element_command'};
$result_directions_text{'top_node_part_top'} = 'element: @top top
- NodeUp: (dir)
This: @top top
';
@@ -341,6 +316,11 @@ Tag Table:
Node: Top27

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -393,7 +373,7 @@ ul.no-bullet {list-style: none}
';
-$result_converted{'xml'}->{'top_node_part_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'top_node_part_top'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<part spaces=" "><sectiontitle>part</sectiontitle>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_up_url.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_up_url.pl
index 757144c781..8c8e3757b2 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_up_url.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/top_node_up_url.pl
@@ -380,19 +380,11 @@ $result_nodes{'top_node_up_url'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'normalized' => 'GNU-manuals',
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'top_node_up_url'}{'menu_child'}{'node_prev'} = $result_nodes{'top_node_up_url'};
$result_nodes{'top_node_up_url'}{'menu_child'}{'node_up'} = $result_nodes{'top_node_up_url'};
$result_nodes{'top_node_up_url'}{'node_next'} = $result_nodes{'top_node_up_url'}{'menu_child'};
-$result_nodes{'top_node_up_url'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'top_node_up_url'};
$result_menus{'top_node_up_url'} = {
'cmdname' => 'node',
@@ -455,13 +447,6 @@ $result_elements{'top_node_up_url'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'normalized' => 'GNU-manuals',
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- },
'This' => {}
},
'element_command' => {},
@@ -488,7 +473,6 @@ $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'top_node_up_url'}[0];
$result_elements{'top_node_up_url'}[0]{'extra'}{'element_command'} = $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
$result_elements{'top_node_up_url'}[0]{'extra'}{'node'} = $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
@@ -500,7 +484,6 @@ $result_directions_text{'top_node_up_url'} = 'element: @node Top
Forward: @node first
NodeForward: @node first
NodeNext: @node first
- NodeUp: No associated command (type top_node_up)
This: @node Top
element: @node first
Back: @node Top
@@ -515,7 +498,7 @@ element: @node first
$result_converted{'info'}->{'top_node_up_url'} = 'This is , produced from .

-File: , Node: Top, Next: first, Up: GNU (GNU\'s Not Unix) manuals
+File: , Node: Top, Next: first, Up: @acronym{GNU, @acronym{GNU}\'s Not Unix} manuals
internal top node up
********************
@@ -531,9 +514,14 @@ File: , Node: first, Prev: Top, Up: Top

Tag Table:
Node: Top27
-Node: first161
+Node: first180

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
@@ -549,6 +537,7 @@ $result_converted{'html'}->{'top_node_up_url'} = '<!DOCTYPE html PUBLIC "-//W3C/
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
+<link href="http://www.gnu.org/manual/" rel="up" title="@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -574,7 +563,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="http://www.gnu.org/manual/" accesskey="u" rel="up"><acronym title="GNU&rsquo;s Not Unix">GNU</acronym> (<acronym>GNU</acronym>\'s Not Unix) manuals</a> &nbsp; </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a>, Up: <a href="http://www.gnu.org/manual/" accesskey="u" rel="up">@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals</a> &nbsp; </p>
</div>
<span id="internal-top-node-up"></span><h1 class="top">internal top node up</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_nodes.pl
index 46fb7841c7..bfe46f6602 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -383,6 +383,11 @@ Tag Table:
Node: second65

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'top_without_node_nodes'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_sections.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_sections.pl
index a9b432abd2..b546701619 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/top_without_node_sections.pl
@@ -431,6 +431,11 @@ Tag Table:
Node: second65

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'top_without_node_sections'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 59b168a1d3..7c74e196e3 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -675,18 +675,7 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'};
$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'transliterated_split_equivalent_nodes'};
@@ -695,7 +684,6 @@ $result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_next'
$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_prev'} = $result_nodes{'transliterated_split_equivalent_nodes'};
$result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'}{'node_up'} = $result_nodes{'transliterated_split_equivalent_nodes'};
$result_nodes{'transliterated_split_equivalent_nodes'}{'node_next'} = $result_nodes{'transliterated_split_equivalent_nodes'}{'menu_child'};
-$result_nodes{'transliterated_split_equivalent_nodes'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'transliterated_split_equivalent_nodes'};
$result_menus{'transliterated_split_equivalent_nodes'} = {
'cmdname' => 'node',
@@ -841,17 +829,6 @@ $result_elements{'transliterated_split_equivalent_nodes'} = [
},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {},
@@ -894,7 +871,6 @@ $result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'direction
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'} = $result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'};
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'};
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'transliterated_split_equivalent_nodes'}[0];
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'element_command'} = $result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'} = $result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
@@ -908,7 +884,6 @@ $result_directions_text{'transliterated_split_equivalent_nodes'} = 'element: @no
Forward: @node @~a
NodeForward: @node @~a
NodeNext: @node @~a
- NodeUp: (dir)
This: @node Top
element: @node @~a
Back: @node Top
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html b/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
index f67f86fb95..c72bf44b87 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/a.html
@@ -9,10 +9,10 @@
<meta name="keywords" content="&atilde; (Untitled Document)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="n.html#n" rel="next" title="n">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="n.html" rel="next" title="n">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -38,14 +38,14 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="g_t_00e3"></span><div class="header">
<p>
-Next: <a href="n.html#n" accesskey="n" rel="next">n</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="n.html" accesskey="n" rel="next">n</a>, Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<h4 class="node-heading">&atilde;</h4>
<span id="g_t_00e2"></span><div class="header">
<p>
-Previous: <a href="n.html#n" accesskey="p" rel="prev">n</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Previous: <a href="n.html" accesskey="p" rel="prev">n</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<h4 class="node-heading">&acirc;</h4>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
index 6c87bbe2ea..ba001de2b7 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/index.html
@@ -10,7 +10,6 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<link href="#Top" rel="start" title="Top">
-<link href="../dir/index.html" rel="up" title="(dir)">
<link href="a.html#g_t_00e3" rel="next" title="&atilde;">
<style type="text/css">
<!--
@@ -37,7 +36,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a> &nbsp; </p>
</div>
<hr>
<h1 class="node-heading">Top</h1>
@@ -45,7 +44,7 @@ Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a>, Up: <a hr
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top">&bull; <a href="a.html#g_t_00e3" accesskey="1">&atilde;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="n.html#n" accesskey="2">n</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="n.html" accesskey="2">n</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="a.html#g_t_00e2" accesskey="3">&acirc;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -54,7 +53,7 @@ Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a>, Up: <a hr
<hr>
<div class="header">
<p>
-Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="a.html#g_t_00e3" accesskey="n" rel="next">&atilde;</a> &nbsp; </p>
</div>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html b/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
index 1167310e58..6896c73189 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/transliterated_split_equivalent_nodes/res_html/n.html
@@ -9,8 +9,8 @@
<meta name="keywords" content="n (Untitled Document)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="up" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="up" title="Top">
<link href="a.html#g_t_00e2" rel="next" title="&acirc;">
<link href="a.html#g_t_00e3" rel="prev" title="&atilde;">
<style type="text/css">
@@ -38,7 +38,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="n"></span><div class="header">
<p>
-Next: <a href="a.html#g_t_00e2" accesskey="n" rel="next">&acirc;</a>, Previous: <a href="a.html#g_t_00e3" accesskey="p" rel="prev">&atilde;</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="a.html#g_t_00e2" accesskey="n" rel="next">&acirc;</a>, Previous: <a href="a.html#g_t_00e3" accesskey="p" rel="prev">&atilde;</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; </p>
</div>
<hr>
<h4 class="node-heading">n</h4>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_at_the_end.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_at_the_end.pl
index 07f090dc98..f2f559797d 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -780,18 +780,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'};
$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'} = $result_nodes{'two_nodes_at_the_end'};
@@ -800,7 +789,6 @@ $result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_next'}{'node_up'} = $r
$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_prev'} = $result_nodes{'two_nodes_at_the_end'};
$result_nodes{'two_nodes_at_the_end'}{'menu_child'}{'node_up'} = $result_nodes{'two_nodes_at_the_end'};
$result_nodes{'two_nodes_at_the_end'}{'node_next'} = $result_nodes{'two_nodes_at_the_end'}{'menu_child'};
-$result_nodes{'two_nodes_at_the_end'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'two_nodes_at_the_end'};
$result_menus{'two_nodes_at_the_end'} = {
'cmdname' => 'node',
@@ -927,17 +915,6 @@ $result_elements{'two_nodes_at_the_end'} = [
'Forward' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -972,7 +949,6 @@ $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'Forward'} = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'};
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'two_nodes_at_the_end'}[0];
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'} = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'};
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'section'} = $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'element_command'};
@@ -985,7 +961,6 @@ $result_directions_text{'two_nodes_at_the_end'} = 'element: @top top
Forward: @chapter chapter c1
NodeForward: @chapter chapter c1
NodeNext: @chapter chapter c1
- NodeUp: (dir)
This: @top top
element: @chapter chapter c1
Back: @top top
@@ -1046,7 +1021,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-1" accesskey="n" rel="next">chapter 1</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-1" accesskey="n" rel="next">chapter 1</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 15aa5dc758..259b880766 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -863,18 +863,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_next'} = $result_nodes{'two_nodes_between_chapters'};
$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_prev'}{'node_next'}{'node_prev'} = $result_nodes{'two_nodes_between_chapters'}{'menu_child'};
@@ -883,7 +872,6 @@ $result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_prev'}{'node_pre
$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_prev'}{'node_up'} = $result_nodes{'two_nodes_between_chapters'};
$result_nodes{'two_nodes_between_chapters'}{'menu_child'}{'node_up'} = $result_nodes{'two_nodes_between_chapters'};
$result_nodes{'two_nodes_between_chapters'}{'node_next'} = $result_nodes{'two_nodes_between_chapters'}{'menu_child'};
-$result_nodes{'two_nodes_between_chapters'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'two_nodes_between_chapters'};
$result_menus{'two_nodes_between_chapters'} = {
'cmdname' => 'node',
@@ -1047,17 +1035,6 @@ $result_elements{'two_nodes_between_chapters'} = [
'NodeBack' => {},
'NodeForward' => {},
'NodeNext' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'external_node'
- },
'This' => {}
},
'element_command' => {
@@ -1105,7 +1082,6 @@ $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'Forwar
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'NodeBack'} = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'NodeForward'} = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'} = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'This'} = $result_elements{'two_nodes_between_chapters'}[0];
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'} = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'section'} = $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'element_command'};
@@ -1120,7 +1096,6 @@ $result_directions_text{'two_nodes_between_chapters'} = 'element: @top top
NodeBack: @chapter chapter c1
NodeForward: @chapter chapter c1
NodeNext: @chapter chapter c1
- NodeUp: (dir)
This: @top top
element: @chapter chapter c1
Back: @top top
@@ -1195,7 +1170,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><div class="header">
<p>
-Next: <a href="#chapter-1" accesskey="n" rel="next">chapter 1</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; </p>
+Next: <a href="#chapter-1" accesskey="n" rel="next">chapter 1</a> &nbsp; </p>
</div>
<span id="top"></span><h1 class="top">top</h1>
@@ -1237,7 +1212,7 @@ Previous: <a href="#chapter-1" accesskey="p" rel="prev">chapter 1</a>, Up: <a hr
';
-$result_converted{'xml'}->{'two_nodes_between_chapters'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 1</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'two_nodes_between_chapters'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter 1</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/unknown_node_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/unknown_node_in_menu.pl
index e6f729e7c7..689946bf6a 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -230,20 +230,8 @@ $result_nodes{'unknown_node_in_menu'} = {
}
}
}
- ],
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ ]
};
-$result_nodes{'unknown_node_in_menu'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'unknown_node_in_menu'};
$result_menus{'unknown_node_in_menu'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_node_top_top.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index da967a2b5f..341d203785 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -259,20 +259,8 @@ $result_nodes{'unnumbered_before_node_top_top'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'unnumbered_before_node_top_top'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'unnumbered_before_node_top_top'};
$result_menus{'unnumbered_before_node_top_top'} = {
'cmdname' => 'node',
@@ -304,23 +292,6 @@ $result_elements{'unnumbered_before_node_top_top'} = [
'directions' => {
'Back' => {},
'FastBack' => {},
- 'NodeUp' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top',
- 'spaces_before_argument' => ' '
- }
- }
- },
- 'type' => 'external_node'
- },
'Prev' => {},
'This' => {}
},
@@ -331,7 +302,13 @@ $result_elements{'unnumbered_before_node_top_top'} = [
},
'level' => 1
},
- 'node' => {},
+ 'node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+ },
'section' => {}
},
'type' => 'element'
@@ -357,7 +334,6 @@ $result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'Fa
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'} = $result_elements{'unnumbered_before_node_top_top'}[0];
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'} = $result_elements{'unnumbered_before_node_top_top'}[0];
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'} = $result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'} = $result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'};
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'} = $result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'Forward'} = $result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'};
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'Next'} = $result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'};
@@ -375,7 +351,6 @@ $result_directions_text{'unnumbered_before_node_top_top'} = 'element: @unnumbere
element: @top top section
Back: @unnumbered before nodes
FastBack: @unnumbered before nodes
- NodeUp: (dir)
Prev: @unnumbered before nodes
This: @top top section
';
@@ -401,6 +376,11 @@ Tag Table:
Node: Top69

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_top_node.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_top_node.pl
index f4f10d704e..de0443b8f8 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -199,20 +199,8 @@ $result_nodes{'unnumbered_before_top_node'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'unnumbered_before_top_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'unnumbered_before_top_node'};
$result_menus{'unnumbered_before_top_node'} = {
'cmdname' => 'node',
@@ -271,6 +259,11 @@ Tag Table:
Node: Top54

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index ea5c63a709..28d4dfc7d4 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -646,6 +646,11 @@ Node: a node27
Node: second140

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'unnumbered_top_without_node_nodes'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl b/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 8f18c101b4..bb79842e5b 100644
--- a/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/macros/texinfo/texinfo/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -700,6 +700,11 @@ Node: a node27
Node: second140

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
';
$result_converted_errors{'info'}->{'unnumbered_top_without_node_sections'} = [
diff --git a/macros/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl b/macros/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl
index 38c05ec483..bcd4c9da00 100644
--- a/macros/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl
@@ -550,7 +550,7 @@ $result_trees{'value_in_index_commands'} = {
'index_at_command' => 'codeidxindex',
'index_name' => 'codeidx',
'index_type_command' => 'codeidxindex',
- 'key' => 'a index entry te\' i^',
+ 'key' => "a index entry t\x{e9} \x{ee}",
'node' => {},
'number' => 1
},
@@ -746,6 +746,7 @@ $result_trees{'value_in_index_commands'} = {
}
],
'extra' => {
+ 'isindex' => 1,
'node_content' => [
{}
],
@@ -941,26 +942,16 @@ $result_sectioning{'value_in_index_commands'} = {};
$result_nodes{'value_in_index_commands'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'value_in_index_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'value_in_index_commands'};
$result_menus{'value_in_index_commands'} = {
'cmdname' => 'node',
'extra' => {
+ 'isindex' => 1,
'normalized' => 'Top',
'spaces_before_argument' => ' '
}
diff --git a/macros/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl b/macros/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl
index 338a9e43f9..42118c6c4a 100644
--- a/macros/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl
+++ b/macros/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl
@@ -3358,20 +3358,8 @@ $result_nodes{'value_in_misc_commands'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'value_in_misc_commands'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'value_in_misc_commands'};
$result_menus{'value_in_misc_commands'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/value/value_in_node.pl b/macros/texinfo/texinfo/tp/t/results/value/value_in_node.pl
index b46162f1ad..372646e65e 100644
--- a/macros/texinfo/texinfo/tp/t/results/value/value_in_node.pl
+++ b/macros/texinfo/texinfo/tp/t/results/value/value_in_node.pl
@@ -145,8 +145,7 @@ $result_trees{'value_in_node'} = {
{
'manual_content' => [
{}
- ],
- 'top_node_up' => {}
+ ]
}
],
'normalized' => 'Top',
@@ -743,7 +742,6 @@ $result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node
$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0] = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[1]{'contents'}[1];
$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0] = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[2]{'contents'}[1];
$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0] = $result_trees{'value_in_node'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'value_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'top_node_up'} = $result_trees{'value_in_node'}{'contents'}[1];
$result_trees{'value_in_node'}{'contents'}[1]{'parent'} = $result_trees{'value_in_node'};
$result_trees{'value_in_node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[2]{'args'}[0];
$result_trees{'value_in_node'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'value_in_node'}{'contents'}[2];
@@ -1006,8 +1004,7 @@ $result_nodes{'value_in_node'} = {
{
'text' => 'dir'
}
- ],
- 'top_node_up' => {}
+ ]
}
}
};
@@ -1015,7 +1012,6 @@ $result_nodes{'value_in_node'}{'menu_child'}{'menu_child'}{'node_prev'} = $resul
$result_nodes{'value_in_node'}{'menu_child'}{'menu_child'}{'node_up'} = $result_nodes{'value_in_node'}{'menu_child'};
$result_nodes{'value_in_node'}{'menu_child'}{'node_prev'} = $result_nodes{'value_in_node'};
$result_nodes{'value_in_node'}{'menu_child'}{'node_up'} = $result_nodes{'value_in_node'};
-$result_nodes{'value_in_node'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'value_in_node'};
$result_menus{'value_in_node'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/value/value_node_directions.pl b/macros/texinfo/texinfo/tp/t/results/value/value_node_directions.pl
index 5cd0fb951c..a9abfb5b48 100644
--- a/macros/texinfo/texinfo/tp/t/results/value/value_node_directions.pl
+++ b/macros/texinfo/texinfo/tp/t/results/value/value_node_directions.pl
@@ -138,8 +138,7 @@ $result_trees{'value_node_directions'} = {
{
'manual_content' => [
{}
- ],
- 'top_node_up' => {}
+ ]
}
],
'normalized' => 'Top',
@@ -486,7 +485,6 @@ $result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[
$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0] = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[1]{'contents'}[0];
$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0] = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[2]{'contents'}[1];
$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0] = $result_trees{'value_node_directions'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'value_node_directions'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'top_node_up'} = $result_trees{'value_node_directions'}{'contents'}[1];
$result_trees{'value_node_directions'}{'contents'}[1]{'parent'} = $result_trees{'value_node_directions'};
$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[2]{'args'}[0];
$result_trees{'value_node_directions'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'value_node_directions'}{'contents'}[2];
@@ -704,14 +702,12 @@ $result_nodes{'value_node_directions'} = {
{
'text' => 'dir'
}
- ],
- 'top_node_up' => {}
+ ]
}
}
};
$result_nodes{'value_node_directions'}{'node_next'}{'node_next'}{'node_prev'} = $result_nodes{'value_node_directions'}{'node_next'};
$result_nodes{'value_node_directions'}{'node_next'}{'node_prev'} = $result_nodes{'value_node_directions'};
-$result_nodes{'value_node_directions'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'value_node_directions'};
$result_menus{'value_node_directions'} = {
'cmdname' => 'node',
diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
index a177671fe1..59836bcd05 100644
--- a/macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
+++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/brace_commands_spaces_end_of_lines.pl
@@ -26,6 +26,9 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -63,6 +66,9 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 4,
@@ -110,6 +116,9 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 7,
@@ -157,6 +166,9 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 10,
@@ -204,6 +216,9 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 13,
@@ -251,6 +266,9 @@ $result_trees{'brace_commands_spaces_end_of_lines'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 16,
diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl
index 6829bd048b..45851d3774 100644
--- a/macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -432,6 +432,9 @@ $result_trees{'commands_and_spaces'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 21,
@@ -522,6 +525,9 @@ $result_trees{'commands_and_spaces'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 23,
diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl
index de14660f62..bf01e49502 100644
--- a/macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -24,6 +24,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -63,6 +66,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -168,6 +174,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 8,
@@ -207,6 +216,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 10,
@@ -264,6 +276,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 14,
@@ -302,6 +317,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 17,
@@ -384,6 +402,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 20,
@@ -417,6 +438,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 21,
@@ -522,6 +546,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 25,
@@ -572,6 +599,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 27,
@@ -611,6 +641,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 29,
@@ -648,6 +681,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 31,
@@ -749,6 +785,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 35,
@@ -784,6 +823,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
},
@@ -838,6 +880,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 36,
@@ -883,6 +928,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
}
@@ -955,6 +1003,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 38,
@@ -1053,6 +1104,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 41,
@@ -1106,6 +1160,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 42,
@@ -1161,6 +1218,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 46,
@@ -1256,6 +1316,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 51,
@@ -1293,6 +1356,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 53,
@@ -1321,6 +1387,9 @@ $result_trees{'image_inline_or_not'} = {
],
'cmdname' => 'image',
'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
'line_nr' => {},
'parent' => {}
}
@@ -1825,23 +1894,11 @@ $result_nodes{'image_inline_or_not'} = {
}
}
],
- 'node_next' => {},
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
- }
+ 'node_next' => {}
};
$result_nodes{'image_inline_or_not'}{'menu_child'}{'node_prev'} = $result_nodes{'image_inline_or_not'};
$result_nodes{'image_inline_or_not'}{'menu_child'}{'node_up'} = $result_nodes{'image_inline_or_not'};
$result_nodes{'image_inline_or_not'}{'node_next'} = $result_nodes{'image_inline_or_not'}{'menu_child'};
-$result_nodes{'image_inline_or_not'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'image_inline_or_not'};
$result_menus{'image_inline_or_not'} = {
'cmdname' => 'node',
@@ -1926,7 +1983,7 @@ $result_converted{'xml'}->{'image_inline_or_not'} = '<image><imagefile>A</imagef
<para>Para <image where="inline"><imagefile>hh</imagefile></image>.
</para>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on"><image where="inline"><imagefile>node_image</imagefile></image></nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on"><image where="inline"><imagefile>node_image</imagefile></image></nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
<image><imagefile>B</imagefile></image>
diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl
index be132fdb5a..68db4974b9 100644
--- a/macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl
+++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/node_and_bye.pl
@@ -104,20 +104,8 @@ $result_nodes{'node_and_bye'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'node_and_bye'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_and_bye'};
$result_menus{'node_and_bye'} = {
'cmdname' => 'node',
@@ -150,7 +138,7 @@ $result_directions_text{'node_and_bye'} = 'element: No associated command (type
';
-$result_converted{'xml'}->{'node_and_bye'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'node_and_bye'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<bye></bye>
';
diff --git a/macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl b/macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl
index 7ad42ec81e..cb7ee95d62 100644
--- a/macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl
+++ b/macros/texinfo/texinfo/tp/t/results/xml_tests/node_no_section.pl
@@ -74,20 +74,8 @@ $result_nodes{'node_no_section'} = {
'extra' => {
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'node_no_section'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'node_no_section'};
$result_menus{'node_no_section'} = {
'cmdname' => 'node',
@@ -101,7 +89,7 @@ $result_errors{'node_no_section'} = [];
-$result_converted{'xml'}->{'node_no_section'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'node_no_section'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
';
1;
diff --git a/macros/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl b/macros/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl
index b53831d74a..2fac70f4de 100644
--- a/macros/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl
+++ b/macros/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl
@@ -1651,20 +1651,8 @@ $result_nodes{'block_commands_in_table'} = {
},
'normalized' => 'Top',
'spaces_before_argument' => ' '
- },
- 'node_up' => {
- 'extra' => {
- 'manual_content' => [
- {
- 'text' => 'dir'
- }
- ],
- 'top_node_up' => {}
- },
- 'type' => 'top_node_up'
}
};
-$result_nodes{'block_commands_in_table'}{'node_up'}{'extra'}{'top_node_up'} = $result_nodes{'block_commands_in_table'};
$result_menus{'block_commands_in_table'} = {
'cmdname' => 'node',
@@ -1793,7 +1781,7 @@ end example.
';
-$result_converted{'xml'}->{'block_commands_in_table'} = '<node name="Top" spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'block_commands_in_table'} = '<node name="Top" spaces=" "><nodename>Top</nodename></node>
<top spaces=" "><sectiontitle>Element</sectiontitle>
<table commandarg="emph" spaces=" " endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/t/test_sort.t b/macros/texinfo/texinfo/tp/t/test_sort.t
index c5dd741ef9..ea64e926d3 100644
--- a/macros/texinfo/texinfo/tp/t/test_sort.t
+++ b/macros/texinfo/texinfo/tp/t/test_sort.t
@@ -51,8 +51,10 @@ foreach my $entry (@{$sorted_index_entries->{'cp'}}) {
push @entries, $entry->{'key'};
}
+use utf8;
+
# e is before E because they are equal and e appears before E in the document
-my @entries_ref = ('!', '"', 'aaaaaaaaaaaa', 'e', 'E', 'e~', 'l');
+my @entries_ref = ('!', '"', 'aaaaaaaaaaaa', 'e', 'E', 'ł', 'ẽ');
cmp_deeply (\@entries, \@entries_ref, 'sorted index entries');
@@ -64,8 +66,9 @@ my @letter_entries_ref = (
{'!' => [ '!' ]},
{'"' => [ '"' ]},
{'A' => [ 'aaaaaaaaaaaa' ]},
- {'E' => [ 'e', 'E', 'e~']},
- {'L' => [ 'l' ]},
+ {'E' => [ 'e', 'E']},
+ {'Å' => [ 'Å‚' ]},
+ {'Ẽ' => [ 'ẽ' ]}
);
my @letter_entries;
diff --git a/macros/texinfo/texinfo/tp/t/test_utils.pl b/macros/texinfo/texinfo/tp/t/test_utils.pl
index 6d137ecf51..08f99008a6 100644
--- a/macros/texinfo/texinfo/tp/t/test_utils.pl
+++ b/macros/texinfo/texinfo/tp/t/test_utils.pl
@@ -684,8 +684,6 @@ sub test($$)
if ($parser_options and $parser_options->{'test_formats'}) {
push @tested_formats, @{$parser_options->{'test_formats'}};
delete $parser_options->{'test_formats'};
- #} elsif ($self->{'test_formats'}) {
- # push @tested_formats, @{$self->{'test_formats'}};
}
my $parser = Texinfo::Parser::parser({'TEST' => 1,
@@ -787,16 +785,7 @@ sub test($$)
= &{$formats{$format}}($self, $test_name, $format_type,
$result, $parser,
$parser_options, $format_converter_options);
-
- # TODO: is it really useful to give this warning?
$converted_errors{$format} = undef if (!@{$converted_errors{$format}});
- if (defined($converted{$format}) and $format =~ /^file_/) {
- warn "Warning: errors printed for $format by $test_name\n";
- foreach my $error_message (@{$converted_errors{$format}}) {
- warn $error_message->{'error_line'};
- }
- }
- #print STDERR "$format: \n$converted{$format}";
# output converted result and errors in files if $arg_output is set
if ($arg_output) {
@@ -943,25 +932,17 @@ sub test($$)
if (defined($converted{$format})) {
$out_result .= "\n".'$result_converted{\''.$format.'\'}->{\''
.$test_name.'\'} = \''.protect_perl_string($converted{$format})."';\n\n";
- #print STDERR "$format: \n$converted{$format}";
}
if (defined($converted_errors{$format})) {
local $Data::Dumper::Sortkeys = 1;
$out_result .= Data::Dumper->Dump([$converted_errors{$format}],
['$result_converted_errors{\''.$format.'\'}->{\''.$test_name.'\'}']) ."\n\n";
- #print STDERR "".Data::Dumper->Dump([$converted_errors{$format}]);
}
}
$out_result .= "1;\n";
print OUT $out_result;
close (OUT);
- #if (ref($test_case) ne 'ARRAY') {
- # my $out_texi_file = "t/results/$self->{'name'}/$test_name.texi";
- # open (OUT, ">$out_texi_file") or die "Open $out_texi_file: $!\n";
- # print OUT $texi_string_result;
- # close (OUT);
- #}
print STDERR "--> $test_name\n".Texinfo::Convert::Texinfo::convert($result)."\n"
if ($self->{'generate'});
@@ -986,8 +967,6 @@ sub test($$)
ok (Texinfo::Convert::Texinfo::convert($result) eq $result_texis{$test_name},
$test_name.' texi');
if ($todos{'text'}) {
- #TODO: {
- #local $TODO = $todos{'text'};
SKIP: {
skip $todos{'text'}, 1;
ok ($converted_text eq $result_texts{$test_name}, $test_name.' text');
@@ -1017,8 +996,6 @@ sub test($$)
$tests_count += 1;
my $errors = compare_dirs_files($reference_dir, $results_dir);
if ($todos{$format}) {
- #TODO: {
- # local $TODO = $todos{$format};
SKIP: {
skip $todos{$format}, 1;
ok (!defined($errors), $test_name.' converted '.$format)
@@ -1043,8 +1020,8 @@ sub test($$)
$reference_exists = 1;
$tests_count += 1;
if ($todos{$format}) {
- TODO: {
- local $TODO = $todos{$format};
+ SKIP: {
+ skip $todos{$format}, 1;
ok ($converted{$format}
eq $result_converted{$format}->{$test_name},
$test_name.' converted '.$format);
@@ -1061,12 +1038,9 @@ sub test($$)
$result_converted_errors{$format}->{$test_name}),
$test_name.' errors '.$format);
}
- #print STDERR "$format: \n$converted{$format}";
}
}
- #is (Texinfo::Convert::Texinfo::convert($result), $result_texis{$test_name}, $test_name.' text');
}
- #exit;
return $tests_count;
}
diff --git a/macros/texinfo/texinfo/tp/tests/Makefile.am b/macros/texinfo/texinfo/tp/tests/Makefile.am
index 9ff2627ef4..a33e8be5a5 100644
--- a/macros/texinfo/texinfo/tp/tests/Makefile.am
+++ b/macros/texinfo/texinfo/tp/tests/Makefile.am
@@ -26,10 +26,7 @@ tex_html_tests = tex_html
DIST_SUBDIRS = many_input_files $(base_tests) $(tex_html_tests)
SUBDIRS = . many_input_files
-copy-tests: copy-base
- cd many_input_files && $(MAKE) copy-tests
-
-copy-base:
+copy-tests:
$(srcdir)/parser_tests.sh -copy $(base_tests)
copy-tex-html:
@@ -39,11 +36,7 @@ copy-tex-html:
clean-tests:
$(srcdir)/parser_tests.sh -clean $(base_tests) $(tex_html_tests)
-other_tests = \
- t/stdout.sh \
- t/stdout_split.sh
-
-TESTS = $(one_test_files_generated_list) $(other_tests)
+TESTS = $(one_test_files_generated_list)
AM_TESTS_ENVIRONMENT = srcdir="$(srcdir)"; export srcdir; top_srcdir="$(top_srcdir)"; export top_srcdir; builddir="$(builddir)"; export buildir; top_builddir="$(top_builddir)"; export top_builddir;
@@ -53,23 +46,8 @@ all-checks all-check: all
tex-html-checks tex-html-check: all
$(MAKE) $(AM_MAKEFLAGS) check TEX_HTML_TESTS=yes
-# This is done in this directory to be sure that the files are there
-# when check is done in this directory.
-# Some files are in 2 directories in order to get the same result
-# in both test run locations.
-all-local: equivalent_nodes-noderename.cnf sectioning/equivalent_nodes-noderename.cnf
-
-sectioning/equivalent_nodes-noderename.cnf: sectioning/renamednodes.cnf-ref
- ${INSTALL_DATA} $(srcdir)/sectioning/renamednodes.cnf-ref $@
-
-equivalent_nodes-noderename.cnf: sectioning/renamednodes.cnf-ref
- ${INSTALL_DATA} $(srcdir)/sectioning/renamednodes.cnf-ref $@
-
EXTRA_DIST = run_parser_all.sh parser_tests.sh \
- $(one_test_files_generated_list) coverage_macro.texi $(other_tests) reference
-
-DISTCLEANFILES = unknown_nodes_renamed-noderename.cnf \
- equivalent_nodes-noderename.cnf
+ $(one_test_files_generated_list) coverage_macro.texi
dist-hook:
rm -rf `find $(distdir)/reference -name .git`
diff --git a/macros/texinfo/texinfo/tp/tests/Makefile.in b/macros/texinfo/texinfo/tp/tests/Makefile.in
index a834bdea9e..2166bb5672 100644
--- a/macros/texinfo/texinfo/tp/tests/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -562,6 +562,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -717,6 +718,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -784,11 +786,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -854,6 +858,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -874,6 +879,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -908,6 +914,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -922,6 +929,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -1000,8 +1008,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -1017,14 +1023,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1114,6 +1119,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1147,6 +1153,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1159,6 +1166,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1177,6 +1185,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1280,6 +1289,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1299,7 +1309,6 @@ one_test_files_generated_list = \
test_scripts/formatting_test_redefine_need.sh \
test_scripts/formatting_split_nocopying_split_dev_null.sh \
test_scripts/formatting_simplest_test_css.sh \
- test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh \
test_scripts/sectioning_sectioning_directions.sh \
test_scripts/indices_nodes_before_top_and_sections_html_chapter.sh \
test_scripts/indices_nodes_before_top_and_sections_html_chapter_nodes.sh \
@@ -1396,17 +1405,10 @@ base_tests = formatting sectioning indices nested_formats contents layout
tex_html_tests = tex_html
DIST_SUBDIRS = many_input_files $(base_tests) $(tex_html_tests)
SUBDIRS = . many_input_files
-other_tests = \
- t/stdout.sh \
- t/stdout_split.sh
-
-TESTS = $(one_test_files_generated_list) $(other_tests)
+TESTS = $(one_test_files_generated_list)
AM_TESTS_ENVIRONMENT = srcdir="$(srcdir)"; export srcdir; top_srcdir="$(top_srcdir)"; export top_srcdir; builddir="$(builddir)"; export buildir; top_builddir="$(top_builddir)"; export top_builddir;
EXTRA_DIST = run_parser_all.sh parser_tests.sh \
- $(one_test_files_generated_list) coverage_macro.texi $(other_tests) reference
-
-DISTCLEANFILES = unknown_nodes_renamed-noderename.cnf \
- equivalent_nodes-noderename.cnf
+ $(one_test_files_generated_list) coverage_macro.texi
all: all-recursive
@@ -1718,13 +1720,6 @@ test_scripts/formatting_simplest_test_css.sh.log: test_scripts/formatting_simple
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh.log: test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh
- @p='test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh'; \
- b='test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
test_scripts/sectioning_sectioning_directions.sh.log: test_scripts/sectioning_sectioning_directions.sh
@p='test_scripts/sectioning_sectioning_directions.sh'; \
b='test_scripts/sectioning_sectioning_directions.sh'; \
@@ -2362,20 +2357,6 @@ test_scripts/tex_html_formatting_singular.sh.log: test_scripts/tex_html_formatti
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-t/stdout.sh.log: t/stdout.sh
- @p='t/stdout.sh'; \
- b='t/stdout.sh'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
-t/stdout_split.sh.log: t/stdout_split.sh
- @p='t/stdout_split.sh'; \
- b='t/stdout_split.sh'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
.test.log:
@p='$<'; \
$(am__set_b); \
@@ -2455,7 +2436,7 @@ distdir-am: $(DISTFILES)
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive
-all-am: Makefile all-local
+all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
install: install-recursive
@@ -2487,7 +2468,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -2560,11 +2540,11 @@ uninstall-am:
.MAKE: $(am__recursive_targets) check-am install-am install-strip
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
- check check-TESTS check-am clean clean-generic cscopelist-am \
- ctags ctags-am dist-hook distclean distclean-generic \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-TESTS check-am clean clean-generic cscopelist-am ctags \
+ ctags-am dist-hook distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
@@ -2586,10 +2566,7 @@ $(srcdir)/Makefile.onetst: \
-base '$(base_tests)' \
-tex_html '$(tex_html_tests)'
-copy-tests: copy-base
- cd many_input_files && $(MAKE) copy-tests
-
-copy-base:
+copy-tests:
$(srcdir)/parser_tests.sh -copy $(base_tests)
copy-tex-html:
@@ -2605,18 +2582,6 @@ all-checks all-check: all
tex-html-checks tex-html-check: all
$(MAKE) $(AM_MAKEFLAGS) check TEX_HTML_TESTS=yes
-# This is done in this directory to be sure that the files are there
-# when check is done in this directory.
-# Some files are in 2 directories in order to get the same result
-# in both test run locations.
-all-local: equivalent_nodes-noderename.cnf sectioning/equivalent_nodes-noderename.cnf
-
-sectioning/equivalent_nodes-noderename.cnf: sectioning/renamednodes.cnf-ref
- ${INSTALL_DATA} $(srcdir)/sectioning/renamednodes.cnf-ref $@
-
-equivalent_nodes-noderename.cnf: sectioning/renamednodes.cnf-ref
- ${INSTALL_DATA} $(srcdir)/sectioning/renamednodes.cnf-ref $@
-
dist-hook:
rm -rf `find $(distdir)/reference -name .git`
diff --git a/macros/texinfo/texinfo/tp/tests/Makefile.onetst b/macros/texinfo/texinfo/tp/tests/Makefile.onetst
index 0915fa8988..5ad6ada7d3 100644
--- a/macros/texinfo/texinfo/tp/tests/Makefile.onetst
+++ b/macros/texinfo/texinfo/tp/tests/Makefile.onetst
@@ -20,7 +20,6 @@ one_test_files_generated_list = \
test_scripts/formatting_test_redefine_need.sh \
test_scripts/formatting_split_nocopying_split_dev_null.sh \
test_scripts/formatting_simplest_test_css.sh \
- test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh \
test_scripts/sectioning_sectioning_directions.sh \
test_scripts/indices_nodes_before_top_and_sections_html_chapter.sh \
test_scripts/indices_nodes_before_top_and_sections_html_chapter_nodes.sh \
diff --git a/macros/texinfo/texinfo/tp/tests/README b/macros/texinfo/texinfo/tp/tests/README
index f5f8728873..cb5054db5a 100644
--- a/macros/texinfo/texinfo/tp/tests/README
+++ b/macros/texinfo/texinfo/tp/tests/README
@@ -44,7 +44,7 @@ results are in res_parser directories. There can be these pairs.
and diffs are put in the diffs/ subdir.
For example, to investigate a failure in the
-test_scripts/layout_formaatting_docbook.sh test, compare the contents of the
+test_scripts/layout_formatting_docbook.sh test, compare the contents of the
files in the layout_res_parser/formatting_docbook and
layout_out_parser/formatting_docbook directories, e.g.
@@ -84,11 +84,9 @@ Regenerating test results
To update the test results, first the tests must be run as above.
Giving -copy as the first argument to ../run_parser_all.sh or
-parser_tests.sh (tex_html_tests.sh, which needs TEX_HTML_TESTS or ALL_TESTS
-to be set to "yes", but otherwise operates similarly) will cause the
-reference results to be copied from the results the last time the tests
-were run. For example, to update the reference results for one
-particular test:
+parser_tests.sh will cause the reference results to be copied
+from the results the last time the tests were run. For example,
+to update the reference results for one particular test:
$ ./parser_tests.sh -copy formatting
The copy-* make targets update all the references for various large sets
@@ -189,13 +187,13 @@ Deleting a test
Run "make" to recreate the test scripts (which runs
../maintain/regenerate_cmd_tests.sh).
-svn status test_scripts/
+git status test_scripts/
-Then "svn rm" the missing files.
+Then "git rm" the missing files.
Delete directories containing reference test results, e.g.
ls -d formatting/*/unknown_nodes_renamed
rm -r formatting/out_parser/unknown_nodes_renamed
-svn rm formatting/res_parser/unknown_nodes_renamed
+git rm formatting/res_parser/unknown_nodes_renamed
diff --git a/macros/texinfo/texinfo/tp/tests/contents/Makefile.in b/macros/texinfo/texinfo/tp/tests/contents/Makefile.in
index 6761bc6598..54f05ab740 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/contents/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -276,6 +276,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -431,6 +432,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -498,11 +500,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -568,6 +572,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -588,6 +593,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -622,6 +628,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -636,6 +643,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -714,8 +722,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -731,14 +737,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -828,6 +833,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -861,6 +867,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -873,6 +880,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -891,6 +899,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -994,6 +1003,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_begin_info/contents_at_begin.info b/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_begin_info/contents_at_begin.info
index df9f7c46e8..83df68f9de 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_begin_info/contents_at_begin.info
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_begin_info/contents_at_begin.info
@@ -28,3 +28,8 @@ Node: Top91
Node: chapter257

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_end_info/contents_at_end.info b/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_end_info/contents_at_end.info
index ce5229e477..2a4f2574fd 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_end_info/contents_at_end.info
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_at_end_info/contents_at_end.info
@@ -28,3 +28,8 @@ Node: Top87
Node: chapter229

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_chapter_info/contents_in_middle_chapter.info b/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_chapter_info/contents_in_middle_chapter.info
index 8f6f42ef44..39025a85b4 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_chapter_info/contents_in_middle_chapter.info
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_chapter_info/contents_in_middle_chapter.info
@@ -41,3 +41,8 @@ Node: chapter274
Node: section427

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_section_info/contents_in_middle_section.info b/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_section_info/contents_in_middle_section.info
index 6ed1189896..241709b56e 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_section_info/contents_in_middle_section.info
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/contents_in_middle_section_info/contents_in_middle_section.info
@@ -49,3 +49,8 @@ Node: section413
Node: section1553

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/chapter.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
index ca9075e344..f150fab87f 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -68,7 +68,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -84,7 +84,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_abt.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_abt.html
index 9fa3ef0077..d63b099f23 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html
index b0368f7d42..9095d61ae7 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_chapter/double_contents_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -53,7 +53,7 @@ ul.no-bullet {list-style: none}
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_info/double_contents.info b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_info/double_contents.info
index 7d79344f30..cbf23e078f 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_info/double_contents.info
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_info/double_contents.info
@@ -39,3 +39,8 @@ Node: chapter230
Node: section358

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
index 26c33c5973..7c58a915a5 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#section" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -81,7 +81,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -110,7 +110,7 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html
index 8489c22285..ddbfe93e60 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_chapter/double_contents_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
index 3a417e2885..f73104382e 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -59,7 +59,7 @@ ul.no-bullet {list-style: none}
<ul class="no-bullet">
<li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a>
<ul class="no-bullet">
- <li><a id="toc-section-with-contents" href="section.html#section">1.1 section with contents</a></li>
+ <li><a id="toc-section-with-contents" href="section.html">1.1 section with contents</a></li>
</ul></li>
</ul>
</div>
@@ -67,7 +67,7 @@ ul.no-bullet {list-style: none}
<p>The chapter
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="section.html#section">1.1 section with contents</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="section.html">1.1 section with contents</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html
index ad60e4fd1a..63275d583f 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/double_contents_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -145,7 +145,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
index 7501a5d95e..43ff4f4692 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/index.html
@@ -40,9 +40,9 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter-1" href="chapter.html#chapter">1 Chapter 1</a>
+ <li><a id="toc-Chapter-1" href="chapter.html">1 Chapter 1</a>
<ul class="no-bullet">
- <li><a id="toc-section-with-contents" href="section.html#section">1.1 section with contents</a></li>
+ <li><a id="toc-section-with-contents" href="section.html">1.1 section with contents</a></li>
</ul></li>
</ul>
</div>
@@ -50,7 +50,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -62,14 +62,14 @@ ul.no-bullet {list-style: none}
<p>Double contents.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 Chapter 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 Chapter 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
index 8763ca7cca..d7e405ae21 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_nodes/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -56,7 +56,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter-1" href="chapter.html#chapter">1 Chapter 1</a>
+ <li><a id="toc-Chapter-1" href="chapter.html">1 Chapter 1</a>
<ul class="no-bullet">
<li><a id="toc-section-with-contents" href="#section">1.1 section with contents</a></li>
</ul></li>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
index ebc1d5f10f..4c8f78ebbc 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -58,7 +58,7 @@ ul.no-bullet {list-style: none}
<ul class="no-bullet">
<li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a>
<ul class="no-bullet">
- <li><a id="toc-section-with-contents" href="section.html#section">1.1 section with contents</a></li>
+ <li><a id="toc-section-with-contents" href="section.html">1.1 section with contents</a></li>
</ul></li>
</ul>
</div>
@@ -66,16 +66,16 @@ ul.no-bullet {list-style: none}
<p>The chapter
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="section.html#section">1.1 section with contents</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="section.html">1.1 section with contents</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/double_contents_abt.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/double_contents_abt.html
index 8489c22285..ddbfe93e60 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/double_contents_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/double_contents_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/index.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/index.html
index 7758cebea0..740714486c 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/index.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/index.html
@@ -40,9 +40,9 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter-1" href="chapter.html#chapter">1 Chapter 1</a>
+ <li><a id="toc-Chapter-1" href="chapter.html">1 Chapter 1</a>
<ul class="no-bullet">
- <li><a id="toc-section-with-contents" href="section.html#section">1.1 section with contents</a></li>
+ <li><a id="toc-section-with-contents" href="section.html">1.1 section with contents</a></li>
</ul></li>
</ul>
</div>
@@ -50,7 +50,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -61,14 +61,14 @@ ul.no-bullet {list-style: none}
<p>Double contents.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 Chapter 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 Chapter 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/section.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/section.html
index dbb7ae383c..e75c20086e 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/section.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_inline_section/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -55,7 +55,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter-1" href="chapter.html#chapter">1 Chapter 1</a>
+ <li><a id="toc-Chapter-1" href="chapter.html">1 Chapter 1</a>
<ul class="no-bullet">
<li><a id="toc-section-with-contents" href="#section">1.1 section with contents</a></li>
</ul></li>
@@ -65,9 +65,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/chapter.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
index aaa2c96ef6..fe973f8cfa 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -54,7 +54,7 @@ ul.no-bullet {list-style: none}
<p>The chapter
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="section.html#section">1.1 section with contents</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="section.html">1.1 section with contents</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_abt.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_abt.html
index 13e71fe354..9274b1e1c2 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -145,7 +145,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html
index a39aaa0fd9..b2ef5d8ee3 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/double_contents_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -46,15 +46,15 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter-1" href="chapter.html#chapter">1 Chapter 1</a>
+ <li><a id="toc-Chapter-1" href="chapter.html">1 Chapter 1</a>
<ul class="no-bullet">
- <li><a id="toc-section-with-contents" href="section.html#section">1.1 section with contents</a></li>
+ <li><a id="toc-section-with-contents" href="section.html">1.1 section with contents</a></li>
</ul></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/index.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/index.html
index ffb617943a..72f4a63c76 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/index.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/index.html
@@ -37,7 +37,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -49,14 +49,14 @@ ul.no-bullet {list-style: none}
<p>Double contents.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 Chapter 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 Chapter 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/section.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/section.html
index c332a97a02..33c2fe4987 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/section.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_nodes/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/chapter.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/chapter.html
index f2f7b0f290..4c6a567f64 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/chapter.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -53,16 +53,16 @@ ul.no-bullet {list-style: none}
<p>The chapter
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="section.html#section">1.1 section with contents</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="section.html">1.1 section with contents</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="section.html#section" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="section.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_abt.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_abt.html
index 9fa3ef0077..d63b099f23 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_abt.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -144,7 +144,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html
index 4f78c48d2b..4960001a84 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/double_contents_toc.html
@@ -35,7 +35,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -45,15 +45,15 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter-1" href="chapter.html#chapter">1 Chapter 1</a>
+ <li><a id="toc-Chapter-1" href="chapter.html">1 Chapter 1</a>
<ul class="no-bullet">
- <li><a id="toc-section-with-contents" href="section.html#section">1.1 section with contents</a></li>
+ <li><a id="toc-section-with-contents" href="section.html">1.1 section with contents</a></li>
</ul></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/index.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/index.html
index c323dc0874..935f1ca8c3 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/index.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/index.html
@@ -37,7 +37,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -48,14 +48,14 @@ ul.no-bullet {list-style: none}
<p>Double contents.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 Chapter 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 Chapter 1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/section.html b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/section.html
index 000721cfec..4c51e154e9 100644
--- a/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/section.html
+++ b/macros/texinfo/texinfo/tp/tests/contents/res_parser/double_contents_section/section.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="double_contents_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="double_contents_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -52,9 +52,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/formatting/Makefile.am b/macros/texinfo/texinfo/tp/tests/formatting/Makefile.am
index 1ccbcea850..c8b80f82d6 100644
--- a/macros/texinfo/texinfo/tp/tests/formatting/Makefile.am
+++ b/macros/texinfo/texinfo/tp/tests/formatting/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = \
lightweight_markups.texi japanese_long_name.texi \
file.css list-of-tests res_parser
-DISTCLEANFILES = tests.log tests.out unknown_nodes_renamed-noderename.cnf
+DISTCLEANFILES = tests.log tests.out
distclean-local:
rm -rf out_parser diffs test_log
diff --git a/macros/texinfo/texinfo/tp/tests/formatting/Makefile.in b/macros/texinfo/texinfo/tp/tests/formatting/Makefile.in
index 4b69203d36..622314362f 100644
--- a/macros/texinfo/texinfo/tp/tests/formatting/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/formatting/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -276,6 +276,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -431,6 +432,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -498,11 +500,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -568,6 +572,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -588,6 +593,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -622,6 +628,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -636,6 +643,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -714,8 +722,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -731,14 +737,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -828,6 +833,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -861,6 +867,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -873,6 +880,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -891,6 +899,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -994,6 +1003,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1009,7 +1019,7 @@ EXTRA_DIST = \
lightweight_markups.texi japanese_long_name.texi \
file.css list-of-tests res_parser
-DISTCLEANFILES = tests.log tests.out unknown_nodes_renamed-noderename.cnf
+DISTCLEANFILES = tests.log tests.out
all: all-am
.SUFFIXES:
diff --git a/macros/texinfo/texinfo/tp/tests/indices/Makefile.in b/macros/texinfo/texinfo/tp/tests/indices/Makefile.in
index 698fe253a9..e40513caed 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/indices/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -276,6 +276,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -431,6 +432,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -498,11 +500,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -568,6 +572,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -588,6 +593,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -622,6 +628,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -636,6 +643,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -714,8 +722,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -731,14 +737,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -828,6 +833,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -861,6 +867,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -873,6 +880,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -891,6 +899,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -994,6 +1003,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
index 296ae844f9..51dd2b09d0 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_and_node_same_name/index_and_node_same_name.html
@@ -49,7 +49,7 @@ ul.no-bullet {list-style: none}
<span id="index-node-2"></span>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#index-node">1 index node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#index-node" rel="index">1 index node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
index 5e82778b10..5c99b8e25a 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote/index_entry_in_footnote.html
@@ -47,7 +47,7 @@ ul.no-bullet {list-style: none}
<p>Top node<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#Index">Appendix A index</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#Index" rel="index">Appendix A index</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -93,7 +93,7 @@ ul.no-bullet {list-style: none}
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote
</p>
<p>Another para in footnote.
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_info/index_entry_in_footnote.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_info/index_entry_in_footnote.info
index f9b66485a8..65ffaca392 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_info/index_entry_in_footnote.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_info/index_entry_in_footnote.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_separated_info/index_entry_in_footnote.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_separated_info/index_entry_in_footnote.info
index 58ba8cd0cd..b73b7bb3da 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_separated_info/index_entry_in_footnote.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_entry_in_footnote_separated_info/index_entry_in_footnote.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes/index_nodes.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes/index_nodes.html
index 74f19128d4..bdc3d144bb 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes/index_nodes.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes/index_nodes.html
@@ -149,7 +149,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#first" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -201,12 +201,12 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#second">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<span id="second"></span><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#a-node">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
index cd2ec53f94..717855c668 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/a-node.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="a-node"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="another.html#another" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="another.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -66,20 +66,20 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -110,20 +110,20 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="a-node_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#a-node_cp_symbol-1"><b>!</b></a>
@@ -140,17 +140,17 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="another.html#another" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="another.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/another.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/another.html
index 2880ea402f..23b49bf941 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/another.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/another.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="another"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="a-node.html#a-node" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="a-node.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/first.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/first.html
index a30da53e36..fccdf840b0 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/first.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/first.html
@@ -35,17 +35,17 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="first"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="second.html#second" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="second.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -73,17 +73,17 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="#first">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="first_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#first_cp_symbol-1"><b>!</b></a>
@@ -98,7 +98,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="second.html#second">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="second.html" rel="index">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index.html
index c3503ac67a..6914efe0d1 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index.html
@@ -36,7 +36,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -60,20 +60,20 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-E">E</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_symbol-1"><b>!</b></a>
@@ -98,13 +98,13 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_fn_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_fn_letter-A"><b>A</b></a>
@@ -131,20 +131,20 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-E">E</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-entry-in-node-1">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top_cp_symbol-1"><b>!</b></a>
@@ -159,14 +159,14 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="first.html#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="first.html" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index_nodes_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index_nodes_abt.html
index 909c3c7f38..95b9e045ca 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index_nodes_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/index_nodes_abt.html
@@ -35,9 +35,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -145,9 +145,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/second.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/second.html
index 3d03acb209..0ff960f50f 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/second.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_nodes_nodes/second.html
@@ -35,25 +35,25 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="second"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt;&lt; ]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="first.html#first" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="another.html#another" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="first.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="another.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_nodes_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
<h3 class="node-heading">second</h3>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="a-node.html#a-node">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="a-node.html" rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="another.html#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="another.html">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -68,13 +68,13 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="a-node.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html#a-node">a node</a></td></tr>
+<tr><td></td><td valign="top"><a href="a-node.html#index-a-function"><code>a function</code></a></td><td>&nbsp;</td><td valign="top"><a href="a-node.html">a node</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html#first">first</a></td></tr>
+<tr><td></td><td valign="top"><a href="first.html#index-fun-in-node"><code>fun in node</code></a></td><td>&nbsp;</td><td valign="top"><a href="first.html">first</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="second_fn_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="another.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="another.html#another">another</a></td></tr>
+<tr><td></td><td valign="top"><a href="another.html#index-somewhere"><code>somewhere</code></a></td><td>&nbsp;</td><td valign="top"><a href="another.html">another</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#second_fn_letter-A"><b>A</b></a>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Chapter.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Chapter.html
index d5f50ef4a7..f8bca1cf00 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Chapter.html
@@ -40,16 +40,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Chapter" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -73,15 +73,15 @@ domain<a id="DOCF1" href="index_special_region_fot.html#FOOT1"><sup>1</sup></a>.
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Chapter_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html">Appendix A Copying and indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="#Chapter">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Chapter_cp_letter-P">P</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="#Chapter">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Chapter_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Chapter_cp_letter-C"><b>C</b></a>
@@ -111,20 +111,20 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Chapter" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
index 4142eccb53..8d66e616a9 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/Copying-and-indices.html
@@ -40,18 +40,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
@@ -86,14 +86,14 @@ domain<a id="DOCF1_2" href="index_special_region_fot.html#FOOT1_2"><sup>2</sup><
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_cp_letter-C"><b>C</b></a>
@@ -117,14 +117,14 @@ domain<a id="DOCF1_2" href="index_special_region_fot.html#FOOT1_2"><sup>2</sup><
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_cp_letter-C"><b>C</b></a>
@@ -146,8 +146,8 @@ domain<a id="DOCF1_2" href="index_special_region_fot.html#FOOT1_2"><sup>2</sup><
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_fn_letter-A"><b>A</b></a>
@@ -158,16 +158,16 @@ domain<a id="DOCF1_2" href="index_special_region_fot.html#FOOT1_2"><sup>2</sup><
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index.html
index 889e1c54a3..6d1a8b650a 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index.html
@@ -44,25 +44,25 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_abt.html
index f6399cfb6f..881612cf58 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_abt.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -150,9 +150,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
index 39e9e4abc3..9bd66ebc6a 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_fot.html
@@ -41,28 +41,28 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Foot"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="Chapter.html#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="Chapter.html#DOCF1">(1)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
<span id="index-copying-Public-domain"></span>
-<h3><a id="FOOT1_2" href="Copying-and-indices.html#DOCF1_2">(2)</a></h3>
+<h5><a id="FOOT1_2" href="Copying-and-indices.html#DOCF1_2">(2)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
<span id="index-copying-Public-domain"></span>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html
index fa3a92e213..459dc99b0c 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region/index_special_region_toc.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="contents-heading">Table of Contents</h1>
@@ -51,15 +51,15 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter" href="Chapter.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Chapter" href="Chapter.html">1 Chapter</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Chapter.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
index 51da930035..8bdcfafb61 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Chapter.html
@@ -40,18 +40,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="chapter">1 Chapter</h1>
@@ -73,15 +73,15 @@ domain<a id="DOCF1_3" href="index_special_region_fot.html#FOOT1_3"><sup>3</sup><
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Chapter_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html">Appendix A Copying and indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Chapter_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Chapter_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Chapter_cp_letter-C"><b>C</b></a>
@@ -111,22 +111,22 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
index 0ef5685e2d..7c5274fdd1 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/Copying-and-indices.html
@@ -40,18 +40,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
@@ -86,14 +86,14 @@ domain<a id="DOCF1_4" href="index_special_region_fot.html#FOOT1_4"><sup>4</sup><
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_cp_letter-C"><b>C</b></a>
@@ -117,14 +117,14 @@ domain<a id="DOCF1_4" href="index_special_region_fot.html#FOOT1_4"><sup>4</sup><
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_cp_letter-C"><b>C</b></a>
@@ -146,8 +146,8 @@ domain<a id="DOCF1_4" href="index_special_region_fot.html#FOOT1_4"><sup>4</sup><
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_fn_letter-A"><b>A</b></a>
@@ -158,16 +158,16 @@ domain<a id="DOCF1_4" href="index_special_region_fot.html#FOOT1_4"><sup>4</sup><
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index.html
index 5180f63f31..10ef711d36 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index.html
@@ -61,7 +61,7 @@ domain<a id="DOCF1" href="index_special_region_fot.html#FOOT1"><sup>2</sup></a>.
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top-1_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html">Appendix A Copying and indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top-1_cp_letter-P">P</th><td></td><td></td></tr>
@@ -86,7 +86,7 @@ domain<a id="DOCF1" href="index_special_region_fot.html#FOOT1"><sup>2</sup></a>.
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -94,14 +94,14 @@ domain<a id="DOCF1" href="index_special_region_fot.html#FOOT1"><sup>2</sup></a>.
</tr></table>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_abt.html
index 00f10d16d5..f42bdd9913 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_abt.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -150,9 +150,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
index 811b257d43..98489f4274 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_fot.html
@@ -41,37 +41,37 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Foot"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT2" href="index.html#DOCF2">(1)</a></h3>
+<h5><a id="FOOT2" href="index.html#DOCF2">(1)</a></h3>
<span id="Titlepage-footnote-anchor"></span><p>This is a fine document.
</p>
<span id="index-titlepage-Titlepage-footnote"></span>
-<h3><a id="FOOT1" href="index.html#DOCF1">(2)</a></h3>
+<h5><a id="FOOT1" href="index.html#DOCF1">(2)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
<span id="index-copying-Public-domain"></span>
-<h3><a id="FOOT1_3" href="Chapter.html#DOCF1_3">(3)</a></h3>
+<h5><a id="FOOT1_3" href="Chapter.html#DOCF1_3">(3)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
<span id="index-copying-Public-domain"></span>
-<h3><a id="FOOT1_4" href="Copying-and-indices.html#DOCF1_4">(4)</a></h3>
+<h5><a id="FOOT1_4" href="Copying-and-indices.html#DOCF1_4">(4)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
<span id="index-copying-Public-domain"></span>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html
index 7e7f68eb6a..857e8a00c6 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_html/index_special_region_toc.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="contents-heading">Table of Contents</h1>
@@ -51,15 +51,15 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter" href="Chapter.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Chapter" href="Chapter.html">1 Chapter</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
index ea4b98af0f..451581ade4 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Chapter.html
@@ -40,16 +40,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -75,20 +75,20 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
index 0e6ae37c89..4992ff05c4 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/Copying-and-indices.html
@@ -40,16 +40,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -81,14 +81,14 @@ ul.no-bullet {list-style: none}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_no_insertcopying_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_no_insertcopying_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_no_insertcopying_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_no_insertcopying_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_cp_letter-C"><b>C</b></a>
@@ -110,8 +110,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_fn_letter-A"><b>A</b></a>
@@ -122,14 +122,14 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html
index 34998e2846..f5005f5ac1 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index.html
@@ -44,7 +44,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -52,14 +52,14 @@ ul.no-bullet {list-style: none}
</tr></table>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_abt.html
index 27284554e4..078edf3bfa 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_abt.html
@@ -41,7 +41,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -150,7 +150,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html
index a1105f777f..53f017b422 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying/index_special_region_no_insertcopying_toc.html
@@ -41,7 +41,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -51,13 +51,13 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter" href="Chapter.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Chapter" href="Chapter.html">1 Chapter</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
index c3bd4108d7..c69bb67f92 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Chapter.html
@@ -40,18 +40,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="chapter">1 Chapter</h1>
@@ -75,22 +75,22 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
index 137bc126ac..d2eafcbd5d 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/Copying-and-indices.html
@@ -40,18 +40,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
@@ -81,14 +81,14 @@ ul.no-bullet {list-style: none}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_no_insertcopying_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_no_insertcopying_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_no_insertcopying_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_no_insertcopying_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_cp_letter-C"><b>C</b></a>
@@ -110,8 +110,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_fn_letter-A"><b>A</b></a>
@@ -122,16 +122,16 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
index e3831c147f..96f2eda3ea 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index.html
@@ -61,7 +61,7 @@ domain<a id="DOCF1" href="index_special_region_no_insertcopying_fot.html#FOOT1">
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top-1_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html">Appendix A Copying and indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top-1_cp_letter-P">P</th><td></td><td></td></tr>
@@ -86,7 +86,7 @@ domain<a id="DOCF1" href="index_special_region_no_insertcopying_fot.html#FOOT1">
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -94,14 +94,14 @@ domain<a id="DOCF1" href="index_special_region_no_insertcopying_fot.html#FOOT1">
</tr></table>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_abt.html
index 944f0751ec..2f8b5b90c5 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_abt.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -150,9 +150,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
index 7d5dde2fb7..4b8952130f 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_fot.html
@@ -41,27 +41,27 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Foot"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT2" href="index.html#DOCF2">(1)</a></h3>
+<h5><a id="FOOT2" href="index.html#DOCF2">(1)</a></h3>
<span id="Titlepage-footnote-anchor"></span><p>This is a fine document.
</p>
<span id="index-titlepage-Titlepage-footnote"></span>
-<h3><a id="FOOT1" href="index.html#DOCF1">(2)</a></h3>
+<h5><a id="FOOT1" href="index.html#DOCF1">(2)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
<span id="index-copying-Public-domain"></span>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html
index 5f522d5302..b807ef395a 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_insertcopying_html/index_special_region_no_insertcopying_toc.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="contents-heading">Table of Contents</h1>
@@ -51,15 +51,15 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter" href="Chapter.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Chapter" href="Chapter.html">1 Chapter</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_insertcopying_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
index a2fb8cb057..38c2eaa370 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Chapter.html
@@ -40,16 +40,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -75,20 +75,20 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
index b87259b873..952261faea 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/Copying-and-indices.html
@@ -40,16 +40,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -81,14 +81,14 @@ ul.no-bullet {list-style: none}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_no_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_no_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_no_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_no_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_cp_letter-C"><b>C</b></a>
@@ -110,8 +110,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_fn_letter-A"><b>A</b></a>
@@ -122,14 +122,14 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index.html
index 8e05b0b30a..4f52a4886c 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index.html
@@ -44,7 +44,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -53,14 +53,14 @@ ul.no-bullet {list-style: none}
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_abt.html
index 34a02119f6..d1a20e5aa8 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_abt.html
@@ -41,7 +41,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
@@ -150,7 +150,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html
index 5bc04f0383..f0e662c693 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region/index_special_region_no_region_toc.html
@@ -41,7 +41,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -51,13 +51,13 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter" href="Chapter.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Chapter" href="Chapter.html">1 Chapter</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
index c2480f457c..7415d49c93 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Chapter.html
@@ -40,18 +40,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="chapter">1 Chapter</h1>
@@ -75,22 +75,22 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Copying-and-indices.html#Copying-and-indices" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Copying-and-indices.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
index d0f511db6a..14196db72b 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/Copying-and-indices.html
@@ -40,18 +40,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Copying-and-indices-1"></span><h1 class="appendix">Appendix A Copying and indices</h1>
@@ -81,14 +81,14 @@ ul.no-bullet {list-style: none}
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_no_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_no_region_fot.html#index-copying-Public-domain">Public domain</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index_special_region_no_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index_special_region_no_region_fot.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_cp_letter-C"><b>C</b></a>
@@ -110,8 +110,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices-1_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html#Chapter">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-findex-entry"><code>findex entry</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="Chapter.html#index-fun"><code>fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="Chapter.html">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices-1_fn_letter-A"><b>A</b></a>
@@ -122,16 +122,16 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="Chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
index d4a6c44da6..13cd5bb817 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index.html
@@ -61,7 +61,7 @@ domain<a id="DOCF1" href="index_special_region_no_region_fot.html#FOOT1"><sup>2<
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top-1_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a></td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html">Appendix A Copying and indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-Copying-this-document">Copying this document</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top-1_cp_letter-P">P</th><td></td><td></td></tr>
@@ -86,7 +86,7 @@ domain<a id="DOCF1" href="index_special_region_no_region_fot.html#FOOT1"><sup>2<
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -95,14 +95,14 @@ domain<a id="DOCF1" href="index_special_region_no_region_fot.html#FOOT1"><sup>2<
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="Chapter.html#Chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="Chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_abt.html
index 5f1e868516..ae337c02c1 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_abt.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -150,9 +150,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
index 84521e1a94..e6a00ea3ed 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_fot.html
@@ -41,27 +41,27 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Foot"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT2" href="index.html#DOCF2">(1)</a></h3>
+<h5><a id="FOOT2" href="index.html#DOCF2">(1)</a></h3>
<span id="Titlepage-footnote-anchor"></span><p>This is a fine document.
</p>
<span id="index-titlepage-Titlepage-footnote"></span>
-<h3><a id="FOOT1" href="index.html#DOCF1">(2)</a></h3>
+<h5><a id="FOOT1" href="index.html#DOCF1">(2)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
<span id="index-copying-Public-domain"></span>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html
index 220cdfa80b..6bac27a15b 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_special_region_no_region_html/index_special_region_no_region_toc.html
@@ -41,9 +41,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="contents-heading">Table of Contents</h1>
@@ -51,15 +51,15 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter" href="Chapter.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Chapter" href="Chapter.html">1 Chapter</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="Copying-and-indices.html" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_special_region_no_region_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index.html
index 6ad1c7324a..7f670f46a5 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index.html
@@ -35,29 +35,29 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Test-for-indices"></span><h1 class="top">Test for indices</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="node-with-printindex.html#node-with-printindex">2 node with printindex</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="node-with-printindex.html" rel="index">2 node with printindex</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="indices-refs.html#indices-refs">3 Indices refs</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="indices-refs.html#indices-refs" rel="index">3 Indices refs</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_abt.html
index d3a1e56390..788e077f1f 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_abt.html
@@ -35,9 +35,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -144,9 +144,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_toc.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_toc.html
index 9b4f2c6018..b52b4bbbdf 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/index_table_toc.html
@@ -35,9 +35,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="contents-heading">Table of Contents</h1>
@@ -45,9 +45,9 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-first-node-chapter_002c-with-ftable-and-vtable" href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></li>
- <li><a id="toc-node-with-printindex-1" href="node-with-printindex.html#node-with-printindex">2 node with printindex</a></li>
- <li><a id="toc-Indices-refs" href="indices-refs.html#indices-refs">3 Indices refs</a>
+ <li><a id="toc-first-node-chapter_002c-with-ftable-and-vtable" href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></li>
+ <li><a id="toc-node-with-printindex-1" href="node-with-printindex.html" rel="index">2 node with printindex</a></li>
+ <li><a id="toc-Indices-refs" href="indices-refs.html#indices-refs" rel="index">3 Indices refs</a>
<ul class="no-bullet">
<li><a id="toc-node-1" href="indices-refs.html#node">3.1 node</a></li>
</ul></li>
@@ -55,9 +55,9 @@ ul.no-bullet {list-style: none}
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/indices-refs.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/indices-refs.html
index 0cdbf06f3f..d6d6d6b7a0 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/indices-refs.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/indices-refs.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="indices-refs"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="node-with-printindex.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#node" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="Indices-refs"></span><h1 class="chapter">3 Indices refs</h1>
@@ -264,7 +264,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-_003foncept">?oncept</a></td><td>&nbsp;</td><td valign="top"><a href="#indices-refs">3 Indices refs</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Indices-refs_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-an-second-index-entry-in-node">an second index entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-an-second-index-entry-in-node">an second index entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-aoncept">aoncept</a></td><td>&nbsp;</td><td valign="top"><a href="#indices-refs">3 Indices refs</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Indices-refs_cp_letter-B">B</th><td></td><td></td></tr>
@@ -384,7 +384,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-honcept">honcept</a></td><td>&nbsp;</td><td valign="top"><a href="#indices-refs">3 Indices refs</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Indices-refs_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-index-entry-in-node">index entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-index-entry-in-node">index entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-ioncept">ioncept</a></td><td>&nbsp;</td><td valign="top"><a href="#indices-refs">3 Indices refs</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Indices-refs_cp_letter-J">J</th><td></td><td></td></tr>
@@ -517,9 +517,9 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="node-1"></span><h2 class="section">3.1 node</h2>
@@ -535,9 +535,9 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
index 00a3ee9193..b7955f98dd 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-ftable-and-vtable.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="node-with-ftable-and-vtable"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="first-node-chapter_002c-with-ftable-and-vtable"></span><h1 class="chapter">1 first node chapter, with ftable and vtable</h1>
@@ -87,16 +87,16 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="node-with-printindex.html#node-with-printindex" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="node-with-printindex.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-printindex.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-printindex.html
index 0bb087bd01..7d601f345b 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-printindex.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/index_table/node-with-printindex.html
@@ -34,16 +34,16 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="node-with-printindex"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="indices-refs.html#indices-refs" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[<a href="indices-refs.html#indices-refs" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#node-with-printindex" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
@@ -59,11 +59,11 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-with-printindex-1_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-fun1"><code>fun1</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-fun2"><code>fun2</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-fun1"><code>fun1</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-fun2"><code>fun2</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-with-printindex-1_fn_letter-M">M</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-more-fun"><code>more fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-more-fun"><code>more fun</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#node-with-printindex-1_fn_letter-F"><b>F</b></a>
@@ -78,8 +78,8 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-with-printindex-1_vr_letter-V">V</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-var1"><code>var1</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-var2"><code>var2</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-var1"><code>var1</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-var2"><code>var2</code></a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#node-with-printindex-1_vr_letter-V"><b>V</b></a>
@@ -168,7 +168,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="indices-refs.html#index-_003foncept">?oncept</a></td><td>&nbsp;</td><td valign="top"><a href="indices-refs.html#indices-refs">3 Indices refs</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-with-printindex-1_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-an-second-index-entry-in-node">an second index entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-an-second-index-entry-in-node">an second index entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
<tr><td></td><td valign="top"><a href="indices-refs.html#index-aoncept">aoncept</a></td><td>&nbsp;</td><td valign="top"><a href="indices-refs.html#indices-refs">3 Indices refs</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-with-printindex-1_cp_letter-B">B</th><td></td><td></td></tr>
@@ -288,7 +288,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="indices-refs.html#index-honcept">honcept</a></td><td>&nbsp;</td><td valign="top"><a href="indices-refs.html#indices-refs">3 Indices refs</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-with-printindex-1_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-index-entry-in-node">index entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable">1 first node chapter, with ftable and vtable</a></td></tr>
+<tr><td></td><td valign="top"><a href="node-with-ftable-and-vtable.html#index-index-entry-in-node">index entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="node-with-ftable-and-vtable.html">1 first node chapter, with ftable and vtable</a></td></tr>
<tr><td></td><td valign="top"><a href="indices-refs.html#index-ioncept">ioncept</a></td><td>&nbsp;</td><td valign="top"><a href="indices-refs.html#indices-refs">3 Indices refs</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="node-with-printindex-1_cp_letter-J">J</th><td></td><td></td></tr>
@@ -412,14 +412,14 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html#node-with-ftable-and-vtable" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="node-with-ftable-and-vtable.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="indices-refs.html#indices-refs" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="index_table_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#node-with-printindex" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="index_table_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
index 78473f0fb6..f6123b64a3 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/chapter.html
@@ -34,18 +34,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="A-chapter"></span><h1 class="chapter">1 A chapter</h1>
@@ -72,32 +72,32 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="A-chapter_cp_symbol-1">!</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0021-entry-in-node">! entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="A-chapter_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-concept-a-node">a concept a node</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-another">another</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="A-chapter_cp_letter-E">E</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-a">entry a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-after-printindex">entry after printindex</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-entry-in-node">entry in node</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="A-chapter_cp_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="A-chapter_cp_letter-N">N</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="#chapter">1 A chapter</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="A-chapter_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-printindex-node-in-menu-before-top">printindex node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="A-chapter_cp_letter-S">S</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-something">something</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="A-chapter_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-top-section">top section</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-top-section">top section</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#A-chapter_cp_symbol-1"><b>!</b></a>
@@ -124,16 +124,16 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="nodes_before_top_and_sections_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
index ceb145174f..810bc17727 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/index.html
@@ -37,7 +37,7 @@ ul.no-bullet {list-style: none}
<span id="first-before-top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -83,7 +83,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html#chapter">1 A chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html">1 A chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-P">P</th><td></td><td></td></tr>
@@ -152,7 +152,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html#chapter">1 A chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html">1 A chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-P">P</th><td></td><td></td></tr>
@@ -185,7 +185,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<p>after second printindex in first node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" rel="index">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -229,7 +229,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html#chapter">1 A chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html">1 A chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-P">P</th><td></td><td></td></tr>
@@ -304,7 +304,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html#chapter">1 A chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html">1 A chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-P">P</th><td></td><td></td></tr>
@@ -403,7 +403,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html#chapter">1 A chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html">1 A chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-P">P</th><td></td><td></td></tr>
@@ -441,9 +441,9 @@ ul.no-bullet {list-style: none}
<p>in top section
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#first" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 A chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html" rel="index">1 A chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="chapter.html#node-in-chapter">node in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -491,7 +491,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html#chapter">1 A chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html">1 A chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-P">P</th><td></td><td></td></tr>
@@ -524,12 +524,12 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#second">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<span id="second"></span><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#a-node">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -607,7 +607,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html#chapter">1 A chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html">1 A chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-P">P</th><td></td><td></td></tr>
@@ -679,7 +679,7 @@ ul.no-bullet {list-style: none}
<tr><td></td><td valign="top"><a href="#index-first-before-top">first before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html#chapter">1 A chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="chapter.html#index-node-in-chapter">node in chapter</a></td><td>&nbsp;</td><td valign="top"><a href="chapter.html">1 A chapter</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="top-section_cp_letter-P">P</th><td></td><td></td></tr>
@@ -714,7 +714,7 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[Contents]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html
index b44a354d58..a8b49bcfac 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter/nodes_before_top_and_sections_abt.html
@@ -35,9 +35,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -144,9 +144,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
index 8cc621dbf2..4bca682d21 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
@@ -193,7 +193,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<p>after second printindex in first node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" rel="index">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
index 01ba7c65d5..44093b0a00 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/nodes_before_top_and_sections_html_chapter_nodes/index.html
@@ -217,9 +217,9 @@ ul.no-bullet {list-style: none}
<p>in top section
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#first">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#first" rel="index">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="chapter.html#chapter">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="chapter.html#chapter" rel="index">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="chapter.html#node-in-chapter">node in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -317,7 +317,7 @@ ul.no-bullet {list-style: none}
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#second">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -339,7 +339,7 @@ ul.no-bullet {list-style: none}
</tr></table>
<h3 class="node-heading">second</h3>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#a-node">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#another">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
index 9100dca1b4..4c48d24dfa 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser/printindex_between_node_section/printindex_between_node_section.html
@@ -86,7 +86,7 @@ ul.no-bullet {list-style: none}
<span id="chapter-1"></span><h1 class="chapter">1 chapter 1</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#node-sec1">1.1 section1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#node-sec1" rel="index">1.1 section1</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_and_node_same_name/index_and_node_same_name.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_and_node_same_name/index_and_node_same_name.info
index 0079defe3f..645363000a 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_and_node_same_name/index_and_node_same_name.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_and_node_same_name/index_and_node_same_name.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote/index_entry_in_footnote.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote/index_entry_in_footnote.info
index f9b66485a8..65ffaca392 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote/index_entry_in_footnote.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote/index_entry_in_footnote.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_info/index_entry_in_footnote.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_info/index_entry_in_footnote.info
index f9b66485a8..65ffaca392 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_info/index_entry_in_footnote.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_info/index_entry_in_footnote.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_separated_info/index_entry_in_footnote.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_separated_info/index_entry_in_footnote.info
index 58ba8cd0cd..b73b7bb3da 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_separated_info/index_entry_in_footnote.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_entry_in_footnote_separated_info/index_entry_in_footnote.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_no_node_no_top/index_no_node_no_top.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_no_node_no_top/index_no_node_no_top.info
index 56d9f1d699..d12adc3cf8 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_no_node_no_top/index_no_node_no_top.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_no_node_no_top/index_no_node_no_top.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes/index_nodes b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes/index_nodes
index fc61010d8c..9f0f58ec96 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes/index_nodes
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes/index_nodes
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes_nodes/index_nodes b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes_nodes/index_nodes
index fc61010d8c..9f0f58ec96 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes_nodes/index_nodes
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_nodes_nodes/index_nodes
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_one_node/one_node b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_one_node/one_node
index b2be0a842e..31499688e3 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_one_node/one_node
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_one_node/one_node
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region/index_special_region.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region/index_special_region.info
index 658a60f9a8..8c2b63bf40 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region/index_special_region.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region/index_special_region.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
index 94b78d1bc7..c49fe087e1 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/Copying-and-indices.html
@@ -16,11 +16,11 @@ domain.
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<link href="index.html#Top" rel="start" title="Top">
-<link href="index.html#Top" rel="index" title="Top">
+<link href="index.html" rel="start" title="Top">
+<link href="index.html" rel="index" title="Top">
<link href="#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -46,7 +46,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><div class="header">
<p>
-Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<span id="Copying-and-indices-1"></span><h2 class="appendix">Appendix A Copying and indices</h2>
@@ -80,14 +80,14 @@ domain<a id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Public-domain">Public domain</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Public-domain">Public domain</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices_cp_letter-C"><b>C</b></a>
@@ -111,14 +111,14 @@ domain<a id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Public-domain">Public domain</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Public-domain">Public domain</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices_cp_letter-C"><b>C</b></a>
@@ -140,8 +140,8 @@ domain<a id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-findex-entry"><code>findex entry</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-fun"><code>fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-findex-entry"><code>findex entry</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-fun"><code>fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices_fn_letter-A"><b>A</b></a>
@@ -157,7 +157,7 @@ domain<a id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
<ul class="no-bullet">
<li><a id="toc-Chapter" href="index.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="#Copying-and-indices" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
@@ -165,7 +165,7 @@ domain<a id="DOCF1_2" href="#FOOT1_2"><sup>2</sup></a>.
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h3>
+<h5><a id="FOOT1_2" href="#DOCF1_2">(2)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
@@ -174,7 +174,7 @@ domain is something you should allready know
<hr>
<div class="header">
<p>
-Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="index.html#Top" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/index.html
index 1c27c8b574..ad1a04132a 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_html/index.html
@@ -19,8 +19,7 @@ domain.
<link href="#Top" rel="start" title="Top">
<link href="#Top" rel="index" title="Top">
<link href="Copying-and-indices.html#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="Copying-and-indices.html#Copying-and-indices" rel="next" title="Copying and indices">
+<link href="Copying-and-indices.html" rel="next" title="Copying and indices">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -49,11 +48,11 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="Copying-and-indices.html#Copying-and-indices" accesskey="n" rel="next">Copying and indices</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and indices</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html#Copying-and-indices" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html" rel="index" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -76,7 +75,7 @@ domain<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>.
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-C">C</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a>:</td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html#Copying-and-indices">Copying and indices</a></td></tr>
+<tr><td></td><td valign="top"><a href="Copying-and-indices.html#index-Copying-appendix">Copying appendix</a>:</td><td>&nbsp;</td><td valign="top"><a href="Copying-and-indices.html">Copying and indices</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Top">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Top_cp_letter-P">P</th><td></td><td></td></tr>
@@ -114,7 +113,7 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html#Copying-and-indices" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html" rel="index" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -122,7 +121,7 @@ and titlepage, and various wrong index entries.
<hr>
<h4 class="footnotes-heading">Footnotes</h4>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<span id="Public-domain-reference"></span><p>The public
domain is something you should allready know
</p>
@@ -131,7 +130,7 @@ domain is something you should allready know
<hr>
<div class="header">
<p>
-Next: <a href="Copying-and-indices.html#Copying-and-indices" accesskey="n" rel="next">Copying and indices</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and indices</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying/index_special_region-no_insertcopying.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying/index_special_region-no_insertcopying.info
index 436a84d3fe..1bbe01e1c3 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying/index_special_region-no_insertcopying.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying/index_special_region-no_insertcopying.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
index a421d88b83..18f4e56579 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/Copying-and-indices.html
@@ -16,10 +16,10 @@ domain.
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<link href="index.html#Top" rel="start" title="Top">
+<link href="index.html" rel="start" title="Top">
<link href="#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><div class="header">
<p>
-Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="Copying-and-indices-1"></span><h2 class="appendix">Appendix A Copying and indices</h2>
@@ -74,14 +74,14 @@ Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Public-domain">Public domain</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Public-domain">Public domain</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices_cp_letter-C"><b>C</b></a>
@@ -103,8 +103,8 @@ Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-findex-entry"><code>findex entry</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-fun"><code>fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-findex-entry"><code>findex entry</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-fun"><code>fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices_fn_letter-A"><b>A</b></a>
@@ -120,14 +120,14 @@ Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href
<ul class="no-bullet">
<li><a id="toc-Chapter" href="index.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="#Copying-and-indices" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
<hr>
<div class="header">
<p>
-Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
index 54fc309b69..2e8aa5fcf5 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_insertcopying_html/index.html
@@ -18,8 +18,7 @@ domain.
<meta name="Generator" content="texi2any">
<link href="#Top" rel="start" title="Top">
<link href="Copying-and-indices.html#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="Copying-and-indices.html#Copying-and-indices" rel="next" title="Copying and indices">
+<link href="Copying-and-indices.html" rel="next" title="Copying and indices">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -48,11 +47,11 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="Copying-and-indices.html#Copying-and-indices" accesskey="n" rel="next">Copying and indices</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and indices</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html#Copying-and-indices" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html" rel="index" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -77,14 +76,14 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html#Copying-and-indices" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html" rel="index" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<div class="header">
<p>
-Next: <a href="Copying-and-indices.html#Copying-and-indices" accesskey="n" rel="next">Copying and indices</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and indices</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region/index_special_region-no_section.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region/index_special_region-no_section.info
index 2b10ef351c..03529f7c72 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region/index_special_region-no_section.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region/index_special_region-no_section.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
index a421d88b83..18f4e56579 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/Copying-and-indices.html
@@ -16,10 +16,10 @@ domain.
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<link href="index.html#Top" rel="start" title="Top">
+<link href="index.html" rel="start" title="Top">
<link href="#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="index.html#Top" rel="up" title="Top">
-<link href="index.html#Top" rel="prev" title="Top">
+<link href="index.html" rel="up" title="Top">
+<link href="index.html" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="Copying-and-indices"></span><div class="header">
<p>
-Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="Copying-and-indices-1"></span><h2 class="appendix">Appendix A Copying and indices</h2>
@@ -74,14 +74,14 @@ Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-C">C</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-Copying-appendix">Copying appendix</a>:</td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Copying and indices</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Copying-this-document">Copying this document</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-P">P</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-Public-domain">Public domain</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-Public-domain">Public domain</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-footnote">Titlepage footnote</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-Titlepage-index">Titlepage index</a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices_cp_letter-C"><b>C</b></a>
@@ -103,8 +103,8 @@ Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href
<tr><td></td><td valign="top"><a href="#index-another-fun"><code>another fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="#Copying-and-indices">Copying and indices</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="Copying-and-indices_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-findex-entry"><code>findex entry</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-fun"><code>fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-findex-entry"><code>findex entry</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-fun"><code>fun</code></a>:</td><td>&nbsp;</td><td valign="top"><a href="index.html">Top</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Copying-and-indices_fn_letter-A"><b>A</b></a>
@@ -120,14 +120,14 @@ Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href
<ul class="no-bullet">
<li><a id="toc-Chapter" href="index.html#Chapter">1 Chapter</a></li>
- <li><a id="toc-Copying-and-indices-1" href="#Copying-and-indices">Appendix A Copying and indices</a></li>
+ <li><a id="toc-Copying-and-indices-1" href="#Copying-and-indices" rel="index">Appendix A Copying and indices</a></li>
</ul>
</div>
<hr>
<div class="header">
<p>
-Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
index 00848dad45..0707acab83 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region_no_region_html/index.html
@@ -18,8 +18,7 @@ domain.
<meta name="Generator" content="texi2any">
<link href="#Top" rel="start" title="Top">
<link href="Copying-and-indices.html#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="../dir/index.html" rel="up" title="(dir)">
-<link href="Copying-and-indices.html#Copying-and-indices" rel="next" title="Copying and indices">
+<link href="Copying-and-indices.html" rel="next" title="Copying and indices">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
@@ -48,12 +47,12 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><div class="header">
<p>
-Next: <a href="Copying-and-indices.html#Copying-and-indices" accesskey="n" rel="next">Copying and indices</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and indices</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
<span id="Top-1"></span><h1 class="top">Top</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html#Copying-and-indices" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html" rel="index" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -78,14 +77,14 @@ and titlepage, and various wrong index entries.
</dl>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html#Copying-and-indices" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="Copying-and-indices.html" rel="index" accesskey="1">Copying and indices</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr>
<div class="header">
<p>
-Next: <a href="Copying-and-indices.html#Copying-and-indices" accesskey="n" rel="next">Copying and indices</a>, Up: <a href="../dir/index.html" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+Next: <a href="Copying-and-indices.html" accesskey="n" rel="next">Copying and indices</a> &nbsp; [<a href="Copying-and-indices.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_table/index_table.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_table/index_table.info
index d2ad5269bf..878fa1d309 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_table/index_table.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/index_table/index_table.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
index 71d660ae02..525ae56e23 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/first-before-top.html
@@ -186,7 +186,7 @@ Next: <a href="index.html#Top" accesskey="n" rel="next">Top</a>, Up: <a href="..
</td></tr></table>
<p>after second printindex in first node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" accesskey="1">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" rel="index" accesskey="1">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
index 3274556052..24a4f8be73 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter/index.html
@@ -217,9 +217,9 @@ Previous: <a href="first-before-top.html#first-before-top" accesskey="p" rel="pr
<p>in top section
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#first" accesskey="1">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#first" rel="index" accesskey="1">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="chapter.html#chapter" accesskey="2">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="chapter.html#chapter" rel="index" accesskey="2">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="chapter.html#node-in-chapter" accesskey="3">node in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -306,7 +306,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#second" accesskey="1">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index" accesskey="1">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -317,7 +317,7 @@ Up: <a href="#first" accesskey="u" rel="up">first</a> &nbsp; [<a href="first-bef
</div>
<h4 class="node-heading">second</h4>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#a-node" accesskey="1">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index" accesskey="1">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#another" accesskey="2">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
index 71d660ae02..525ae56e23 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/first-before-top.html
@@ -186,7 +186,7 @@ Next: <a href="index.html#Top" accesskey="n" rel="next">Top</a>, Up: <a href="..
</td></tr></table>
<p>after second printindex in first node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" accesskey="1">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#node-in-menu-before-top" rel="index" accesskey="1">node in menu before top</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
index 3274556052..24a4f8be73 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/nodes_before_top_and_sections_html_chapter_nodes/index.html
@@ -217,9 +217,9 @@ Previous: <a href="first-before-top.html#first-before-top" accesskey="p" rel="pr
<p>in top section
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#first" accesskey="1">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#first" rel="index" accesskey="1">first</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top">&bull; <a href="chapter.html#chapter" accesskey="2">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="chapter.html#chapter" rel="index" accesskey="2">chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="chapter.html#node-in-chapter" accesskey="3">node in chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -306,7 +306,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" ac
</td></tr></table>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#second" accesskey="1">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#second" rel="index" accesskey="1">second</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -317,7 +317,7 @@ Up: <a href="#first" accesskey="u" rel="up">first</a> &nbsp; [<a href="first-bef
</div>
<h4 class="node-heading">second</h4>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#a-node" accesskey="1">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a href="#a-node" rel="index" accesskey="1">a node</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top">&bull; <a href="#another" accesskey="2">another</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_node_section/printindex_between_node_section.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_node_section/printindex_between_node_section.info
index 5ba5420dcd..20800ceecc 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_node_section/printindex_between_node_section.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_node_section/printindex_between_node_section.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_part_chapter/printindex_between_part_chapter.info b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_part_chapter/printindex_between_part_chapter.info
index 24b850fea7..29cdbbde6a 100644
--- a/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_part_chapter/printindex_between_part_chapter.info
+++ b/macros/texinfo/texinfo/tp/tests/indices/res_parser_info/printindex_between_part_chapter/printindex_between_part_chapter.info
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/layout/Makefile.in b/macros/texinfo/texinfo/tp/tests/layout/Makefile.in
index 5f3398c53f..d6aeb7e614 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/layout/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -276,6 +276,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -431,6 +432,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -498,11 +500,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -568,6 +572,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -588,6 +593,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -622,6 +628,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -636,6 +643,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -714,8 +722,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -731,14 +737,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -828,6 +833,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -861,6 +867,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -873,6 +880,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -891,6 +899,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -994,6 +1003,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html
index ad7a373e51..ce2209842c 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting/formatting.html
@@ -2102,7 +2102,7 @@ html ''
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
@@ -5269,27 +5269,27 @@ Menu comment
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT3" href="#DOCF3">(7)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="#DOCF4">(8)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT9" href="#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="#DOCF9">(11)</a></h3>
<p>in footnote</p>
<hr>
<span id="SEC_Contents"></span>
@@ -5315,7 +5315,7 @@ Menu comment
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
@@ -5331,7 +5331,7 @@ Menu comment
<div class="shortcontents">
<ul class="no-bullet">
<li><a id="stoc-chapter-1" href="#chapter">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html
index fd149d5630..412eb3cdfc 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -639,7 +639,7 @@ ul.no-bullet {list-style: none}
<div class="footnote">
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT9" href="#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="#DOCF9">(11)</a></h3>
<p>in footnote</p>
</div>
<p>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 5b93b25bcf..4e6b56b4d1 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -653,47 +653,47 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_symbol-1">&quot;</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_symbol-2">-</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_symbol-3">.</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_symbol-4">?</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
@@ -742,189 +742,189 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_symbol-1">-</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_symbol-2">.</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_symbol-3">?</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_symbol-4">`</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-D">D</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-L">L</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-M">M</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
<tr><th id="chapter-2_fn_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="formatting.html#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="formatting.html#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="formatting.html">Top section</a></td></tr>
<tr><td colspan="4"> </td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_fn_symbol-1"><b>-</b></a>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html
index 637dda24ff..0592e5d478 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -1131,20 +1131,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -1856,20 +1856,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -2588,20 +2588,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -3312,20 +3312,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -4101,20 +4101,20 @@ After clickstyle &rArr;
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
-<code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
+<code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
<code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
-<code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> `chapter' in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> `cross ref name' in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -4781,25 +4781,25 @@ Invalid use of @':
<div class="footnote">
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT3" href="#DOCF3">(7)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="#DOCF4">(8)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
</div>
<p>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
index 296525ffa4..de1357b5ad 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -636,8 +636,8 @@ ul.no-bullet {list-style: none}
<div class="shortcontents">
<ul class="no-bullet">
-<li><a id="stoc-chapter-1" href="chapter.html#chapter">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-1" href="chapter.html">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="chapter2.html" rel="index">chapter 2</a></li>
</ul>
</div>
<p>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
index e0ca23fbdf..6e9b631868 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -637,18 +637,18 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-chapter-1" href="chapter.html#chapter">1 chapter</a>
+ <li><a id="toc-chapter-1" href="chapter.html">1 chapter</a>
<ul class="no-bullet">
- <li><a id="toc-A-section" href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">1.1 A section</a>
+ <li><a id="toc-A-section" href="s_002d_002dect_002cion.html">1.1 A section</a>
<ul class="no-bullet">
- <li><a id="toc-subsection-1" href="subsection.html#subsection">1.1.1 subsection</a>
+ <li><a id="toc-subsection-1" href="subsection.html">1.1.1 subsection</a>
<ul class="no-bullet">
- <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
- <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
+ <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
+ <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="chapter2.html" rel="index">chapter 2</a></li>
</ul>
</div>
<p>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 709c47186b..a5376551c9 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -633,18 +633,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="chapter-1"></span><h1 class="chapter"><a href="formatting_toc.html#toc-chapter-1">chapter</a></h1>
@@ -656,16 +656,16 @@ ul.no-bullet {list-style: none}
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT9" href="#DOCF9">(7)</a></h3>
+<h5><a id="FOOT9" href="#DOCF9">(7)</a></h3>
<p>in footnote</p>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
</tr></table>
<p><font size="-1">
This document was generated on <em>a sunny day</em> using <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index a9cd079408..fed533bebc 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -633,18 +633,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="chapter-2"></span><h1 class="centerchap" align="center"><a href="formatting_toc.html#toc-chapter-2">chapter 2</a></h1>
@@ -669,47 +669,47 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-1">&quot;</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-2">-</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-3">.</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-4">?</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
@@ -758,189 +758,189 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-1">-</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-2">.</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-3">?</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-4">`</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-D">D</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-L">L</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-M">M</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_fn_symbol-1"><b>-</b></a>
@@ -972,9 +972,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
index ece5cbb635..492b8f5033 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -634,9 +634,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="about-heading">About This Document</h1>
@@ -743,9 +743,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
index 9fa17293f4..389564d413 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -634,24 +634,24 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Overview"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="shortcontents-heading">Short Table of Contents</h1>
<div class="shortcontents">
<ul>
-<li><a id="stoc-chapter-1" href="chapter.html#chapter">chapter</a></li>
-<li><a id="stoc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-1" href="chapter.html">chapter</a></li>
+<li><a id="stoc-chapter-2" href="chapter2.html" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
index 611acbc2e2..77898432b4 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -634,9 +634,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="contents-heading">Table of Contents</h1>
@@ -644,7 +644,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul>
- <li><a id="toc-chapter-1" href="chapter.html#chapter">chapter</a>
+ <li><a id="toc-chapter-1" href="chapter.html">chapter</a>
<ul>
<li><a id="toc-A-section" href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
<ul>
@@ -655,14 +655,14 @@ ul.no-bullet {list-style: none}
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="chapter2.html" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html
index cad90d7cf9..1fc0abc20e 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -635,7 +635,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -1143,20 +1143,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -1867,20 +1867,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -2656,20 +2656,20 @@ After clickstyle &rArr;
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
-<code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
+<code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
<code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
-<code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> `chapter' in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> `cross ref name' in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -3337,23 +3337,23 @@ Invalid use of @':
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="#DOCF8">(6)</a></h3>
<p>in footnote2</p>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
index 516b518df1..9665a2b097 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
@@ -633,18 +633,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="s_002d_002dect_002cion"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="#subsection" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<span id="A-section"></span><h2 class="section"><a href="formatting_toc.html#toc-A-section">A section</a></h2>
@@ -663,11 +663,11 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#subsection" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
</tr></table>
<p><font size="-1">
This document was generated on <em>a sunny day</em> using <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index c5aa1ee24b..c74711d078 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -2102,7 +2102,7 @@ html ''
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
@@ -5269,27 +5269,27 @@ Menu comment
</tr></table>
<h1 class="footnotes-heading">Notes de bas de page</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT3" href="#DOCF3">(7)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="#DOCF4">(8)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT9" href="#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="#DOCF9">(11)</a></h3>
<p>in footnote</p>
<hr>
<span id="SEC_Contents"></span>
@@ -5315,7 +5315,7 @@ Menu comment
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
@@ -5331,7 +5331,7 @@ Menu comment
<div class="shortcontents">
<ul class="no-bullet">
<li><a id="stoc-chapter-1" href="#chapter">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html
index ad7a373e51..ce2209842c 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -2102,7 +2102,7 @@ html ''
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
@@ -5269,27 +5269,27 @@ Menu comment
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT3" href="#DOCF3">(7)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="#DOCF4">(8)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT9" href="#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="#DOCF9">(11)</a></h3>
<p>in footnote</p>
<hr>
<span id="SEC_Contents"></span>
@@ -5315,7 +5315,7 @@ Menu comment
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
@@ -5331,7 +5331,7 @@ Menu comment
<div class="shortcontents">
<ul class="no-bullet">
<li><a id="stoc-chapter-1" href="#chapter">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html
index c9c133daaf..ce33418992 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -2068,7 +2068,7 @@ html ''
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
@@ -5209,27 +5209,27 @@ Menu comment
</tr></table>
<h1>Footnotes</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT3" href="#DOCF3">(7)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="#DOCF4">(8)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT9" href="#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="#DOCF9">(11)</a></h3>
<p>in footnote</p>
<hr>
<span id="SEC_Contents"></span>
@@ -5254,7 +5254,7 @@ Menu comment
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul><hr>
<span id="SEC_Overview"></span>
<table cellpadding="1" cellspacing="1" border="0">
@@ -5267,7 +5267,7 @@ Menu comment
<ul>
<li><a id="stoc-chapter-1" href="#chapter">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul><hr>
<span id="SEC_About"></span>
<table cellpadding="1" cellspacing="1" border="0">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index d2ddbf5261..5a114053ec 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -632,18 +632,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -653,7 +653,7 @@ ul.no-bullet {list-style: none}
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>:: s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a href="s_002d_002dect_002cion.html">s--ect,ion</a>:: s&ndash;ect,ion
</pre><pre class="menu-comment">
Menu comment
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index f715aa0198..b0efa0b184 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -632,18 +632,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -669,47 +669,47 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-1">&quot;</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-2">-</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-3">.</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-4">?</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
@@ -758,189 +758,189 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-1">-</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-2">.</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-3">?</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-4">`</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-D">D</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-L">L</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-M">M</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_fn_symbol-1"><b>-</b></a>
@@ -972,18 +972,18 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
index b1f7273adf..10bd3b676e 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
@@ -633,9 +633,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -743,9 +743,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index 8f97b6e296..5ce9f5a351 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -633,41 +633,41 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Foot"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="index.html#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="index.html#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="index.html#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="index.html#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="index.html#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="index.html#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="index.html#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="index.html#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="index.html#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="index.html#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="index.html#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="index.html#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT3" href="index.html#DOCF3">(7)</a></h3>
+<h5><a id="FOOT3" href="index.html#DOCF3">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="index.html#DOCF4">(8)</a></h3>
+<h5><a id="FOOT4" href="index.html#DOCF4">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="index.html#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="index.html#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="index.html#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="index.html#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT9" href="chapter.html#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="chapter.html#DOCF9">(11)</a></h3>
<p>in footnote</p>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
index c6cc060fae..f97a388532 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
@@ -633,9 +633,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Overview"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -643,15 +643,15 @@ ul.no-bullet {list-style: none}
<div class="shortcontents">
<ul class="no-bullet">
-<li><a id="stoc-chapter-1" href="chapter.html#chapter">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-1" href="chapter.html">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="chapter2.html" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
index 32559b68c8..3ee03c95ca 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
@@ -633,9 +633,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -644,25 +644,25 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-chapter-1" href="chapter.html#chapter">1 chapter</a>
+ <li><a id="toc-chapter-1" href="chapter.html">1 chapter</a>
<ul class="no-bullet">
- <li><a id="toc-A-section" href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">1.1 A section</a>
+ <li><a id="toc-A-section" href="s_002d_002dect_002cion.html">1.1 A section</a>
<ul class="no-bullet">
- <li><a id="toc-subsection-1" href="subsection.html#subsection">1.1.1 subsection</a>
+ <li><a id="toc-subsection-1" href="subsection.html">1.1.1 subsection</a>
<ul class="no-bullet">
- <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
- <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
+ <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
+ <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="chapter2.html" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 7c97154abb..e526093778 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -1131,20 +1131,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -1856,20 +1856,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -2088,7 +2088,7 @@ html ''
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -2098,12 +2098,12 @@ html ''
<span id="Top-section"></span><h1 class="top">Top section</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="chapter.html">1 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="chapter2.html#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="chapter2.html" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
@@ -2606,20 +2606,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -3330,20 +3330,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -4119,20 +4119,20 @@ After clickstyle &rArr;
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
-<code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
+<code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
<code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
-<code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> `chapter' in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> `cross ref name' in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -4799,7 +4799,7 @@ Invalid use of @':
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index 9222bed5fc..5efae69682 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
@@ -632,33 +632,33 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="s_002d_002dect_002cion"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
<span id="A-section"></span><h2 class="section">1.1 A section</h2>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsection.html#subsection">1.1.1 subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsection.html">1.1.1 subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
</pre></th></tr><tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">In detailmenu
-</pre></th></tr><tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</pre></th></tr><tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
index 895b9eaef2..47f5765817 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -632,27 +632,27 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 9deb5e4771..33093ebf0e 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -632,18 +632,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index d19182f34e..d5a4c32926 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -632,18 +632,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index d2ddbf5261..5a114053ec 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -632,18 +632,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -653,7 +653,7 @@ ul.no-bullet {list-style: none}
</p>
<div class="format">
<table class="menu" border="0" cellspacing="0"><tr><td>
-<pre class="menu-preformatted">&bull; <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>:: s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a href="s_002d_002dect_002cion.html">s--ect,ion</a>:: s&ndash;ect,ion
</pre><pre class="menu-comment">
Menu comment
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index f715aa0198..b0efa0b184 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -632,18 +632,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="chapter2"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -669,47 +669,47 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-1">&quot;</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-2">-</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-3">.</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_symbol-4">?</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_cp_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
@@ -758,189 +758,189 @@ ul.no-bullet {list-style: none}
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-1">-</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-2">.</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-3">?</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_symbol-4">`</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-A">A</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-B">B</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-D">D</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-I">I</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-L">L</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-M">M</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
<tr><th id="chapter-2_fn_letter-T">T</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.html#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.html#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.html">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_fn_symbol-1"><b>-</b></a>
@@ -972,18 +972,18 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Up section"> Up </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
index b1f7273adf..10bd3b676e 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -633,9 +633,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -743,9 +743,9 @@ ul.no-bullet {list-style: none}
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index 8f97b6e296..5ce9f5a351 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -633,41 +633,41 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Foot"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="index.html#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="index.html#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="index.html#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="index.html#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="index.html#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="index.html#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="index.html#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="index.html#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="index.html#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="index.html#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="index.html#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="index.html#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT3" href="index.html#DOCF3">(7)</a></h3>
+<h5><a id="FOOT3" href="index.html#DOCF3">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="index.html#DOCF4">(8)</a></h3>
+<h5><a id="FOOT4" href="index.html#DOCF4">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="index.html#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="index.html#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="index.html#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="index.html#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT9" href="chapter.html#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="chapter.html#DOCF9">(11)</a></h3>
<p>in footnote</p>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
index c6cc060fae..f97a388532 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -633,9 +633,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Overview"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -643,15 +643,15 @@ ul.no-bullet {list-style: none}
<div class="shortcontents">
<ul class="no-bullet">
-<li><a id="stoc-chapter-1" href="chapter.html#chapter">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-1" href="chapter.html">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="chapter2.html" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
index 32559b68c8..3ee03c95ca 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -633,9 +633,9 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="SEC_Contents"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
@@ -644,25 +644,25 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-chapter-1" href="chapter.html#chapter">1 chapter</a>
+ <li><a id="toc-chapter-1" href="chapter.html">1 chapter</a>
<ul class="no-bullet">
- <li><a id="toc-A-section" href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">1.1 A section</a>
+ <li><a id="toc-A-section" href="s_002d_002dect_002cion.html">1.1 A section</a>
<ul class="no-bullet">
- <li><a id="toc-subsection-1" href="subsection.html#subsection">1.1.1 subsection</a>
+ <li><a id="toc-subsection-1" href="subsection.html">1.1.1 subsection</a>
<ul class="no-bullet">
- <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
- <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
+ <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
+ <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="chapter2.html" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<tr><td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html
index 7c97154abb..e526093778 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -1131,20 +1131,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -1856,20 +1856,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -2088,7 +2088,7 @@ html ''
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
@@ -2098,12 +2098,12 @@ html ''
<span id="Top-section"></span><h1 class="top">Top section</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="chapter.html">1 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="chapter2.html#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="chapter2.html" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
@@ -2606,20 +2606,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -3330,20 +3330,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">A section</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">A section</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -4119,20 +4119,20 @@ After clickstyle &rArr;
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
-<code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
+<code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
<code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
-<code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> `chapter' in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> `cross ref name' in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -4799,7 +4799,7 @@ Invalid use of @':
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Index">Index</a>]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
index 9222bed5fc..5efae69682 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
@@ -632,33 +632,33 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="s_002d_002dect_002cion"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
<span id="A-section"></span><h2 class="section">1.1 A section</h2>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsection.html#subsection">1.1.1 subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsection.html">1.1.1 subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
</pre></th></tr><tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">In detailmenu
-</pre></th></tr><tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</pre></th></tr><tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index 895b9eaef2..47f5765817 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -632,27 +632,27 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="s_002d_002dect_002cion.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 9deb5e4771..33093ebf0e 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -632,18 +632,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index d19182f34e..d5a4c32926 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -632,18 +632,18 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter2.html#chapter2" title="Next chapter"> &gt;&gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter2.html" title="Next chapter"> &gt;&gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="formatting_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="index.html#Top" title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="index.html" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="formatting_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index ee219bd2a0..f726382771 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -14,11 +14,10 @@ kbd: '``simple-double--three---four----'''
''simple-double--three--four---''
- @"u u" @"{U} U" @~n n~ @^a a^ @'e e' @=o o= @'i i` @'{e} e'
-@'{@dotless{i}} i' @dotless{i} i @dotless{j} j @'{@=E} E=` @l{} /l
-@,{@'C} C', @,c c, @,c@"u c,u"
+ @"u ü @"{U} Ü @~n ñ @^a â @'e é @=o Š@'i ì @'{e} é @'{@dotless{i}} í
+@dotless{i} ı @dotless{j} j @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
- @U{0075} U+0075
+ @U{0075} u
@*
@ followed by a space @ followed by a tab @ followed by a new line
@@ -29,17 +28,17 @@ Now ! !@ but , ,
@TeX TeX @LaTeX LaTeX @bullet * @copyright (C) @dots ... @enddots ...
@equiv == @error error-> @expansion ==> @minus - @point -!- @print -|
-@result => @today a sunny day @aa aa @AA AA @ae ae @oe oe @AE AE @OE OE
-@o /o @O /O @ss ss @l /l @L /L @DH D @TH TH @dh d @th th @exclamdown !
-@questiondown ? @pounds # @registeredsymbol (R) @ordf a @ordm o @comma
-, @quotedblleft `` @quotedblright '' @quoteleft ` @quoteright '
-@quotedblbase ,, @quotesinglbase , @guillemetleft << @guillemetright >>
-@guillemotleft << @guillemotright >> @guilsinglleft < @guilsinglright >
-@textdegree o @euro Euro @arrow -> @leq <= @geq >=
+@result => @today a sunny day @aa å @AA Å @ae æ @oe œ @AE Æ @OE Œ @o ø
+@O Ø @ss ß @l ł @L Š@DH à @TH Þ @dh ð @th þ @exclamdown ¡
+@questiondown ¿ @pounds £ @registeredsymbol (R) @ordf ª @ordm º @comma
+, @quotedblleft “ @quotedblright †@quoteleft ‘ @quoteright ’
+@quotedblbase „ @quotesinglbase ‚ @guillemetleft « @guillemetright »
+@guillemotleft « @guillemotright » @guilsinglleft ‹ @guilsinglright ›
+@textdegree ° @euro € @arrow -> @leq ≤ @geq ≥
'@acronym{--a,an accronym}' -a (an accronym) '@acronym{--a}' -a
-'@abbr{@'E--. @comma{}A., @'Etude Autonome }' E'-. ,A. (E'tude Autonome)
-'@abbr{@'E--. @comma{}A.}' E'-. ,A. '@asis{--a}' -a '@b{--a}' -a
+'@abbr{@'E--. @comma{}A., @'Etude Autonome }' É-. ,A. (Étude Autonome)
+'@abbr{@'E--. @comma{}A.}' É-. ,A. '@asis{--a}' -a '@b{--a}' -a
'@cite{--a}' '-a' '@code{--a}' '--a' '@command{--a}' '--a' '@dfn{--a}'
"-a" '@dmn{--a}' -a '@email{--a,--b}' -b <--a> '@email{,--b}' -b
'@email{--a}' <--a> '@emph{--a}' _-a_ '@env{--a}' '--a' '@file{--a}'
@@ -56,12 +55,12 @@ Now ! !@ but , ,
'@verb{:a < & @ % " -- b:}' a < & @ % " -- b '@w{a a a a a a a a a a
a a a a a a a a a a a a a a a a a a a a a a a a a}'
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-'@H{a}' a'' '@H{--a}' -a'' '@dotaccent{a}' a. '@dotaccent{--a}' -a.
-'@ringaccent{a}' a* '@ringaccent{--a}' -a* '@tieaccent{a}' a[
-'@tieaccent{--a}' -a[ '@u{a}' a( '@u{--a}' -a( '@ubaraccent{a}' a_
-'@ubaraccent{--a}' -a_ '@udotaccent{a}' .a '@udotaccent{--a}' .-a
-'@v{a}' a< '@v{--a}' -a< '@,{c}' c, '@,{--c}' -c, '@footnote{in
-footnote}' (1) '@footnote{in footnote2}' (2)
+'@H{a}' a̋ '@H{--a}' -a̋ '@dotaccent{a}' ȧ '@dotaccent{--a}' -ȧ
+'@ringaccent{a}' å '@ringaccent{--a}' -å '@tieaccent{a}' a͡
+'@tieaccent{--a}' -a͡ '@u{a}' ă '@u{--a}' -ă '@ubaraccent{a}' a̲
+'@ubaraccent{--a}' -a̲ '@udotaccent{a}' ạ '@udotaccent{--a}' -ạ '@v{a}'
+ǎ '@v{--a}' -ǎ '@,{c}' ç '@,{--c}' -ç '@footnote{in footnote}' (1)
+'@footnote{in footnote2}' (2)
'@image{f--ile}' ggg
aaa '@image{f--ile,l--i}' ggg
@@ -93,7 +92,7 @@ aaa '@image{f-ile,aze,,a--lt}' [a-lt]
Warning: a Warning.
- something e' TeX: The something e' TeX is here.
+ something é TeX: The something é TeX is here.
@ at the end of line : A @ at the end of the @quotation line.
@@ -361,11 +360,10 @@ kbd: '``simple-double--three---four----'''
''simple-double--three--four---''
- @"u u" @"{U} U" @~n n~ @^a a^ @'e e' @=o o= @'i i` @'{e} e'
-@'{@dotless{i}} i' @dotless{i} i @dotless{j} j @'{@=E} E=` @l{} /l
-@,{@'C} C', @,c c, @,c@"u c,u"
+ @"u ü @"{U} Ü @~n ñ @^a â @'e é @=o Š@'i ì @'{e} é @'{@dotless{i}} í
+@dotless{i} ı @dotless{j} j @'{@=E} Ḕ @l{} ł @,{@'C} Ḉ @,c ç @,c@"u çü
- @U{0075} U+0075
+ @U{0075} u
@*
@ followed by a space @ followed by a tab @ followed by a new line
@@ -376,17 +374,17 @@ Now ! !@ but , ,
@TeX TeX @LaTeX LaTeX @bullet * @copyright (C) @dots ... @enddots ...
@equiv == @error error-> @expansion ==> @minus - @point -!- @print -|
-@result => @today a sunny day @aa aa @AA AA @ae ae @oe oe @AE AE @OE OE
-@o /o @O /O @ss ss @l /l @L /L @DH D @TH TH @dh d @th th @exclamdown !
-@questiondown ? @pounds # @registeredsymbol (R) @ordf a @ordm o @comma
-, @quotedblleft `` @quotedblright '' @quoteleft ` @quoteright '
-@quotedblbase ,, @quotesinglbase , @guillemetleft << @guillemetright >>
-@guillemotleft << @guillemotright >> @guilsinglleft < @guilsinglright >
-@textdegree o @euro Euro @arrow -> @leq <= @geq >=
+@result => @today a sunny day @aa å @AA Å @ae æ @oe œ @AE Æ @OE Œ @o ø
+@O Ø @ss ß @l ł @L Š@DH à @TH Þ @dh ð @th þ @exclamdown ¡
+@questiondown ¿ @pounds £ @registeredsymbol (R) @ordf ª @ordm º @comma
+, @quotedblleft “ @quotedblright †@quoteleft ‘ @quoteright ’
+@quotedblbase „ @quotesinglbase ‚ @guillemetleft « @guillemetright »
+@guillemotleft « @guillemotright » @guilsinglleft ‹ @guilsinglright ›
+@textdegree ° @euro € @arrow -> @leq ≤ @geq ≥
'@acronym{--a,an accronym}' -a (an accronym) '@acronym{--a}' -a
-'@abbr{@'E--. @comma{}A., @'Etude Autonome }' E'-. ,A. (E'tude Autonome)
-'@abbr{@'E--. @comma{}A.}' E'-. ,A. '@asis{--a}' -a '@b{--a}' -a
+'@abbr{@'E--. @comma{}A., @'Etude Autonome }' É-. ,A. (Étude Autonome)
+'@abbr{@'E--. @comma{}A.}' É-. ,A. '@asis{--a}' -a '@b{--a}' -a
'@cite{--a}' '-a' '@code{--a}' '--a' '@command{--a}' '--a' '@dfn{--a}'
"-a" '@dmn{--a}' -a '@email{--a,--b}' -b <--a> '@email{,--b}' -b
'@email{--a}' <--a> '@emph{--a}' _-a_ '@env{--a}' '--a' '@file{--a}'
@@ -403,12 +401,12 @@ Now ! !@ but , ,
'@verb{:a < & @ % " -- b:}' a < & @ % " -- b '@w{a a a a a a a a a a
a a a a a a a a a a a a a a a a a a a a a a a a a}'
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
-'@H{a}' a'' '@H{--a}' -a'' '@dotaccent{a}' a. '@dotaccent{--a}' -a.
-'@ringaccent{a}' a* '@ringaccent{--a}' -a* '@tieaccent{a}' a[
-'@tieaccent{--a}' -a[ '@u{a}' a( '@u{--a}' -a( '@ubaraccent{a}' a_
-'@ubaraccent{--a}' -a_ '@udotaccent{a}' .a '@udotaccent{--a}' .-a
-'@v{a}' a< '@v{--a}' -a< '@,{c}' c, '@,{--c}' -c, '@footnote{in
-footnote}' (3) '@footnote{in footnote2}' (4)
+'@H{a}' a̋ '@H{--a}' -a̋ '@dotaccent{a}' ȧ '@dotaccent{--a}' -ȧ
+'@ringaccent{a}' å '@ringaccent{--a}' -å '@tieaccent{a}' a͡
+'@tieaccent{--a}' -a͡ '@u{a}' ă '@u{--a}' -ă '@ubaraccent{a}' a̲
+'@ubaraccent{--a}' -a̲ '@udotaccent{a}' ạ '@udotaccent{--a}' -ạ '@v{a}'
+ǎ '@v{--a}' -ǎ '@,{c}' ç '@,{--c}' -ç '@footnote{in footnote}' (3)
+'@footnote{in footnote2}' (4)
'@image{f--ile}' ggg
aaa '@image{f--ile,l--i}' ggg
@@ -440,7 +438,7 @@ aaa '@image{f-ile,aze,,a--lt}' [a-lt]
Warning: a Warning.
- something e' TeX: The something e' TeX is here.
+ something é TeX: The something é TeX is here.
@ at the end of line : A @ at the end of the @quotation line.
@@ -720,25 +718,25 @@ In example.
- @"u u"
- @"{U} U"
- @~n n~
- @^a a^
- @'e e'
- @=o o=
- @`i i`
- @'{e} e'
- @'{@dotless{i}} i'
- @dotless{i} i
+ @"u ü
+ @"{U} Ü
+ @~n ñ
+ @^a â
+ @'e é
+ @=o Å
+ @`i ì
+ @'{e} é
+ @'{@dotless{i}} í
+ @dotless{i} ı
@dotless{j} j
- @`{@=E} E=`
- @l{} /l
- @,{@'C} C',
- @,c c,
- @,c@"u c,u"
+ @`{@=E} Ḕ
+ @l{} Å‚
+ @,{@'C} Ḉ
+ @,c ç
+ @,c@"u çü
- @U{0075} U+0075
+ @U{0075} u
@*
@@ -779,50 +777,50 @@ In example.
@print -|
@result =>
@today a sunny day
- @aa aa
- @AA AA
- @ae ae
- @oe oe
- @AE AE
- @OE OE
- @o /o
- @O /O
- @ss ss
- @l /l
- @L /L
- @DH D
- @TH TH
- @dh d
- @th th
- @exclamdown !
- @questiondown ?
- @pounds #
+ @aa å
+ @AA Ã…
+ @ae æ
+ @oe Å“
+ @AE Æ
+ @OE Å’
+ @o ø
+ @O Ø
+ @ss ß
+ @l Å‚
+ @L Å
+ @DH Ã
+ @TH Þ
+ @dh ð
+ @th þ
+ @exclamdown ¡
+ @questiondown ¿
+ @pounds £
@registeredsymbol (R)
- @ordf a
- @ordm o
+ @ordf ª
+ @ordm º
@comma ,
- @quotedblleft ``
- @quotedblright ''
- @quoteleft `
- @quoteright '
- @quotedblbase ,,
- @quotesinglbase ,
- @guillemetleft <<
- @guillemetright >>
- @guillemotleft <<
- @guillemotright >>
- @guilsinglleft <
- @guilsinglright >
- @textdegree o
- @euro Euro
+ @quotedblleft “
+ @quotedblright â€
+ @quoteleft ‘
+ @quoteright ’
+ @quotedblbase „
+ @quotesinglbase ‚
+ @guillemetleft «
+ @guillemetright »
+ @guillemotleft «
+ @guillemotright »
+ @guilsinglleft ‹
+ @guilsinglright ›
+ @textdegree °
+ @euro €
@arrow ->
- @leq <=
- @geq >=
+ @leq ≤
+ @geq ≥
@acronym{--a,an accronym} --a (an accronym)
@acronym{--a} --a
- @abbr{@'E--. @comma{}A., @'Etude Autonome } E'--. ,A. (E'tude Autonome)
- @abbr{@'E--. @comma{}A.} E'--. ,A.
+ @abbr{@'E--. @comma{}A., @'Etude Autonome } É--. ,A. (Étude Autonome)
+ @abbr{@'E--. @comma{}A.} É--. ,A.
@asis{--a} --a
@b{--a} -a
@cite{--a} '--a'
@@ -867,24 +865,24 @@ In example.
@verb{:--a:} --a
@verb{:a < & @ % " -- b:} a < & @ % " -- b
@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
- @H{a} a''
- @H{--a} -a''
- @dotaccent{a} a.
- @dotaccent{--a} -a.
- @ringaccent{a} a*
- @ringaccent{--a} -a*
- @tieaccent{a} a[
- @tieaccent{--a} -a[
- @u{a} a(
- @u{--a} -a(
- @ubaraccent{a} a_
- @ubaraccent{--a} -a_
- @udotaccent{a} .a
- @udotaccent{--a} .-a
- @v{a} a<
- @v{--a} -a<
- @,{c} c,
- @,{--c} -c,
+ @H{a} a̋
+ @H{--a} -a̋
+ @dotaccent{a} ȧ
+ @dotaccent{--a} -ȧ
+ @ringaccent{a} å
+ @ringaccent{--a} -Ã¥
+ @tieaccent{a} a͡
+ @tieaccent{--a} -a͡
+ @u{a} ă
+ @u{--a} -ă
+ @ubaraccent{a} a̲
+ @ubaraccent{--a} -a̲
+ @udotaccent{a} ạ
+ @udotaccent{--a} -ạ
+ @v{a} ÇŽ
+ @v{--a} -ÇŽ
+ @,{c} ç
+ @,{--c} -ç
@footnote{in footnote} (5)
@footnote{in footnote2} (6)
@@ -924,7 +922,7 @@ aaa
Warning: a Warning.
- something e' TeX: The something e' TeX is here.
+ something é TeX: The something é TeX is here.
@ at the end of line : A @ at the end of the @quotation line.
@@ -1200,172 +1198,172 @@ aaa
* Menu:
* ": Top. (line 16)
-* " <1>: Top. (line 364)
-* " <2>: Top. (line 723)
+* " <1>: Top. (line 363)
+* " <2>: Top. (line 721)
* -option: Top. (line 16)
-* -option <1>: Top. (line 364)
-* -option <2>: Top. (line 723)
-* .: Top. (line 1199)
-* ?: Top. (line 1199)
-* a: Top. (line 1199)
-* index entry between item and itemx: Top. (line 312)
-* index entry between item and itemx <1>: Top. (line 660)
-* index entry between item and itemx <2>: Top. (line 1146)
-* index entry within deffn: Top. (line 158)
-* index entry within deffn <1>: Top. (line 506)
-* index entry within deffn <2>: Top. (line 992)
-* index entry within itemize: Top. (line 120)
-* index entry within itemize <1>: Top. (line 468)
-* index entry within itemize <2>: Top. (line 954)
-* index entry within multitable: Top. (line 128)
-* index entry within multitable <1>: Top. (line 476)
-* index entry within multitable <2>: Top. (line 963)
-* t-ruc: Top. (line 1199)
-* T-ruc: Top. (line 1199)
+* -option <1>: Top. (line 363)
+* -option <2>: Top. (line 721)
+* .: Top. (line 1197)
+* ?: Top. (line 1197)
+* a: Top. (line 1197)
+* index entry between item and itemx: Top. (line 311)
+* index entry between item and itemx <1>: Top. (line 658)
+* index entry between item and itemx <2>: Top. (line 1144)
+* index entry within deffn: Top. (line 157)
+* index entry within deffn <1>: Top. (line 504)
+* index entry within deffn <2>: Top. (line 990)
+* index entry within itemize: Top. (line 119)
+* index entry within itemize <1>: Top. (line 466)
+* index entry within itemize <2>: Top. (line 952)
+* index entry within multitable: Top. (line 127)
+* index entry within multitable <1>: Top. (line 474)
+* index entry within multitable <2>: Top. (line 961)
+* t-ruc: Top. (line 1197)
+* T-ruc: Top. (line 1197)
fn
* Menu:
* --foption: Top. (line 16)
-* --foption <1>: Top. (line 364)
-* --foption <2>: Top. (line 723)
-* .: Top. (line 1199)
-* ?: Top. (line 1199)
+* --foption <1>: Top. (line 363)
+* --foption <2>: Top. (line 721)
+* .: Top. (line 1197)
+* ?: Top. (line 1197)
* ``: Top. (line 16)
-* `` <1>: Top. (line 364)
-* `` <2>: Top. (line 723)
-* a: Top. (line 175)
-* a <1>: Top. (line 311)
-* a <2>: Top. (line 523)
-* a <3>: Top. (line 659)
-* a <4>: Top. (line 1009)
-* a <5>: Top. (line 1145)
-* a <6>: Top. (line 1199)
-* b: Top. (line 312)
-* b <1>: Top. (line 660)
-* b <2>: Top. (line 1146)
-* bidule machin: Top. (line 169)
-* bidule machin <1>: Top. (line 517)
-* bidule machin <2>: Top. (line 1003)
-* d--effn_name: Top. (line 150)
-* d--effn_name <1>: Top. (line 498)
-* d--effn_name <2>: Top. (line 984)
-* d--efmac_name: Top. (line 211)
-* d--efmac_name <1>: Top. (line 559)
-* d--efmac_name <2>: Top. (line 1045)
-* d--efmethod_name on c--lass: Top. (line 235)
-* d--efmethod_name on c--lass <1>: Top. (line 583)
-* d--efmethod_name on c--lass <2>: Top. (line 1069)
-* d--efop_name on c--lass: Top. (line 202)
-* d--efop_name on c--lass <1>: Top. (line 550)
-* d--efop_name on c--lass <2>: Top. (line 1036)
-* d--efspec_name: Top. (line 214)
-* d--efspec_name <1>: Top. (line 562)
-* d--efspec_name <2>: Top. (line 1048)
-* d--eftypefn_name: Top. (line 190)
-* d--eftypefn_name <1>: Top. (line 538)
-* d--eftypefn_name <2>: Top. (line 1024)
-* d--eftypefun_name: Top. (line 223)
-* d--eftypefun_name <1>: Top. (line 571)
-* d--eftypefun_name <2>: Top. (line 1057)
-* d--eftypemethod_name on c--lass: Top. (line 238)
-* d--eftypemethod_name on c--lass <1>: Top. (line 586)
-* d--eftypemethod_name on c--lass <2>: Top. (line 1072)
-* d--eftypeop_name on c--lass: Top. (line 193)
-* d--eftypeop_name on c--lass <1>: Top. (line 541)
-* d--eftypeop_name on c--lass <2>: Top. (line 1027)
-* d--efun_name: Top. (line 208)
-* d--efun_name <1>: Top. (line 556)
-* d--efun_name <2>: Top. (line 1042)
-* de--ffn_name: Top. (line 153)
-* de--ffn_name <1>: Top. (line 501)
-* de--ffn_name <2>: Top. (line 987)
-* deffn: Top. (line 178)
-* deffn <1>: Top. (line 180)
-* deffn <2>: Top. (line 526)
-* deffn <3>: Top. (line 528)
-* deffn <4>: Top. (line 1012)
-* deffn <5>: Top. (line 1014)
-* deffnx: Top. (line 176)
-* deffnx <1>: Top. (line 181)
-* deffnx <2>: Top. (line 524)
-* deffnx <3>: Top. (line 529)
-* deffnx <4>: Top. (line 1010)
-* deffnx <5>: Top. (line 1015)
-* followed: Top. (line 172)
-* followed <1>: Top. (line 520)
-* followed <2>: Top. (line 1006)
-* I: Top. (line 157)
-* I <1>: Top. (line 183)
-* I <2>: Top. (line 505)
-* I <3>: Top. (line 531)
-* I <4>: Top. (line 991)
-* I <5>: Top. (line 1017)
-* id i ule: Top. (line 163)
-* id i ule <1>: Top. (line 511)
-* id i ule <2>: Top. (line 997)
-* id ule: Top. (line 162)
-* id ule <1>: Top. (line 510)
-* id ule <2>: Top. (line 996)
-* log trap: Top. (line 159)
-* log trap <1>: Top. (line 507)
-* log trap <2>: Top. (line 993)
-* log trap1: Top. (line 160)
-* log trap1 <1>: Top. (line 508)
-* log trap1 <2>: Top. (line 994)
-* log trap2: Top. (line 161)
-* log trap2 <1>: Top. (line 509)
-* log trap2 <2>: Top. (line 995)
-* machin: Top. (line 168)
-* machin <1>: Top. (line 170)
-* machin <2>: Top. (line 516)
-* machin <3>: Top. (line 518)
-* machin <4>: Top. (line 1002)
-* machin <5>: Top. (line 1004)
-* t--ruc: Top. (line 1199)
-* T--ruc: Top. (line 1199)
-* truc: Top. (line 158)
-* truc <1>: Top. (line 184)
-* truc <2>: Top. (line 506)
-* truc <3>: Top. (line 532)
-* truc <4>: Top. (line 992)
-* truc <5>: Top. (line 1018)
+* `` <1>: Top. (line 363)
+* `` <2>: Top. (line 721)
+* a: Top. (line 174)
+* a <1>: Top. (line 310)
+* a <2>: Top. (line 521)
+* a <3>: Top. (line 657)
+* a <4>: Top. (line 1007)
+* a <5>: Top. (line 1143)
+* a <6>: Top. (line 1197)
+* b: Top. (line 311)
+* b <1>: Top. (line 658)
+* b <2>: Top. (line 1144)
+* bidule machin: Top. (line 168)
+* bidule machin <1>: Top. (line 515)
+* bidule machin <2>: Top. (line 1001)
+* d--effn_name: Top. (line 149)
+* d--effn_name <1>: Top. (line 496)
+* d--effn_name <2>: Top. (line 982)
+* d--efmac_name: Top. (line 210)
+* d--efmac_name <1>: Top. (line 557)
+* d--efmac_name <2>: Top. (line 1043)
+* d--efmethod_name on c--lass: Top. (line 234)
+* d--efmethod_name on c--lass <1>: Top. (line 581)
+* d--efmethod_name on c--lass <2>: Top. (line 1067)
+* d--efop_name on c--lass: Top. (line 201)
+* d--efop_name on c--lass <1>: Top. (line 548)
+* d--efop_name on c--lass <2>: Top. (line 1034)
+* d--efspec_name: Top. (line 213)
+* d--efspec_name <1>: Top. (line 560)
+* d--efspec_name <2>: Top. (line 1046)
+* d--eftypefn_name: Top. (line 189)
+* d--eftypefn_name <1>: Top. (line 536)
+* d--eftypefn_name <2>: Top. (line 1022)
+* d--eftypefun_name: Top. (line 222)
+* d--eftypefun_name <1>: Top. (line 569)
+* d--eftypefun_name <2>: Top. (line 1055)
+* d--eftypemethod_name on c--lass: Top. (line 237)
+* d--eftypemethod_name on c--lass <1>: Top. (line 584)
+* d--eftypemethod_name on c--lass <2>: Top. (line 1070)
+* d--eftypeop_name on c--lass: Top. (line 192)
+* d--eftypeop_name on c--lass <1>: Top. (line 539)
+* d--eftypeop_name on c--lass <2>: Top. (line 1025)
+* d--efun_name: Top. (line 207)
+* d--efun_name <1>: Top. (line 554)
+* d--efun_name <2>: Top. (line 1040)
+* de--ffn_name: Top. (line 152)
+* de--ffn_name <1>: Top. (line 499)
+* de--ffn_name <2>: Top. (line 985)
+* deffn: Top. (line 177)
+* deffn <1>: Top. (line 179)
+* deffn <2>: Top. (line 524)
+* deffn <3>: Top. (line 526)
+* deffn <4>: Top. (line 1010)
+* deffn <5>: Top. (line 1012)
+* deffnx: Top. (line 175)
+* deffnx <1>: Top. (line 180)
+* deffnx <2>: Top. (line 522)
+* deffnx <3>: Top. (line 527)
+* deffnx <4>: Top. (line 1008)
+* deffnx <5>: Top. (line 1013)
+* followed: Top. (line 171)
+* followed <1>: Top. (line 518)
+* followed <2>: Top. (line 1004)
+* I: Top. (line 156)
+* I <1>: Top. (line 182)
+* I <2>: Top. (line 503)
+* I <3>: Top. (line 529)
+* I <4>: Top. (line 989)
+* I <5>: Top. (line 1015)
+* id i ule: Top. (line 162)
+* id i ule <1>: Top. (line 509)
+* id i ule <2>: Top. (line 995)
+* id ule: Top. (line 161)
+* id ule <1>: Top. (line 508)
+* id ule <2>: Top. (line 994)
+* log trap: Top. (line 158)
+* log trap <1>: Top. (line 505)
+* log trap <2>: Top. (line 991)
+* log trap1: Top. (line 159)
+* log trap1 <1>: Top. (line 506)
+* log trap1 <2>: Top. (line 992)
+* log trap2: Top. (line 160)
+* log trap2 <1>: Top. (line 507)
+* log trap2 <2>: Top. (line 993)
+* machin: Top. (line 167)
+* machin <1>: Top. (line 169)
+* machin <2>: Top. (line 514)
+* machin <3>: Top. (line 516)
+* machin <4>: Top. (line 1000)
+* machin <5>: Top. (line 1002)
+* t--ruc: Top. (line 1197)
+* T--ruc: Top. (line 1197)
+* truc: Top. (line 157)
+* truc <1>: Top. (line 183)
+* truc <2>: Top. (line 504)
+* truc <3>: Top. (line 530)
+* truc <4>: Top. (line 990)
+* truc <5>: Top. (line 1016)
vr
* Menu:
-* a: Top. (line 307)
-* a <1>: Top. (line 655)
-* a <2>: Top. (line 1141)
-* b: Top. (line 308)
-* b <1>: Top. (line 656)
-* b <2>: Top. (line 1142)
-* d--efcv_name: Top. (line 199)
-* d--efcv_name <1>: Top. (line 547)
-* d--efcv_name <2>: Top. (line 1033)
-* d--efivar_name of c--lass: Top. (line 229)
-* d--efivar_name of c--lass <1>: Top. (line 577)
-* d--efivar_name of c--lass <2>: Top. (line 1063)
-* d--efopt_name: Top. (line 220)
-* d--efopt_name <1>: Top. (line 568)
-* d--efopt_name <2>: Top. (line 1054)
-* d--eftypeivar_name of c--lass: Top. (line 232)
-* d--eftypeivar_name of c--lass <1>: Top. (line 580)
-* d--eftypeivar_name of c--lass <2>: Top. (line 1066)
-* d--eftypevar_name: Top. (line 226)
-* d--eftypevar_name <1>: Top. (line 574)
-* d--eftypevar_name <2>: Top. (line 1060)
-* d--eftypevr_name: Top. (line 196)
-* d--eftypevr_name <1>: Top. (line 544)
-* d--eftypevr_name <2>: Top. (line 1030)
-* d--efvar_name: Top. (line 217)
-* d--efvar_name <1>: Top. (line 565)
-* d--efvar_name <2>: Top. (line 1051)
-* d--efvr_name: Top. (line 187)
-* d--efvr_name <1>: Top. (line 535)
-* d--efvr_name <2>: Top. (line 1021)
+* a: Top. (line 306)
+* a <1>: Top. (line 653)
+* a <2>: Top. (line 1139)
+* b: Top. (line 307)
+* b <1>: Top. (line 654)
+* b <2>: Top. (line 1140)
+* d--efcv_name: Top. (line 198)
+* d--efcv_name <1>: Top. (line 545)
+* d--efcv_name <2>: Top. (line 1031)
+* d--efivar_name of c--lass: Top. (line 228)
+* d--efivar_name of c--lass <1>: Top. (line 575)
+* d--efivar_name of c--lass <2>: Top. (line 1061)
+* d--efopt_name: Top. (line 219)
+* d--efopt_name <1>: Top. (line 566)
+* d--efopt_name <2>: Top. (line 1052)
+* d--eftypeivar_name of c--lass: Top. (line 231)
+* d--eftypeivar_name of c--lass <1>: Top. (line 578)
+* d--eftypeivar_name of c--lass <2>: Top. (line 1064)
+* d--eftypevar_name: Top. (line 225)
+* d--eftypevar_name <1>: Top. (line 572)
+* d--eftypevar_name <2>: Top. (line 1058)
+* d--eftypevr_name: Top. (line 195)
+* d--eftypevr_name <1>: Top. (line 542)
+* d--eftypevr_name <2>: Top. (line 1028)
+* d--efvar_name: Top. (line 216)
+* d--efvar_name <1>: Top. (line 563)
+* d--efvar_name <2>: Top. (line 1049)
+* d--efvr_name: Top. (line 186)
+* d--efvr_name <1>: Top. (line 533)
+* d--efvr_name <2>: Top. (line 1019)
ky
@@ -1375,9 +1373,9 @@ aaa
* Menu:
-* d--eftp_name: Top. (line 205)
-* d--eftp_name <1>: Top. (line 553)
-* d--eftp_name <2>: Top. (line 1039)
+* d--eftp_name: Top. (line 204)
+* d--eftp_name <1>: Top. (line 551)
+* d--eftp_name <2>: Top. (line 1037)
---------- Footnotes ----------
@@ -1421,135 +1419,135 @@ chapter 2
* Menu:
* ": Top. (line 16)
-* " <1>: Top. (line 364)
-* " <2>: Top. (line 723)
+* " <1>: Top. (line 363)
+* " <2>: Top. (line 721)
* -option: Top. (line 16)
-* -option <1>: Top. (line 364)
-* -option <2>: Top. (line 723)
-* .: Top. (line 1199)
-* ?: Top. (line 1199)
-* a: Top. (line 1199)
-* index entry between item and itemx: Top. (line 312)
-* index entry between item and itemx <1>: Top. (line 660)
-* index entry between item and itemx <2>: Top. (line 1146)
-* index entry within deffn: Top. (line 158)
-* index entry within deffn <1>: Top. (line 506)
-* index entry within deffn <2>: Top. (line 992)
-* index entry within itemize: Top. (line 120)
-* index entry within itemize <1>: Top. (line 468)
-* index entry within itemize <2>: Top. (line 954)
-* index entry within multitable: Top. (line 128)
-* index entry within multitable <1>: Top. (line 476)
-* index entry within multitable <2>: Top. (line 963)
-* t-ruc: Top. (line 1199)
-* T-ruc: Top. (line 1199)
+* -option <1>: Top. (line 363)
+* -option <2>: Top. (line 721)
+* .: Top. (line 1197)
+* ?: Top. (line 1197)
+* a: Top. (line 1197)
+* index entry between item and itemx: Top. (line 311)
+* index entry between item and itemx <1>: Top. (line 658)
+* index entry between item and itemx <2>: Top. (line 1144)
+* index entry within deffn: Top. (line 157)
+* index entry within deffn <1>: Top. (line 504)
+* index entry within deffn <2>: Top. (line 990)
+* index entry within itemize: Top. (line 119)
+* index entry within itemize <1>: Top. (line 466)
+* index entry within itemize <2>: Top. (line 952)
+* index entry within multitable: Top. (line 127)
+* index entry within multitable <1>: Top. (line 474)
+* index entry within multitable <2>: Top. (line 961)
+* t-ruc: Top. (line 1197)
+* T-ruc: Top. (line 1197)
* Menu:
* --foption: Top. (line 16)
-* --foption <1>: Top. (line 364)
-* --foption <2>: Top. (line 723)
-* .: Top. (line 1199)
-* ?: Top. (line 1199)
+* --foption <1>: Top. (line 363)
+* --foption <2>: Top. (line 721)
+* .: Top. (line 1197)
+* ?: Top. (line 1197)
* ``: Top. (line 16)
-* `` <1>: Top. (line 364)
-* `` <2>: Top. (line 723)
-* a: Top. (line 175)
-* a <1>: Top. (line 311)
-* a <2>: Top. (line 523)
-* a <3>: Top. (line 659)
-* a <4>: Top. (line 1009)
-* a <5>: Top. (line 1145)
-* a <6>: Top. (line 1199)
-* b: Top. (line 312)
-* b <1>: Top. (line 660)
-* b <2>: Top. (line 1146)
-* bidule machin: Top. (line 169)
-* bidule machin <1>: Top. (line 517)
-* bidule machin <2>: Top. (line 1003)
-* d--effn_name: Top. (line 150)
-* d--effn_name <1>: Top. (line 498)
-* d--effn_name <2>: Top. (line 984)
-* d--efmac_name: Top. (line 211)
-* d--efmac_name <1>: Top. (line 559)
-* d--efmac_name <2>: Top. (line 1045)
-* d--efmethod_name on c--lass: Top. (line 235)
-* d--efmethod_name on c--lass <1>: Top. (line 583)
-* d--efmethod_name on c--lass <2>: Top. (line 1069)
-* d--efop_name on c--lass: Top. (line 202)
-* d--efop_name on c--lass <1>: Top. (line 550)
-* d--efop_name on c--lass <2>: Top. (line 1036)
-* d--efspec_name: Top. (line 214)
-* d--efspec_name <1>: Top. (line 562)
-* d--efspec_name <2>: Top. (line 1048)
-* d--eftypefn_name: Top. (line 190)
-* d--eftypefn_name <1>: Top. (line 538)
-* d--eftypefn_name <2>: Top. (line 1024)
-* d--eftypefun_name: Top. (line 223)
-* d--eftypefun_name <1>: Top. (line 571)
-* d--eftypefun_name <2>: Top. (line 1057)
-* d--eftypemethod_name on c--lass: Top. (line 238)
-* d--eftypemethod_name on c--lass <1>: Top. (line 586)
-* d--eftypemethod_name on c--lass <2>: Top. (line 1072)
-* d--eftypeop_name on c--lass: Top. (line 193)
-* d--eftypeop_name on c--lass <1>: Top. (line 541)
-* d--eftypeop_name on c--lass <2>: Top. (line 1027)
-* d--efun_name: Top. (line 208)
-* d--efun_name <1>: Top. (line 556)
-* d--efun_name <2>: Top. (line 1042)
-* de--ffn_name: Top. (line 153)
-* de--ffn_name <1>: Top. (line 501)
-* de--ffn_name <2>: Top. (line 987)
-* deffn: Top. (line 178)
-* deffn <1>: Top. (line 180)
-* deffn <2>: Top. (line 526)
-* deffn <3>: Top. (line 528)
-* deffn <4>: Top. (line 1012)
-* deffn <5>: Top. (line 1014)
-* deffnx: Top. (line 176)
-* deffnx <1>: Top. (line 181)
-* deffnx <2>: Top. (line 524)
-* deffnx <3>: Top. (line 529)
-* deffnx <4>: Top. (line 1010)
-* deffnx <5>: Top. (line 1015)
-* followed: Top. (line 172)
-* followed <1>: Top. (line 520)
-* followed <2>: Top. (line 1006)
-* I: Top. (line 157)
-* I <1>: Top. (line 183)
-* I <2>: Top. (line 505)
-* I <3>: Top. (line 531)
-* I <4>: Top. (line 991)
-* I <5>: Top. (line 1017)
-* id i ule: Top. (line 163)
-* id i ule <1>: Top. (line 511)
-* id i ule <2>: Top. (line 997)
-* id ule: Top. (line 162)
-* id ule <1>: Top. (line 510)
-* id ule <2>: Top. (line 996)
-* log trap: Top. (line 159)
-* log trap <1>: Top. (line 507)
-* log trap <2>: Top. (line 993)
-* log trap1: Top. (line 160)
-* log trap1 <1>: Top. (line 508)
-* log trap1 <2>: Top. (line 994)
-* log trap2: Top. (line 161)
-* log trap2 <1>: Top. (line 509)
-* log trap2 <2>: Top. (line 995)
-* machin: Top. (line 168)
-* machin <1>: Top. (line 170)
-* machin <2>: Top. (line 516)
-* machin <3>: Top. (line 518)
-* machin <4>: Top. (line 1002)
-* machin <5>: Top. (line 1004)
-* t--ruc: Top. (line 1199)
-* T--ruc: Top. (line 1199)
-* truc: Top. (line 158)
-* truc <1>: Top. (line 184)
-* truc <2>: Top. (line 506)
-* truc <3>: Top. (line 532)
-* truc <4>: Top. (line 992)
-* truc <5>: Top. (line 1018)
+* `` <1>: Top. (line 363)
+* `` <2>: Top. (line 721)
+* a: Top. (line 174)
+* a <1>: Top. (line 310)
+* a <2>: Top. (line 521)
+* a <3>: Top. (line 657)
+* a <4>: Top. (line 1007)
+* a <5>: Top. (line 1143)
+* a <6>: Top. (line 1197)
+* b: Top. (line 311)
+* b <1>: Top. (line 658)
+* b <2>: Top. (line 1144)
+* bidule machin: Top. (line 168)
+* bidule machin <1>: Top. (line 515)
+* bidule machin <2>: Top. (line 1001)
+* d--effn_name: Top. (line 149)
+* d--effn_name <1>: Top. (line 496)
+* d--effn_name <2>: Top. (line 982)
+* d--efmac_name: Top. (line 210)
+* d--efmac_name <1>: Top. (line 557)
+* d--efmac_name <2>: Top. (line 1043)
+* d--efmethod_name on c--lass: Top. (line 234)
+* d--efmethod_name on c--lass <1>: Top. (line 581)
+* d--efmethod_name on c--lass <2>: Top. (line 1067)
+* d--efop_name on c--lass: Top. (line 201)
+* d--efop_name on c--lass <1>: Top. (line 548)
+* d--efop_name on c--lass <2>: Top. (line 1034)
+* d--efspec_name: Top. (line 213)
+* d--efspec_name <1>: Top. (line 560)
+* d--efspec_name <2>: Top. (line 1046)
+* d--eftypefn_name: Top. (line 189)
+* d--eftypefn_name <1>: Top. (line 536)
+* d--eftypefn_name <2>: Top. (line 1022)
+* d--eftypefun_name: Top. (line 222)
+* d--eftypefun_name <1>: Top. (line 569)
+* d--eftypefun_name <2>: Top. (line 1055)
+* d--eftypemethod_name on c--lass: Top. (line 237)
+* d--eftypemethod_name on c--lass <1>: Top. (line 584)
+* d--eftypemethod_name on c--lass <2>: Top. (line 1070)
+* d--eftypeop_name on c--lass: Top. (line 192)
+* d--eftypeop_name on c--lass <1>: Top. (line 539)
+* d--eftypeop_name on c--lass <2>: Top. (line 1025)
+* d--efun_name: Top. (line 207)
+* d--efun_name <1>: Top. (line 554)
+* d--efun_name <2>: Top. (line 1040)
+* de--ffn_name: Top. (line 152)
+* de--ffn_name <1>: Top. (line 499)
+* de--ffn_name <2>: Top. (line 985)
+* deffn: Top. (line 177)
+* deffn <1>: Top. (line 179)
+* deffn <2>: Top. (line 524)
+* deffn <3>: Top. (line 526)
+* deffn <4>: Top. (line 1010)
+* deffn <5>: Top. (line 1012)
+* deffnx: Top. (line 175)
+* deffnx <1>: Top. (line 180)
+* deffnx <2>: Top. (line 522)
+* deffnx <3>: Top. (line 527)
+* deffnx <4>: Top. (line 1008)
+* deffnx <5>: Top. (line 1013)
+* followed: Top. (line 171)
+* followed <1>: Top. (line 518)
+* followed <2>: Top. (line 1004)
+* I: Top. (line 156)
+* I <1>: Top. (line 182)
+* I <2>: Top. (line 503)
+* I <3>: Top. (line 529)
+* I <4>: Top. (line 989)
+* I <5>: Top. (line 1015)
+* id i ule: Top. (line 162)
+* id i ule <1>: Top. (line 509)
+* id i ule <2>: Top. (line 995)
+* id ule: Top. (line 161)
+* id ule <1>: Top. (line 508)
+* id ule <2>: Top. (line 994)
+* log trap: Top. (line 158)
+* log trap <1>: Top. (line 505)
+* log trap <2>: Top. (line 991)
+* log trap1: Top. (line 159)
+* log trap1 <1>: Top. (line 506)
+* log trap1 <2>: Top. (line 992)
+* log trap2: Top. (line 160)
+* log trap2 <1>: Top. (line 507)
+* log trap2 <2>: Top. (line 993)
+* machin: Top. (line 167)
+* machin <1>: Top. (line 169)
+* machin <2>: Top. (line 514)
+* machin <3>: Top. (line 516)
+* machin <4>: Top. (line 1000)
+* machin <5>: Top. (line 1002)
+* t--ruc: Top. (line 1197)
+* T--ruc: Top. (line 1197)
+* truc: Top. (line 157)
+* truc <1>: Top. (line 183)
+* truc <2>: Top. (line 504)
+* truc <3>: Top. (line 530)
+* truc <4>: Top. (line 990)
+* truc <5>: Top. (line 1016)
Top section
1 chapter
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index 13fcf2bde7..2ca2e50a5d 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -2097,11 +2097,11 @@ html ''
</tr></table>
<span id="Top-section"></span><h1 class="top">Top section</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#constructs">1 constructs</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#constructs" rel="index">1 constructs</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top"><a href="#chapter">2 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#chapter2" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -5255,27 +5255,27 @@ Menu comment
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT3" href="#DOCF3">(1)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="#DOCF4">(2)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1" href="#DOCF1">(3)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(4)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="#DOCF5">(5)</a></h3>
+<h5><a id="FOOT5" href="#DOCF5">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="#DOCF6">(6)</a></h3>
+<h5><a id="FOOT6" href="#DOCF6">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="#DOCF7">(7)</a></h3>
+<h5><a id="FOOT7" href="#DOCF7">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="#DOCF8">(8)</a></h3>
+<h5><a id="FOOT8" href="#DOCF8">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT9" href="#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="#DOCF9">(11)</a></h3>
<p>in footnote</p>
<hr>
<span id="SEC_Contents"></span>
@@ -5290,7 +5290,7 @@ Menu comment
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-constructs-1" href="#constructs">1 constructs</a></li>
+ <li><a id="toc-constructs-1" href="#constructs" rel="index">1 constructs</a></li>
<li><a id="toc-chapter-1" href="#chapter">2 chapter</a>
<ul class="no-bullet">
<li><a id="toc-A-section" href="#s_002d_002dect_002cion">2.1 A section</a>
@@ -5301,7 +5301,7 @@ Menu comment
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
@@ -5316,9 +5316,9 @@ Menu comment
<div class="shortcontents">
<ul class="no-bullet">
-<li><a id="stoc-constructs-1" href="#constructs">1 constructs</a></li>
+<li><a id="stoc-constructs-1" href="#constructs" rel="index">1 constructs</a></li>
<li><a id="stoc-chapter-1" href="#chapter">2 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 06ad9ddd17..f9ab322081 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -2102,7 +2102,7 @@ html ''
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="#chapter2" rel="index">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table>
@@ -5269,27 +5269,27 @@ Menu comment
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2" href="#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT5" href="#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT6" href="#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT7" href="#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT8" href="#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT3" href="#DOCF3">(7)</a></h3>
+<h5><a id="FOOT3" href="#DOCF3">(7)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT4" href="#DOCF4">(8)</a></h3>
+<h5><a id="FOOT4" href="#DOCF4">(8)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
+<h5><a id="FOOT1_9" href="#DOCF1_9">(9)</a></h3>
<p>in footnote</p>
-<h3><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
+<h5><a id="FOOT2_10" href="#DOCF2_10">(10)</a></h3>
<p>in footnote2</p>
-<h3><a id="FOOT9" href="#DOCF9">(11)</a></h3>
+<h5><a id="FOOT9" href="#DOCF9">(11)</a></h3>
<p>in footnote</p>
<hr>
<span id="SEC_Contents"></span>
@@ -5315,7 +5315,7 @@ Menu comment
</ul></li>
</ul></li>
</ul></li>
- <li><a id="toc-chapter-2" href="#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
@@ -5331,7 +5331,7 @@ Menu comment
<div class="shortcontents">
<ul class="no-bullet">
<li><a id="stoc-chapter-1" href="#chapter">1 chapter</a></li>
-<li><a id="stoc-chapter-2" href="#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-2" href="#chapter2" rel="index">chapter 2</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index ca3ccb8273..1b18d90d55 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -11,7 +11,7 @@
</pre></menudescription></menuentry><menuentry leadingtext="* "><menutitle separator=": "><code>&arobase; <accent type="acute" bracketed="off">e</accent> &equiv;</code></menutitle><menunode separator=". ">(formatting)</menunode><menudescription><pre xml:space="preserve">&textldquo;<asis>&textmdash; something</asis>&textrdquo;
<command>cmd</command> <accent type="grave" bracketed="off">a</accent>
</pre></menudescription></menuentry></direntry>
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">chapter</nodenext></node>
<top spaces=" "><sectiontitle>Top section</sectiontitle>
<menu endspaces=" ">
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
index 95df471880..bf67e5d05f 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
@@ -36,7 +36,7 @@ ul.no-bullet {list-style: none}
<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Next section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left">[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[Index]</td>
@@ -46,16 +46,16 @@ ul.no-bullet {list-style: none}
<span id="File-used-for-navigation-testing"></span><h1 class="top">File used for navigation testing</h1>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="chapter.html">1 First chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
<hr size="6">
<span id="section"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Previous section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="chapter.html#chapter" title="Up section"> Up </a>]</td>
-<td valign="middle" align="left">[<a href="subsection.html#subsection" title="Next section in reading order"> &gt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Previous section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="chapter.html" title="Up section"> Up </a>]</td>
+<td valign="middle" align="left">[<a href="subsection.html" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left">[ &gt;&gt; ]</td>
<td valign="middle" align="left"> &nbsp; </td>
<td valign="middle" align="left"> &nbsp; </td>
@@ -96,7 +96,7 @@ ul.no-bullet {list-style: none}
b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsection.html#subsection">1.1.1 Sub section in section</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsection.html">1.1.1 Sub section in section</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
index a1bc2fa0cd..b53ab0e8d8 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
@@ -46,11 +46,11 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-First-chapter" href="chapter.html#chapter">1 First chapter</a>
+ <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a>
<ul class="no-bullet">
<li><a id="toc-Section-in-chapter" href="navigation_abt.html#section">1.1 Section in chapter</a>
<ul class="no-bullet">
- <li><a id="toc-Sub-section-in-section" href="subsection.html#subsection">1.1.1 Sub section in section</a></li>
+ <li><a id="toc-Sub-section-in-section" href="subsection.html">1.1.1 Sub section in section</a></li>
</ul></li>
</ul></li>
</ul>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
index 619ed0cb59..800eb3b45f 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
@@ -34,7 +34,7 @@ ul.no-bullet {list-style: none}
<body lang="en">
<span id="subsection"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#section" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="navigation_abt.html#section" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[ &gt; ]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
index cd69368a20..d12b80ea49 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
@@ -49,7 +49,7 @@ ul.no-bullet {list-style: none}
<span id="index-top"></span>
<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#chapter">1 Chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#chapter" rel="index">1 Chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table>
@@ -97,7 +97,7 @@ ul.no-bullet {list-style: none}
</tr></table>
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a id="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<p>my footnote</p>
<hr>
<span id="SEC_Overview"></span>
@@ -111,7 +111,7 @@ ul.no-bullet {list-style: none}
<div class="shortcontents">
<ul class="no-bullet">
-<li><a id="stoc-Chapter" href="#chapter">1 Chapter</a></li>
+<li><a id="stoc-Chapter" href="#chapter" rel="index">1 Chapter</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html b/macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html
index c62d030a85..c8f0f2f50f 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html
@@ -45,7 +45,7 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a id="toc-Chapter" href="no_monolithic.html#chapter">1 Chapter</a></li>
+ <li><a id="toc-Chapter" href="no_monolithic.html#chapter" rel="index">1 Chapter</a></li>
</ul>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.am b/macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.am
index 30a0720eff..20ced4249e 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.am
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.am
@@ -38,10 +38,10 @@ copy-tex-html:
fi; \
done
-DISTCLEANFILES = *.log *.out
+DISTCLEANFILES = *.log
distclean-local:
- rm -rf diffs $(tex_html_dirs)
+ rm -rf diffs $(tex_html_dirs) raw_out
dist-hook:
for dir in $(tex_html_dirs); do \
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.in b/macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.in
index 3de8a8d5a6..aed0056d30 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -492,6 +492,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -647,6 +648,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -714,11 +716,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -784,6 +788,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -804,6 +809,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -838,6 +844,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -852,6 +859,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -930,8 +938,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -947,14 +953,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1044,6 +1049,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1077,6 +1083,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1089,6 +1096,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1107,6 +1115,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1210,6 +1219,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1224,7 +1234,7 @@ EXTRA_DIST = $(TESTS) \
TESTS = tex_l2h.sh tex_t4ht.sh
AM_TESTS_ENVIRONMENT = srcdir="$(srcdir)"; export srcdir; top_srcdir="$(top_srcdir)"; export top_srcdir; builddir="$(builddir)"; export buildir; top_builddir="$(top_builddir)"; export top_builddir;
tex_html_dirs = tex_l2h tex_t4ht
-DISTCLEANFILES = *.log *.out
+DISTCLEANFILES = *.log
all: all-am
.SUFFIXES:
@@ -1615,7 +1625,7 @@ copy-tex-html:
done
distclean-local:
- rm -rf diffs $(tex_html_dirs)
+ rm -rf diffs $(tex_html_dirs) raw_out
dist-hook:
for dir in $(tex_html_dirs); do \
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh
index 1243511fbb..2b8602f202 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh
@@ -23,7 +23,7 @@ basename=tex_l2h
diffs_dir=diffs
raw_output_dir=raw_out
logfile=$basename.log
-stdout_file=$basename.out
+stdout_file=stdout_$basename.out
[ "z$srcdir" = 'z' ] && srcdir=.
@@ -41,7 +41,6 @@ staging_dir=$diffs_dir/staging
[ -d $raw_output_dir ] || mkdir $raw_output_dir
echo "$basename" > $logfile
-: > $stdout_file
tmp_dir=`mktemp -d l2h_t2h_XXXXXXXX`
if test z"$tmp_dir" = 'z' ; then
@@ -53,8 +52,9 @@ fi
raw_outdir=$raw_output_dir/$basename
[ -d $raw_outdir ] && rm -rf $raw_outdir
mkdir $basename
-echo "$PERL -I $srcdir/../.. -I $srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I $srcdir/../../maintain/lib/libintl-perl/lib -I $srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init --set-customization-variable 'L2H 1' --set-customization-variable L2H_FILE=$srcdir/../../t/init/l2h.init --set-customization-variable 'L2H_CLEAN=0' --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2" >> $logfile
-$PERL -I $srcdir/../.. -I $srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I $srcdir/../../maintain/lib/libintl-perl/lib -I $srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init --set-customization-variable 'L2H 1' --set-customization-variable L2H_FILE=$srcdir/../../t/init/l2h.init --set-customization-variable 'L2H_CLEAN=0' --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2
+: > $basename/$stdout_file
+echo "$PERL -I $srcdir/../.. -I $srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I $srcdir/../../maintain/lib/libintl-perl/lib -I $srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init --set-customization-variable 'L2H 1' --set-customization-variable L2H_FILE=$srcdir/../../t/init/l2h.init --set-customization-variable 'L2H_CLEAN=0' --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
+$PERL -I $srcdir/../.. -I $srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I $srcdir/../../maintain/lib/libintl-perl/lib -I $srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init --set-customization-variable 'L2H 1' --set-customization-variable L2H_FILE=$srcdir/../../t/init/l2h.init --set-customization-variable 'L2H_CLEAN=0' --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $basename/$stdout_file 2>$basename/${basename}.2
return_code=0
ret=$?
@@ -65,7 +65,8 @@ else
outdir=$basename
cp -pr $outdir $raw_output_dir
rm -f $outdir/*_l2h_images.log $outdir/*.aux $outdir/*_l2h.css \
- $outdir/*_l2h_images.out $outdir/*_l2h_images.pl $outdir/*.png
+ $outdir/*_l2h_images.out $outdir/*_l2h_images.pl $outdir/*_l2h_images.pdf \
+ $outdir/*.png $outdir/*.svg $outdir/$stdout_file
sed -e 's/^texexpand.*/texexpand /' \
-e '/is no longer supported at.*line/d' "$raw_outdir/$basename.2" > "$outdir/$basename.2"
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm
index 34afac9c33..b39fef8eba 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex-l2h_cache.pm
@@ -6,7 +6,7 @@ $$ \chi^2 = \sum_{i=1}^N
$l2h_cache{$l2h_cache_key} = q|
<P>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\chi^2 = \sum_{i=1}^N
@@ -15,9 +15,8 @@ $l2h_cache{$l2h_cache_key} = q|
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="52" BORDER="0"
- SRC="tex_1.png"
+<IMG STYLE=""
+ SRC="tex_1.svg"
ALT="\begin{displaymath}\chi^2 = \sum_{i=1}^N
\left(y_i - (a + b x_i)
\over \sigma_i\right)^2 \end{displaymath}">
@@ -31,36 +30,28 @@ $l2h_cache{$l2h_cache_key} = q|
<P>
tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>|;
-$l2h_cache_key = q/$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$/;
-$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
- -->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_5.png"
- ALT="$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>|;
-
$l2h_cache_key = q/$@code{math code} a < b$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$@code{math code} a < b$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_4.svg"
ALT="$@code{math code} a &lt; b$"></SPAN>|;
+$l2h_cache_key = q/$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$/;
+$l2h_cache{$l2h_cache_key} = q|<!-- MATH
+ $\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
+ -->
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_5.svg"
+ ALT="$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>|;
+
$l2h_cache_key = q/$a @\ b$/;
-$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
- SRC="tex_3.png"
+$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_3.svg"
ALT="$a @\ b$"></SPAN>|;
$l2h_cache_key = q/${x^i}\over{\tan y}$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
${x^i}\over{\tan y}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="38" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_2.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>|;
1; \ No newline at end of file
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex.html b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex.html
index c7152b67c4..46e34c0390 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex.html
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Tests</title>
<meta name="description" content="Tests">
@@ -9,32 +10,21 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -42,15 +32,13 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-<a name="Top"></a>
-<a name="Tests"></a>
-<h1 class="top">Tests</h1>
+<body lang="en">
+<span id="Top"></span><span id="Tests"></span><h1 class="top">Tests</h1>
<p>Now tex on the same line
<P>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\chi^2 = \sum_{i=1}^N
@@ -59,9 +47,8 @@ ul.no-bullet {list-style: none}
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="52" BORDER="0"
- SRC="tex_1.png"
+<IMG STYLE=""
+ SRC="tex_1.svg"
ALT="\begin{displaymath}\chi^2 = \sum_{i=1}^N
\left(y_i - (a + b x_i)
\over \sigma_i\right)^2 \end{displaymath}">
@@ -81,15 +68,11 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
Here some <!-- MATH
${x^i}\over{\tan y}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="38" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_2.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>.
</p>
<p>Maths with protected \:
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
- SRC="tex_3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_3.svg"
ALT="$a @\ b$"></SPAN>.
</p>
<p>Maths with code @-command:
@@ -97,9 +80,7 @@ Here some <!-- MATH
<p><!-- MATH
$@code{math code} a < b$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_4.svg"
ALT="$@code{math code} a &lt; b$"></SPAN>
</p>
<p>Maths with code @-command and braces:
@@ -107,10 +88,8 @@ Here some <!-- MATH
<p><!-- MATH
$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_5.png"
- ALT="$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_5.svg"
+ ALT="$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
</p>
<p>@\ outside of math
</p>
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm
index a12567d70c..2c75767813 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm
@@ -3,16 +3,15 @@ $l2h_cache_key = q/$$
U w V^\dagger
$$/;
$l2h_cache{$l2h_cache_key} = q|<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
U w V^\dagger
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="22" BORDER="0"
- SRC="tex_complex_2.png"
+<IMG STYLE=""
+ SRC="tex_complex_2.svg"
ALT="\begin{displaymath}
U w V^\dagger
\end{displaymath}">
@@ -24,16 +23,15 @@ $l2h_cache_key = q/$$
\omega = h ( \eta , \varphi)
$$/;
$l2h_cache{$l2h_cache_key} = q|<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="26" BORDER="0"
- SRC="tex_complex_3.png"
+<IMG STYLE=""
+ SRC="tex_complex_3.svg"
ALT="\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}">
@@ -44,16 +42,15 @@ $l2h_cache{$l2h_cache_key} = q|<BR><P></P>
$l2h_cache_key = q/$$\partial_{\eta} g(\eta(t),\varphi(t));
$$/;
$l2h_cache{$l2h_cache_key} = q|<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="27" BORDER="0"
- SRC="tex_complex_1.png"
+<IMG STYLE=""
+ SRC="tex_complex_1.svg"
ALT="\begin{displaymath}\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}">
</DIV>
@@ -64,23 +61,17 @@ $l2h_cache_key = q/$(I-D) \varphi(t)$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$(I-D) \varphi(t)$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
ALT="$(I-D) \varphi(t)$"></SPAN>|;
$l2h_cache_key = q/$\phi w V^t$/;
-$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_5.png"
+$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_5.svg"
ALT="$\phi w V^t$"></SPAN>|;
$l2h_cache_key = q/$h \dot \psi^\phi$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$h \dot \psi^\phi$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="35" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_6.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.84ex; vertical-align: -0.57ex; " SRC="tex_complex_6.svg"
ALT="$h \dot \psi^\phi$"></SPAN>|;
1; \ No newline at end of file
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex.html b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
index e77f35dbf5..3d5c4125a2 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
@@ -6,6 +6,7 @@ $$
Some (I-D) \varphi(t) math. -->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>The title</title>
<meta name="description" content="The title">
@@ -13,32 +14,21 @@ Some (I-D) \varphi(t) math. -->
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -46,20 +36,19 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<body lang="en">
<h1>The title</h1>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="27" BORDER="0"
- SRC="tex_complex_1.png"
+<IMG STYLE=""
+ SRC="tex_complex_1.svg"
ALT="\begin{displaymath}\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}">
</DIV>
@@ -69,29 +58,23 @@ ul.no-bullet {list-style: none}
<p>Some <!-- MATH
$(I-D) \varphi(t)$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
ALT="$(I-D) \varphi(t)$"></SPAN> math.
-</p>
-<hr>
+</p><hr>
-<a name="Top"></a>
-<a name="The-title"></a>
-<h1 class="top">The title</h1>
+<span id="Top"></span><span id="The-title"></span><h1 class="top">The title</h1>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="27" BORDER="0"
- SRC="tex_complex_1.png"
+<IMG STYLE=""
+ SRC="tex_complex_1.svg"
ALT="\begin{displaymath}\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}">
</DIV>
@@ -101,24 +84,20 @@ ul.no-bullet {list-style: none}
<p>Some <!-- MATH
$(I-D) \varphi(t)$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
ALT="$(I-D) \varphi(t)$"></SPAN> math.
</p>
-
<p>Tex:
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
U w V^\dagger
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="22" BORDER="0"
- SRC="tex_complex_2.png"
+<IMG STYLE=""
+ SRC="tex_complex_2.svg"
ALT="\begin{displaymath}
U w V^\dagger
\end{displaymath}">
@@ -126,29 +105,26 @@ U w V^\dagger
<BR CLEAR="ALL">
<P></P>
</p>
-<p>and math <SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_5.png"
+<p>and math <SPAN CLASS="MATH"><IMG STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_5.svg"
ALT="$\phi w V^t$"></SPAN>.
</p>
-<p>Now there is a footnote<a name="DOCF1" href="#FOOT1"><sup>1</sup></a>
+<p>Now there is a footnote<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
</p>
<div class="footnote">
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="26" BORDER="0"
- SRC="tex_complex_3.png"
+<IMG STYLE=""
+ SRC="tex_complex_3.svg"
ALT="\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}">
@@ -159,9 +135,7 @@ U w V^\dagger
<p>and math <!-- MATH
$h \dot \psi^\phi$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="35" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_6.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.84ex; vertical-align: -0.57ex; " SRC="tex_complex_6.svg"
ALT="$h \dot \psi^\phi$"></SPAN>.
</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html
index 6b0c92e681..b279e9616b 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>tex_complex_l2h</TITLE>
<META NAME="description" CONTENT="tex_complex_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="tex_complex_l2h.css">
@@ -24,16 +21,15 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<!-- l2h_begin tex_complex_l2h 1 -->
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="27" BORDER="0"
- SRC="tex_complex_l2h_img1.png"
+<IMG STYLE=""
+ SRC="tex_complex_l2h_img1.svg"
ALT="\begin{displaymath}\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}">
</DIV>
@@ -44,16 +40,15 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<!-- l2h_begin tex_complex_l2h 2 -->
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
U w V^\dagger
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="22" BORDER="0"
- SRC="tex_complex_l2h_img2.png"
+<IMG STYLE=""
+ SRC="tex_complex_l2h_img2.svg"
ALT="\begin{displaymath}
U w V^\dagger
\end{displaymath}">
@@ -65,16 +60,15 @@ U w V^\dagger
<!-- l2h_begin tex_complex_l2h 3 -->
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="26" BORDER="0"
- SRC="tex_complex_l2h_img3.png"
+<IMG STYLE=""
+ SRC="tex_complex_l2h_img3.svg"
ALT="\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}">
@@ -88,17 +82,13 @@ U w V^\dagger
<!-- MATH
$(I-D) \varphi(t)$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_l2h_img4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_l2h_img4.svg"
ALT="$(I-D) \varphi(t)$"></SPAN>
<!-- l2h_end tex_complex_l2h 4 -->
<!-- l2h_begin tex_complex_l2h 5 -->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="31" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_l2h_img5.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_l2h_img5.svg"
ALT="$\phi w V^t$"></SPAN>
<!-- l2h_end tex_complex_l2h 5 -->
@@ -107,9 +97,7 @@ U w V^\dagger
<!-- MATH
$h \dot \psi^\phi$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="35" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_l2h_img6.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.84ex; vertical-align: -0.57ex; " SRC="tex_complex_l2h_img6.svg"
ALT="$h \dot \psi^\phi$"></SPAN>
<!-- l2h_end tex_complex_l2h 6 -->
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex
index 6f9769def7..987361a748 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex
@@ -7,10 +7,7 @@
\usepackage{html}
-\usepackage[dvips]{color}
-
-
-\pagecolor[gray]{.7}
+\usepackage{xcolor}
\usepackage[]{inputenc}
@@ -56,56 +53,40 @@
\parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
\def\phantompar{\csname par\endcsname}\normalsize}%
\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
-\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }%
-\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }%
-\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup %
- \let\ifinner=\iffalse \let\)\liih@math }%
-\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
- \expandafter\box\next\egroup}%
-\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
-\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
- \ifdim\dimen0>.95\vsize
- \lthtmltypeout{%
-*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
- \ht\sizebox.95\vsize \dp\sizebox\z@ \fi
- \lthtmltypeout{l2hSize %
-:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
-\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
- \lthtmlmathtype{#1}\lthtmlvboxmathA}%
-\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}%
-\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup
- \let\@savefreelist\@freelist \lthtmlhboxmathB}%
-\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}%
-\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox
- \global\let\@freelist\@savefreelist}%
-\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}%
-\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}%
-\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}%
- \lthtmldisplayA{#1}\let\@eqnnum\relax}%
-\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}%
-\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB}
-\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA
- \vrule height1.5ex width0pt }%
-\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}%
-\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}%
-\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline}
-\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath}
-\newcommand\lthtmlindisplaymathZ{\egroup %
- \centerinlinemath\lthtmllogmath\lthtmlsetmath}
-\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{%
- \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{%
- \kern.1em\kern0.75 pt\hbox{\hglue.17em\copy\sizebox\hglue0.75 pt}}\kern.3pt%
- \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.75 pt%
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\centerinlinemath{%
- \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi
- \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1
- \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax}
-
+\usepackage[tightpage,active]{preview}
+\newbox\lthtmlPageBox
+\newdimen\lthtmlCropMarkHeight
+\newdimen\lthtmlCropMarkDepth
+\long\def\lthtmlTightVBox#1#2{%
+ \setbox\lthtmlPageBox\vbox{\hbox{\catcode`\_=8 #2}}%
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}}%
+\long\def\lthtmlTightFBox#1#2{%
+ \adjustnormalsize\setbox\lthtmlPageBox=\vbox\bgroup %
+ \let\ifinner=\iffalse \let\)\liih@math %
+ {\catcode`\_=8 #2}%
+ \@next\next\@currlist{}{\def\next{\voidb@x}}%
+ \expandafter\box\next\egroup %
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}%
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayB#1#2\lthtmldisplayZ{\\edef\preveqno{(\theequation)}%
+ \lthtmlTightVBox{#1}{\let\@eqnnum\relax#2}}
+ \long\def\lthtmlfigureA#1#2\lthtmlfigureZ{\let\@savefreelist\@freelist
+ \lthtmlTightFBox{#1}{#2}\global\let\@freelist\@savefreelist}
+ \long\def\lthtmlpictureA#1#2\lthtmlpictureZ{\let\@savefreelist\@freelist
+ \lthtmlTightVBox{#1}{#2}\global\let\@freelist\@savefreelist}
\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
\ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
\else\expandafter\vss\fi}%
@@ -161,19 +142,19 @@
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline12}%
$(I-D) \varphi(t)$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline14}%
$\phi w V^t$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline16}%
$h \dot \psi^\phi$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.2 b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.2
index a007a231cf..d5bd71786a 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.2
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.2
@@ -1,5 +1,5 @@
texexpand
-tex.texi:7: warning: @tex should only appear at a line beginning
+tex.texi:7: warning: @tex should only appear at the beginning of a line
tex.texi:14: superfluous argument to @end tex: bidule
tex.texi:42: warning: @\ should only appear in math context
texexpand
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.html b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.html
index 1bb11e2c4c..628f10514a 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>tex_l2h</TITLE>
<META NAME="description" CONTENT="tex_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="tex_l2h.css">
@@ -26,7 +23,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<P>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\chi^2 = \sum_{i=1}^N
@@ -35,9 +32,8 @@ original version by: Nikos Drakos, CBLU, University of Leeds
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="52" BORDER="0"
- SRC="tex_l2h_img1.png"
+<IMG STYLE=""
+ SRC="tex_l2h_img1.svg"
ALT="\begin{displaymath}\chi^2 = \sum_{i=1}^N
\left(y_i - (a + b x_i)
\over \sigma_i\right)^2 \end{displaymath}">
@@ -57,17 +53,13 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
<!-- MATH
${x^i}\over{\tan y}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="38" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_l2h_img2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_l2h_img2.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>
<!-- l2h_end tex_l2h 3 -->
<!-- l2h_begin tex_l2h 4 -->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="14" ALIGN="BOTTOM" BORDER="0"
- SRC="tex_l2h_img3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_l2h_img3.svg"
ALT="$a @\ b$"></SPAN>
<!-- l2h_end tex_l2h 4 -->
@@ -76,9 +68,7 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
<!-- MATH
$@code{math code} a < b$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="28" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_l2h_img4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_l2h_img4.svg"
ALT="$@code{math code} a &lt; b$"></SPAN>
<!-- l2h_end tex_l2h 5 -->
@@ -87,10 +77,8 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
<!-- MATH
$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_l2h_img5.png"
- ALT="$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_l2h_img5.svg"
+ ALT="$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
<!-- l2h_end tex_l2h 6 -->
<BR>
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex
index 7694f49724..1265c39a54 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h.tex
@@ -56,7 +56,7 @@ $@code{math code} a < b$
<!-- l2h_begin tex_l2h 6 -->
\end{rawhtml}
-$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
+$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
\begin{rawhtml}
<!-- l2h_end tex_l2h 6 -->
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h_images.tex b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h_images.tex
index d97654c3a3..b8153604bc 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h_images.tex
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_l2h_res/tex_l2h_images.tex
@@ -7,10 +7,7 @@
\usepackage{html}
-\usepackage[dvips]{color}
-
-
-\pagecolor[gray]{.7}
+\usepackage{xcolor}
\usepackage[]{inputenc}
@@ -56,56 +53,40 @@
\parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
\def\phantompar{\csname par\endcsname}\normalsize}%
\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
-\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }%
-\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }%
-\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup %
- \let\ifinner=\iffalse \let\)\liih@math }%
-\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
- \expandafter\box\next\egroup}%
-\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
-\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
- \ifdim\dimen0>.95\vsize
- \lthtmltypeout{%
-*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
- \ht\sizebox.95\vsize \dp\sizebox\z@ \fi
- \lthtmltypeout{l2hSize %
-:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
-\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
- \lthtmlmathtype{#1}\lthtmlvboxmathA}%
-\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}%
-\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup
- \let\@savefreelist\@freelist \lthtmlhboxmathB}%
-\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}%
-\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox
- \global\let\@freelist\@savefreelist}%
-\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}%
-\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}%
-\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}%
- \lthtmldisplayA{#1}\let\@eqnnum\relax}%
-\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}%
-\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB}
-\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA
- \vrule height1.5ex width0pt }%
-\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}%
-\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}%
-\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline}
-\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath}
-\newcommand\lthtmlindisplaymathZ{\egroup %
- \centerinlinemath\lthtmllogmath\lthtmlsetmath}
-\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{%
- \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{%
- \kern.1em\kern0.75 pt\hbox{\hglue.17em\copy\sizebox\hglue0.75 pt}}\kern.3pt%
- \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.75 pt%
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\centerinlinemath{%
- \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi
- \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1
- \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax}
-
+\usepackage[tightpage,active]{preview}
+\newbox\lthtmlPageBox
+\newdimen\lthtmlCropMarkHeight
+\newdimen\lthtmlCropMarkDepth
+\long\def\lthtmlTightVBox#1#2{%
+ \setbox\lthtmlPageBox\vbox{\hbox{\catcode`\_=8 #2}}%
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}}%
+\long\def\lthtmlTightFBox#1#2{%
+ \adjustnormalsize\setbox\lthtmlPageBox=\vbox\bgroup %
+ \let\ifinner=\iffalse \let\)\liih@math %
+ {\catcode`\_=8 #2}%
+ \@next\next\@currlist{}{\def\next{\voidb@x}}%
+ \expandafter\box\next\egroup %
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}%
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayB#1#2\lthtmldisplayZ{\\edef\preveqno{(\theequation)}%
+ \lthtmlTightVBox{#1}{\let\@eqnnum\relax#2}}
+ \long\def\lthtmlfigureA#1#2\lthtmlfigureZ{\let\@savefreelist\@freelist
+ \lthtmlTightFBox{#1}{#2}\global\let\@freelist\@savefreelist}
+ \long\def\lthtmlpictureA#1#2\lthtmlpictureZ{\let\@savefreelist\@freelist
+ \lthtmlTightVBox{#1}{#2}\global\let\@freelist\@savefreelist}
\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
\ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
\else\expandafter\vss\fi}%
@@ -146,25 +127,25 @@
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline17}%
${x^i}\over{\tan y}$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline19}%
$a @\ b$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline21}%
$@code{math code} a < b$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline23}%
-$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$%
-\lthtmlinlinemathZ
+$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$%
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh
index 07cc93f9ee..df5e5bfbd7 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh
@@ -11,7 +11,7 @@ basename=tex_t4ht
diffs_dir=diffs
raw_output_dir=raw_out
logfile=$basename.log
-stdout_file=$basename.out
+stdout_file=stdout_$basename.out
[ "z$srcdir" = 'z' ] && srcdir=.
@@ -29,14 +29,14 @@ staging_dir=$diffs_dir/staging
[ -d $raw_output_dir ] || mkdir $raw_output_dir
echo "$basename" > $logfile
-: > $stdout_file
[ -d $basename ] && rm -rf $basename
raw_outdir=$raw_output_dir/$basename
[ -d $raw_outdir ] && rm -rf $raw_outdir
mkdir $basename
-echo "$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2" >> $logfile
-$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $stdout_file 2>$basename/${basename}.2
+: > $basename/$stdout_file
+echo "$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
+$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/ $srcdir/../tex_html/tex_complex.texi $srcdir/../tex_html/tex.texi --force >> $basename/$stdout_file 2>$basename/${basename}.2
return_code=0
ret=$?
@@ -48,7 +48,7 @@ else
cp -pr $outdir $raw_output_dir
rm -f $outdir/*_tex4ht_*.log \
$outdir/*_tex4ht_*.idv $outdir/*_tex4ht_*.dvi \
- $outdir/*_tex4ht_tex.html $outdir/*.png
+ $outdir/*_tex4ht_tex.html $outdir/*.png $outdir/$stdout_file
dir=${basename}
if [ -d $srcdir/${dir}_res ]; then
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex.html b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex.html
index 19340135ea..1097041650 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex.html
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Tests</title>
<meta name="description" content="Tests">
@@ -9,35 +10,24 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
@import "tex_tex4ht_math.css";
@import "tex_tex4ht_tex.css";
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -45,18 +35,16 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-<a name="Top"></a>
-<a name="Tests"></a>
-<h1 class="top">Tests</h1>
+<body lang="en">
+<span id="Top"></span><span id="Tests"></span><h1 class="top">Tests</h1>
<p>Now tex on the same line
<!--l. 5--><p class="indent" >
<center class="math-display" >
<img
src="tex_tex4ht_tex0x.png" alt=" N ( )2
-&chi;2 = &sum; yi &minus;-(a+-bxi)
- i=1 &sigma;i
+&#x03C7;2 = &#x2211; yi --(a+-bxi)
+ i=1 &#x03C3;i
" class="math-display" ></center>
<!--l. 10--><p class="indent" >
Some text one the line following @end tex
@@ -69,21 +57,20 @@ class="E">E</span>X</span>
<p>Same that @html (but empty following line not ignored).
</p>
<p>Test of @math
-Here some xi
-_
+Here some xi __
tan y.
</p>
<p>Maths with protected \:
- a\b.
+ a\b.
</p>
<p>Maths with code @-command:
</p>
-<p> mathcodea &#x003C; b
+<p> mathcodea &#x003C; b
</p>
<p>Maths with code @-command and braces:
</p>
-<p> math code_&sum;
- i f
+<p> math code _&#x2211;
+ i f
</p>
<p>@\ outside of math
</p>
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
index 65ba4a92c9..52aa88deb2 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
@@ -6,6 +6,7 @@ $$
Some (I-D) \varphi(t) math. -->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>The title</title>
<meta name="description" content="The title">
@@ -13,35 +14,24 @@ Some (I-D) \varphi(t) math. -->
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
@import "tex_complex_tex4ht_math.css";
@import "tex_complex_tex4ht_tex.css";
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -49,31 +39,27 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<body lang="en">
<h1>The title</h1>
<center class="math-display" >
<img
-src="tex_complex_tex4ht_tex0x.png" alt="&part;&eta;g(&eta;(t),&phi;(t)); " class="math-display" ></center>
+src="tex_complex_tex4ht_tex0x.png" alt="&#x2202;&#x03B7;g(&#x03B7;(t),&#x03C6;(t)); " class="math-display" ></center>
-<p>Some (I &minus; D)&phi;(t) math.
-</p>
-<hr>
+<p>Some (I - D)&#x03C6;(t) math.
+</p><hr>
-<a name="Top"></a>
-<a name="The-title"></a>
-<h1 class="top">The title</h1>
+<span id="Top"></span><span id="The-title"></span><h1 class="top">The title</h1>
<center class="math-display" >
<img
-src="tex_complex_tex4ht_tex0x.png" alt="&part;&eta;g(&eta;(t),&phi;(t)); " class="math-display" ></center>
+src="tex_complex_tex4ht_tex0x.png" alt="&#x2202;&#x03B7;g(&#x03B7;(t),&#x03C6;(t)); " class="math-display" ></center>
-<p>Some (I &minus; D)&phi;(t) math.
+<p>Some (I - D)&#x03C6;(t) math.
</p>
-
<p>Tex:
<center class="math-display" >
@@ -81,22 +67,22 @@ src="tex_complex_tex4ht_tex0x.png" alt="&part;&eta;g(&eta;(t),&phi;(t)); " clas
src="tex_complex_tex4ht_tex1x.png" alt=" &#8224;
UwV " class="math-display" ></center>
</p>
-<p>and math &#x03D5;wV t.
+<p>and math &#x03D5;wV t.
</p>
-<p>Now there is a footnote<a name="DOCF1" href="#FOOT1"><sup>1</sup></a>
+<p>Now there is a footnote<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
</p>
<div class="footnote">
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<center class="math-display" >
<img
-src="tex_complex_tex4ht_tex2x.png" alt="&omega; = h(&eta;,&phi; ) " class="math-display" ></center>
+src="tex_complex_tex4ht_tex2x.png" alt="&#x03C9; = h(&#x03B7;,&#x03C6; ) " class="math-display" ></center>
-<p>and math h &#x02D9;&psi;&#x03D5;.
+<p>and math h &#x02D9;&#x03C8;&#x03D5;.
</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.aux b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.aux
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.aux
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.cp b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.cp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.cp
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.fn b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.fn
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.fn
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.html b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.html
index e98a5e4ba0..4b0e74093a 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.html
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.html
@@ -1,11 +1,11 @@
&#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 1 --&#x003E;
- (I &minus; D)&phi;(t)
- &#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 1 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 2 --&#x003E;
- &#x03D5;wV t
- &#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 2 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 3 --&#x003E;
- h &#x02D9;&psi;&#x03D5;
- &#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 3 --&#x003E;
+ (I - D)&#x03C6;(t)
+&#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 1 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 2 --&#x003E;
+ &#x03D5;wV t
+&#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 2 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 3 --&#x003E;
+ h &#x02D9;&#x03C8;&#x03D5;
+&#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 3 --&#x003E;
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.ky b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.ky
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.ky
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.pg b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.pg
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.pg
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tp b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tp
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.vr b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.vr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.vr
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_t4ht.2 b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_t4ht.2
index 88f272832e..a72744a641 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_t4ht.2
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_t4ht.2
@@ -1,4 +1,3 @@
-dvipng warning: DVI magnification of 1000 over-ridden by user (1400) dvipng warning: DVI magnification of 1000 over-ridden by user (1400) dvipng warning: DVI magnification of 1000 over-ridden by user (1400) tex.texi:7: warning: @tex should only appear at a line beginning
+tex.texi:7: warning: @tex should only appear at the beginning of a line
tex.texi:14: superfluous argument to @end tex: bidule
tex.texi:42: warning: @\ should only appear in math context
-dvipng warning: DVI magnification of 1000 over-ridden by user (1400) \ No newline at end of file
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.aux b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.aux
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.aux
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.cp b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.cp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.cp
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.fn b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.fn
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.fn
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.html b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.html
index 81fd4f5873..1b5d4f6c3f 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.html
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.html
@@ -1,17 +1,16 @@
&#x003C;!-- tex4ht_begin tex_tex4ht_math math 1 --&#x003E;
- xi
-_
+ xi __
tan y
- &#x003C;!-- tex4ht_end tex_tex4ht_math math 1 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_tex4ht_math math 2 --&#x003E;
- a\b
- &#x003C;!-- tex4ht_end tex_tex4ht_math math 2 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_tex4ht_math math 3 --&#x003E;
- mathcodea &#x003C; b
- &#x003C;!-- tex4ht_end tex_tex4ht_math math 3 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_tex4ht_math math 4 --&#x003E;
- math code_&sum;
- i f
- &#x003C;!-- tex4ht_end tex_tex4ht_math math 4 --&#x003E;
+&#x003C;!-- tex4ht_end tex_tex4ht_math math 1 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_tex4ht_math math 2 --&#x003E;
+ a\b
+&#x003C;!-- tex4ht_end tex_tex4ht_math math 2 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_tex4ht_math math 3 --&#x003E;
+ mathcodea &#x003C; b
+&#x003C;!-- tex4ht_end tex_tex4ht_math math 3 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_tex4ht_math math 4 --&#x003E;
+ math code _&#x2211;
+ i f
+&#x003C;!-- tex4ht_end tex_tex4ht_math math 4 --&#x003E;
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.ky b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.ky
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.ky
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.pg b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.pg
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.pg
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.texi b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.texi
index fb3e0c31cf..909728544d 100644
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.texi
+++ b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.texi
@@ -32,7 +32,7 @@
<!-- tex4ht_begin tex_tex4ht_math math 4 -->
@end verbatim
-@math{ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}}
+@math{\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}}
@verbatim
<!-- tex4ht_end tex_tex4ht_math math 4 -->
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tp b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tp
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.vr b/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.vr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.vr
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/Makefile.in b/macros/texinfo/texinfo/tp/tests/nested_formats/Makefile.in
index b60976e4df..7563232fd6 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -276,6 +276,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -431,6 +432,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -498,11 +500,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -568,6 +572,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -588,6 +593,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -622,6 +628,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -636,6 +643,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -714,8 +722,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -731,14 +737,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -828,6 +833,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -861,6 +867,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -873,6 +880,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -891,6 +899,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -994,6 +1003,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_cartouche/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_cartouche/nested_formats.info
index 0c7cf80b44..d742fab23e 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_cartouche/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_cartouche/nested_formats.info
@@ -2451,3 +2451,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_deffn/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_deffn/nested_formats.info
index 2728cf6883..375546ea60 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_deffn/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_deffn/nested_formats.info
@@ -2732,3 +2732,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_enumerate/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_enumerate/nested_formats.info
index b70c86e3ea..c059216f43 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_enumerate/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_enumerate/nested_formats.info
@@ -2455,3 +2455,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_example/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_example/nested_formats.info
index 8d859c8eee..03f94aab00 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_example/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_example/nested_formats.info
@@ -2525,3 +2525,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info
index 5b53c34ed8..02b310191f 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_flushright/nested_formats.info
@@ -2439,3 +2439,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_group/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_group/nested_formats.info
index b98acc1940..2d71b03f8b 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_group/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_group/nested_formats.info
@@ -2451,3 +2451,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_itemize/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_itemize/nested_formats.info
index a7d17e658d..e2c6bdb6a5 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_itemize/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_itemize/nested_formats.info
@@ -2455,3 +2455,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_menu/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_menu/nested_formats.info
index 882de53a38..3ed71afbb6 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_menu/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_menu/nested_formats.info
@@ -3008,3 +3008,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_multitable/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_multitable/nested_formats.info
index 85e48a99c6..a99bb36662 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_multitable/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_multitable/nested_formats.info
@@ -2451,3 +2451,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_quotation/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_quotation/nested_formats.info
index 6878813f6a..42464ff105 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_quotation/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_quotation/nested_formats.info
@@ -2455,3 +2455,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_table/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_table/nested_formats.info
index 0a4111db2f..ff24a00474 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_table/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/nested_table/nested_formats.info
@@ -2455,3 +2455,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.info b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.info
index b98acc1940..2d71b03f8b 100644
--- a/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.info
+++ b/macros/texinfo/texinfo/tp/tests/nested_formats/res_parser_info/texi_nested_formats/nested_formats.info
@@ -2451,3 +2451,8 @@ Tag Table:
Node: Top85

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/macros/texinfo/texinfo/tp/tests/reference/stdout.txt b/macros/texinfo/texinfo/tp/tests/reference/stdout.txt
deleted file mode 100644
index 4109e5484a..0000000000
--- a/macros/texinfo/texinfo/tp/tests/reference/stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a very simple texi manual <>.
-
diff --git a/macros/texinfo/texinfo/tp/tests/reference/stdout_split.txt b/macros/texinfo/texinfo/tp/tests/reference/stdout_split.txt
deleted file mode 100644
index ad21aedfd8..0000000000
--- a/macros/texinfo/texinfo/tp/tests/reference/stdout_split.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-texi2any: warning: -: output incompatible with split
-This is a very simple texi manual <>.
-
diff --git a/macros/texinfo/texinfo/tp/tests/run_parser_all.sh b/macros/texinfo/texinfo/tp/tests/run_parser_all.sh
index e475da5c2f..76a7eb0ab5 100644
--- a/macros/texinfo/texinfo/tp/tests/run_parser_all.sh
+++ b/macros/texinfo/texinfo/tp/tests/run_parser_all.sh
@@ -64,8 +64,8 @@ post_process_output ()
cp -pr ${outdir}$dir/ "${raw_outdir}"
# remove files that are not reproducible
- rm -f "${outdir}$dir/$basename.1" ${outdir}$dir/*.png \
- ${outdir}$dir/*_l2h_images.log ${outdir}$dir/*_tex4ht_*.log \
+ rm -f "${outdir}$dir/$basename.1" ${outdir}$dir/*.png ${outdir}$dir/*.svg \
+ ${outdir}$dir/*_l2h_images.log ${outdir}$dir/*_l2h_images.pdf ${outdir}$dir/*_tex4ht_*.log \
${outdir}$dir/*_tex4ht_*.idv ${outdir}$dir/*_tex4ht_*.dvi \
${outdir}$dir/*_l2h.html.* \
${outdir}$dir/*_tex4ht_tex.html*
@@ -245,12 +245,7 @@ if [ "z$clean" = 'zyes' -o "z$copy" = 'zyes' ]; then
outdir="$testdir/${out_dir}${dir_suffix}/"
resdir="$srcdir/$testdir/${res_dir}${dir_suffix}/"
if [ -d "${outdir}$dir" ]; then
- if [ -d "${resdir}$dir" ]; then
- # ugly hack to avoid CVS and .svn
- rm -f "${resdir}$dir/"?*.*
- else
- mkdir "${resdir}$dir/"
- fi
+ mkdir -p "${resdir}$dir/"
cp -r "${outdir}$dir/"* "${resdir}$dir/"
else
echo "$0: No dir ${outdir}$dir" >&2
@@ -263,12 +258,6 @@ if [ "z$clean" = 'zyes' -o "z$copy" = 'zyes' ]; then
fi
mkdir -p $testdir/$diffs_dir
-staging_dir_res=$testdir/$diffs_dir/staging_res/
-if test z"$clean" = 'zyes' ; then
- rm -rf $staging_dir_res
-else
- mkdir -p $staging_dir_res
-fi
for command_dir in $commands; do
dir_suffix=`echo $command_dir | cut -d':' -f2`
@@ -353,12 +342,6 @@ while read line; do
res_dir_used="$results_dir/$dir"
fi
if test "z$res_dir_used" != 'z' ; then
- # use a staging dir to be able to remove CVS directory
- rm -rf $staging_dir_res/$dir
- cp -pr "$res_dir_used" $staging_dir_res
- chmod -R u+w "$staging_dir_res/$dir"
- rm -rf $staging_dir_res$dir/CVS $staging_dir_res$dir/.svn
-
# store raw output
raw_outdir="$testdir/raw_out_parser${dir_suffix}/"
mkdir -p "${raw_outdir}"
@@ -369,7 +352,7 @@ while read line; do
test -d "$raw_outdir$dir" && rm -rf "$raw_outdir$dir"
# This directory isn't cleaned anywhere else.
- diff $DIFF_A_OPTION $DIFF_U_OPTION -r "${staging_dir_res}$dir" "${outdir}$dir" 2>>$logfile > "$testdir/$diffs_dir/$diff_base.diff"
+ diff $DIFF_A_OPTION $DIFF_U_OPTION -r "$res_dir_used" "${outdir}$dir" 2>>$logfile > "$testdir/$diffs_dir/$diff_base.diff"
dif_ret=$?
if [ $dif_ret != 0 ]; then
echo "D: $testdir/$diffs_dir/$diff_base.diff"
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/Makefile.am b/macros/texinfo/texinfo/tp/tests/sectioning/Makefile.am
index d6b642aece..c6df71d271 100644
--- a/macros/texinfo/texinfo/tp/tests/sectioning/Makefile.am
+++ b/macros/texinfo/texinfo/tp/tests/sectioning/Makefile.am
@@ -1,14 +1,12 @@
# sectioning/Makefile.am - public domain.
EXTRA_DIST = \
- equivalent_nodes.texi \
sectioning.texi \
\
- renamednodes.cnf-ref \
list-of-tests \
res_parser
-DISTCLEANFILES = tests.log tests.out equivalent_nodes-noderename.cnf
+DISTCLEANFILES = tests.log tests.out
distclean-local:
rm -rf out_parser diffs test_log
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/Makefile.in b/macros/texinfo/texinfo/tp/tests/sectioning/Makefile.in
index 054208c2d4..fa5666f5dd 100644
--- a/macros/texinfo/texinfo/tp/tests/sectioning/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/sectioning/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -278,6 +278,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -433,6 +434,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -500,11 +502,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -570,6 +574,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -590,6 +595,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -624,6 +630,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -638,6 +645,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -716,8 +724,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -733,14 +739,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -830,6 +835,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -863,6 +869,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -875,6 +882,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -893,6 +901,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -996,6 +1005,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1005,14 +1015,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
- equivalent_nodes.texi \
sectioning.texi \
\
- renamednodes.cnf-ref \
list-of-tests \
res_parser
-DISTCLEANFILES = tests.log tests.out equivalent_nodes-noderename.cnf
+DISTCLEANFILES = tests.log tests.out
all: all-am
.SUFFIXES:
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/equivalent_nodes.texi b/macros/texinfo/texinfo/tp/tests/sectioning/equivalent_nodes.texi
deleted file mode 100644
index 3e8d39ec2b..0000000000
--- a/macros/texinfo/texinfo/tp/tests/sectioning/equivalent_nodes.texi
+++ /dev/null
@@ -1,27 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@setfilename equivalent_nodes.info
-
-@node before top, @asis{node},,(dir)
-
-@node Top
-
-Equivalent nodes in node line and in menu.
-
-@menu
-* @strong{node}::
-@end menu
-
-@node node
-
-@float Figure, @samp{node}
-A figure
-@end float
-
-@listoffloats Figure
-
-Ref to node @ref{node}.
-
-Ref to @@samp@{node@} @ref{@samp{node}}.
-
-@bye
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/list-of-tests b/macros/texinfo/texinfo/tp/tests/sectioning/list-of-tests
index 3514a9dcc5..1cd160a1bf 100644
--- a/macros/texinfo/texinfo/tp/tests/sectioning/list-of-tests
+++ b/macros/texinfo/texinfo/tp/tests/sectioning/list-of-tests
@@ -1,4 +1,3 @@
# Public domain. Originally created by Patrice Dumas.
-equivalent_nodes_test_renamed_nodes equivalent_nodes.texi --init test_renamed_nodes.init
sectioning_directions sectioning.texi --init test_directions.init
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/renamednodes.cnf-ref b/macros/texinfo/texinfo/tp/tests/sectioning/renamednodes.cnf-ref
deleted file mode 100644
index 3ef4fd476f..0000000000
--- a/macros/texinfo/texinfo/tp/tests/sectioning/renamednodes.cnf-ref
+++ /dev/null
@@ -1,10 +0,0 @@
- @c a comment
-
-
-@code{a node beginning with @@c}
- old strong @strong{node}
- @@{} @strong{node}
-
-@@{} error here
-
-some node an error too
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/a-node-beginning-with-_0040c.html b/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/a-node-beginning-with-_0040c.html
deleted file mode 100644
index ea31d93e85..0000000000
--- a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/a-node-beginning-with-_0040c.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<!-- This file redirects to the location of a node or anchor -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>node (Untitled Document)</title>
-
-<meta name="description" content="node (Untitled Document)">
-<meta name="keywords" content="node (Untitled Document)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<style type="text/css">
-<!--
-a.summary-letter {text-decoration: none}
-blockquote.indentedblock {margin-right: 0em}
-div.display {margin-left: 3.2em}
-div.example {margin-left: 3.2em}
-div.lisp {margin-left: 3.2em}
-kbd {font-style: oblique}
-pre.display {font-family: inherit}
-pre.format {font-family: inherit}
-pre.menu-comment {font-family: serif}
-pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
-span.roman {font-family: initial; font-weight: normal}
-span.sansserif {font-family: sans-serif; font-weight: normal}
-ul.no-bullet {list-style: none}
--->
-</style>
-
-<meta http-equiv="Refresh" content="0; url=equivalent_nodes.html#node">
-
-</head>
-
-<body lang="en">
-
-<p>The node you are looking for is at <a href="equivalent_nodes.html#node">node</a>.</p>
-</body>
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.1 b/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.1
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.1
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 b/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
deleted file mode 100644
index 367d8916dc..0000000000
--- a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
+++ /dev/null
@@ -1,13 +0,0 @@
-equivalent_nodes.texi:17: @float `@samp{node}' previously defined
-equivalent_nodes.texi:15: here is the previous definition as @node
-equivalent_nodes.texi:25: warning: @ref to `@samp{node}', different from node name `node'
-equivalent_nodes.texi:12: warning: @menu entry node name `@strong{node}' different from node name `node'
-equivalent_nodes.texi:5: warning: Next pointer `@asis{node}' (for node `before top') different from node name `node'
-texi2any: warning: using a renamed nodes file (`equivalent_nodes-noderename.cnf') is deprecated
-equivalent_nodes-noderename.cnf:8: warning: no node to be renamed
-equivalent_nodes-noderename.cnf:10: warning: nodes without a new name at the end of file
-equivalent_nodes.texi: warning: must specify a title with a title command or @top
-equivalent_nodes-noderename.cnf: file empty for renamed node `@strong{}'
-equivalent_nodes-noderename.cnf: old name for `ToP' is a node of the document
-equivalent_nodes-noderename.cnf: old name for `Top' is a node of the document
-equivalent_nodes-noderename.cnf: warning: target node (new name for `old non existing') not in document: non existing file
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html b/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html
deleted file mode 100644
index a23f8e2188..0000000000
--- a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
-
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<style type="text/css">
-<!--
-a.summary-letter {text-decoration: none}
-blockquote.indentedblock {margin-right: 0em}
-div.display {margin-left: 3.2em}
-div.example {margin-left: 3.2em}
-div.lisp {margin-left: 3.2em}
-kbd {font-style: oblique}
-pre.display {font-family: inherit}
-pre.format {font-family: inherit}
-pre.menu-comment {font-family: serif}
-pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
-span.roman {font-family: initial; font-weight: normal}
-span.sansserif {font-family: sans-serif; font-weight: normal}
-ul.no-bullet {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-
-<span id="before-top"></span>
-<span id="Top"></span>
-<p>Equivalent nodes in node line and in menu.
-</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top">&bull; <a href="#node"><strong>node</strong></a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
-</td></tr>
-</table>
-
-<span id="node"></span>
-<div class="float">
-<p>A figure
-</p><div class="float-caption"><p><strong>Figure
-</strong></p></div></div>
-<dl class="listoffloats">
-</dl>
-
-<p>Ref to node <a href="#node">node</a>.
-</p>
-<p>Ref to @samp{node} <a href="#node">node</a>.
-</p>
-<hr>
-<p><font size="-1">
- This document was generated on <em>a sunny day</em> using <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
-</font></p>
-
-
-</body>
-</html>
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/old-node.html b/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/old-node.html
deleted file mode 100644
index ea31d93e85..0000000000
--- a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/old-node.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<!-- This file redirects to the location of a node or anchor -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>node (Untitled Document)</title>
-
-<meta name="description" content="node (Untitled Document)">
-<meta name="keywords" content="node (Untitled Document)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<style type="text/css">
-<!--
-a.summary-letter {text-decoration: none}
-blockquote.indentedblock {margin-right: 0em}
-div.display {margin-left: 3.2em}
-div.example {margin-left: 3.2em}
-div.lisp {margin-left: 3.2em}
-kbd {font-style: oblique}
-pre.display {font-family: inherit}
-pre.format {font-family: inherit}
-pre.menu-comment {font-family: serif}
-pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
-span.roman {font-family: initial; font-weight: normal}
-span.sansserif {font-family: sans-serif; font-weight: normal}
-ul.no-bullet {list-style: none}
--->
-</style>
-
-<meta http-equiv="Refresh" content="0; url=equivalent_nodes.html#node">
-
-</head>
-
-<body lang="en">
-
-<p>The node you are looking for is at <a href="equivalent_nodes.html#node">node</a>.</p>
-</body>
diff --git a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/old-strong-node.html b/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/old-strong-node.html
deleted file mode 100644
index ea31d93e85..0000000000
--- a/macros/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/old-strong-node.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<!-- This file redirects to the location of a node or anchor -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>node (Untitled Document)</title>
-
-<meta name="description" content="node (Untitled Document)">
-<meta name="keywords" content="node (Untitled Document)">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<style type="text/css">
-<!--
-a.summary-letter {text-decoration: none}
-blockquote.indentedblock {margin-right: 0em}
-div.display {margin-left: 3.2em}
-div.example {margin-left: 3.2em}
-div.lisp {margin-left: 3.2em}
-kbd {font-style: oblique}
-pre.display {font-family: inherit}
-pre.format {font-family: inherit}
-pre.menu-comment {font-family: serif}
-pre.menu-preformatted {font-family: serif}
-span.nolinebreak {white-space: nowrap}
-span.roman {font-family: initial; font-weight: normal}
-span.sansserif {font-family: sans-serif; font-weight: normal}
-ul.no-bullet {list-style: none}
--->
-</style>
-
-<meta http-equiv="Refresh" content="0; url=equivalent_nodes.html#node">
-
-</head>
-
-<body lang="en">
-
-<p>The node you are looking for is at <a href="equivalent_nodes.html#node">node</a>.</p>
-</body>
diff --git a/macros/texinfo/texinfo/tp/tests/t/stdout.sh b/macros/texinfo/texinfo/tp/tests/t/stdout.sh
deleted file mode 100644
index d33f69f39b..0000000000
--- a/macros/texinfo/texinfo/tp/tests/t/stdout.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-# Get error messages in English
-LC_ALL=C; export LC_ALL
-
-srcdir=${srcdir:-.}
-
-. ../defs || exit 1
-
-# to regenerate the reference:
-# ../texi2any.pl -o - --plaintext formatting/simplest.texi > reference/stdout.txt 2>&1
-
-$PERL -I ../../tp/Texinfo/Convert/XSParagraph $srcdir/../texi2any.pl -o - --plaintext $srcdir/formatting/simplest.texi 2>&1 | diff - $srcdir/reference/stdout.txt
-
diff --git a/macros/texinfo/texinfo/tp/tests/t/stdout_split.sh b/macros/texinfo/texinfo/tp/tests/t/stdout_split.sh
deleted file mode 100644
index e3160b43a8..0000000000
--- a/macros/texinfo/texinfo/tp/tests/t/stdout_split.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-# Get error messages in English
-LC_ALL=C; export LC_ALL
-
-srcdir=${srcdir:-.}
-
-. ../defs || exit 1
-
-# to regenerate the reference:
-# ../texi2any.pl -o - --plaintext --split chapter formatting/simplest.texi > reference/stdout_split.txt 2>&1
-
-$PERL -I ../../tp/Texinfo/Convert/XSParagraph $srcdir/../texi2any.pl -o - --plaintext --split chapter $srcdir/formatting/simplest.texi 2>&1 | diff - $srcdir/reference/stdout_split.txt
-
diff --git a/macros/texinfo/texinfo/tp/tests/test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh b/macros/texinfo/texinfo/tp/tests/test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh
deleted file mode 100644
index d5ea4bb432..0000000000
--- a/macros/texinfo/texinfo/tp/tests/test_scripts/sectioning_equivalent_nodes_test_renamed_nodes.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-# This file generated by maintain/regenerate_cmd_tests.sh
-
-if test z"$srcdir" = "z"; then
- srcdir=.
-fi
-
-one_test_logs_dir=test_log
-diffs_dir=diffs
-
-
-dir=sectioning
-name='equivalent_nodes_test_renamed_nodes'
-mkdir -p $dir
-
-"$srcdir"/run_parser_all.sh -dir $dir $name
-exit_status=$?
-cat $dir/$one_test_logs_dir/$name.log
-if test $exit_status = 0 && test -f $dir/$diffs_dir/$name.diff; then
- echo
- cat $dir/$diffs_dir/$name.diff
-fi
-exit $exit_status
-
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/Makefile.in b/macros/texinfo/texinfo/tp/tests/tex_html/Makefile.in
index eab2927d47..6b923c4106 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/Makefile.in
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -276,6 +276,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -431,6 +432,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -498,11 +500,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -568,6 +572,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -588,6 +593,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -622,6 +628,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -636,6 +643,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -714,8 +722,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -731,14 +737,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -828,6 +833,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -861,6 +867,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -873,6 +880,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -891,6 +899,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -994,6 +1003,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/list-of-tests b/macros/texinfo/texinfo/tp/tests/tex_html/list-of-tests
index 6e2fdff1b4..2dfb57f6ca 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/list-of-tests
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/list-of-tests
@@ -15,4 +15,4 @@ tex_complex_l2h tex_complex.texi -c 'L2H 1' --iftex
math_not_closed math_not_closed.texi -c 'L2H 1' --iftex
tex_not_closed tex_not_closed.texi -c 'L2H 1' --iftex
tex_in_copying tex_in_copying.texi -c 'L2H 1' --iftex
-formatting_singular ../layout/formatting.texi --init-file t2h_singular.init -c 'L2H 1' -c 'SHORTEXTN 1' -c 'PREFIX sing' -c 'TOP_FILE index.htm' --no-verbose
+formatting_singular ../layout/formatting.texi --init-file t2h_singular.init -c 'L2H 1' -c 'EXTENSION htm' -c 'PREFIX sing' -c 'TOP_FILE index.htm' --no-verbose
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.2 b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.2
index fee1fa3f22..1208b720c1 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.2
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.2
@@ -1,19 +1,19 @@
-block_EOL.texi:28: warning: @html should only appear at a line beginning
-block_EOL.texi:33: warning: @html should only appear at a line beginning
+block_EOL.texi:28: warning: @html should only appear at the beginning of a line
+block_EOL.texi:33: warning: @html should only appear at the beginning of a line
block_EOL.texi:35: superfluous argument to @end html: after the closing command.
-block_EOL.texi:37: warning: @html should only appear at a line beginning
-block_EOL.texi:42: warning: @html should only appear at a line beginning
+block_EOL.texi:37: warning: @html should only appear at the beginning of a line
+block_EOL.texi:42: warning: @html should only appear at the beginning of a line
block_EOL.texi:44: superfluous argument to @end html: . A symbol after the closing command.
-block_EOL.texi:58: warning: @tex should only appear at a line beginning
-block_EOL.texi:63: warning: @tex should only appear at a line beginning
+block_EOL.texi:58: warning: @tex should only appear at the beginning of a line
+block_EOL.texi:63: warning: @tex should only appear at the beginning of a line
block_EOL.texi:65: superfluous argument to @end tex: after the closing command.
-block_EOL.texi:67: warning: @tex should only appear at a line beginning
-block_EOL.texi:72: warning: @tex should only appear at a line beginning
+block_EOL.texi:67: warning: @tex should only appear at the beginning of a line
+block_EOL.texi:72: warning: @tex should only appear at the beginning of a line
block_EOL.texi:74: superfluous argument to @end tex: . A symbol after the closing command.
-block_EOL.texi:89: warning: @verbatim should only appear at a line beginning
-block_EOL.texi:94: warning: @verbatim should only appear at a line beginning
+block_EOL.texi:89: warning: @verbatim should only appear at the beginning of a line
+block_EOL.texi:94: warning: @verbatim should only appear at the beginning of a line
block_EOL.texi:96: warning: superfluous argument to @end verbatim: after the closing command.
-block_EOL.texi:98: warning: @verbatim should only appear at a line beginning
-block_EOL.texi:103: warning: @verbatim should only appear at a line beginning
+block_EOL.texi:98: warning: @verbatim should only appear at the beginning of a line
+block_EOL.texi:103: warning: @verbatim should only appear at the beginning of a line
block_EOL.texi:105: warning: superfluous argument to @end verbatim: . A symbol after the closing command.
texexpand
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
index ec8487ccf8..4a54f59edc 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Test for end of lines and block commands</title>
<meta name="description" content="Test for end of lines and block commands">
@@ -9,32 +10,21 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -42,32 +32,35 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<body lang="en">
-<a name="Top"></a>
-<a name="Test-for-end-of-lines-and-block-commands"></a>
-<h1 class="top">Test for end of lines and block commands</h1>
+<span id="Top"></span><span id="Test-for-end-of-lines-and-block-commands"></span><h1 class="top">Test for end of lines and block commands</h1>
-<a name="html"></a>
-<h2 class="heading">html</h2>
+<span id="html"></span><h2 class="heading">html</h2>
Surrounded by empty lines.
+
<p>Block commands on a line
in block
-in block l2end commands on a line.
+in block l2
+end commands on a line.
</p>
<p>Block commands on a line. A dot in the end of the block
in block
-in block l2.end commands on a line, after the block with a dot.
+in block l2.
+end commands on a line, after the block with a dot.
+</p>
+<p>Before the opening command in block
+end commands on a line.
+</p>
+<p>Before the opening command in block
</p>
-<p>Before the opening command in blockend commands on a line.
+<p>Before the opening command in block
+. A symbol on a line.
</p>
-<p>Before the opening command in block</p>
-<p>Before the opening command in block. A symbol on a line.
+<p>Before the opening command in block
</p>
-<p>Before the opening command in block</p>
-<a name="tex"></a>
-<h2 class="heading">tex</h2>
+<span id="tex"></span><h2 class="heading">tex</h2>
Surrounded by empty lines.
@@ -86,8 +79,7 @@ end commands on a line.
<p>Before the opening command in block
</p>
-<a name="verbatim"></a>
-<h2 class="heading">verbatim</h2>
+<span id="verbatim"></span><h2 class="heading">verbatim</h2>
<pre class="verbatim">Surrounded by empty lines.
</pre>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL_l2h.html
index 6da0b9de24..b8b0153f0c 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/block_EOL_tex/block_EOL_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>block_EOL_l2h</TITLE>
<META NAME="description" CONTENT="block_EOL_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="block_EOL_l2h.css">
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
index 59f354be61..e8fe0ffb99 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -595,39 +602,29 @@ truc: after a deff item
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<!-- This file redirects to the location of a node or anchor -->
<head>
-<title>title &ndash;a: anchor</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>anchor (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: anchor">
-<meta name="keywords" content="title &ndash;a: anchor">
+<meta name="description" content="anchor (title &ndash;a)">
+<meta name="keywords" content="anchor (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index d45f9c1e0d..e6980c0b03 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: 1 chapter</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1 chapter (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: 1 chapter">
-<meta name="keywords" content="title &ndash;a: 1 chapter">
+<meta name="description" content="1 chapter (title &ndash;a)">
+<meta name="keywords" content="1 chapter (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,8 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="chapter"></a>
-<table border="0" cellpadding="0" cellspacing="0">
+<span id="chapter"></span><table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -648,28 +644,28 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1 A section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -677,15 +673,15 @@ ul.no-bullet {list-style: none}
</table>
</td>
<td align="left">
-<a name="chapter-1"></a>
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
-<p><a name="DOCF9" href="sing_fot.htm#FOOT9"><sup>7</sup></a>
+<p><a id="DOCF9" href="sing_fot.htm#FOOT9"><sup>7</sup></a>
</p>
<div class="format">
<blockquote><table class="menu" border="0" cellspacing="0">
-<pre class="menu-preformatted">&bull; <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>:: s&ndash;ect,ion
+<pre class="menu-preformatted">&bull; <a href="s_002d_002dect_002cion.html">s--ect,ion</a>:: s&ndash;ect,ion
</pre><pre class="menu-comment">
+
Menu comment
&ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo;
@@ -702,14 +698,14 @@ Menu comment
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: Top section" align="middle"></a></td>
-<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1 A section" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: Top section" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index ffe87fb701..86e5902737 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: chapter 2</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>chapter 2 (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: chapter 2">
-<meta name="keywords" content="title &ndash;a: chapter 2">
+<meta name="description" content="chapter 2 (title &ndash;a)">
+<meta name="keywords" content="chapter 2 (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,8 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="chapter2"></a>
-<table border="0" cellpadding="0" cellspacing="0">
+<span id="chapter2"></span><table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -648,28 +644,28 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><img src="../singular_images/a_right_na.png" border="0" alt="Forward" align="middle"></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><img src="../singular_images/a_rightdouble_na.png" border="0" alt="FastForward" align="middle"></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -677,8 +673,7 @@ ul.no-bullet {list-style: none}
</table>
</td>
<td align="left">
-<a name="chapter-2"></a>
-<h1 class="centerchap" align="center">chapter 2</h1>
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 2</h1>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
&nbsp;
@@ -699,48 +694,48 @@ ul.no-bullet {list-style: none}
<table class="index-cp" border="0">
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_cp_symbol-1">&quot;</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_cp_symbol-1">&quot;</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_cp_symbol-2">-</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_cp_symbol-2">-</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_cp_symbol-3">.</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_cp_symbol-3">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_cp_symbol-4">?</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_cp_symbol-4">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_cp_letter-A">A</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_cp_letter-I">I</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_cp_letter-I">I</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_cp_letter-T">T</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_cp_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
@@ -788,190 +783,190 @@ ul.no-bullet {list-style: none}
<table class="index-fn" border="0">
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_symbol-1">-</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_symbol-1">-</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_symbol-2">.</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_symbol-2">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_symbol-3">?</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_symbol-3">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_symbol-4">`</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_symbol-4">`</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_letter-A">A</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_letter-B">B</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_letter-B">B</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_letter-D">D</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_letter-D">D</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_letter-F">F</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_letter-I">I</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_letter-I">I</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_letter-L">L</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_letter-L">L</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_letter-M">M</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_letter-M">M</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="chapter-2_fn_letter-T">T</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
-<tr><td></td><td valign="top"><a href="index.htm#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm#Top">Top section</a></td></tr>
+<tr><th id="chapter-2_fn_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_fn_symbol-1"><b>-</b></a>
@@ -1010,14 +1005,14 @@ ul.no-bullet {list-style: none}
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
<td valign="middle" align="left"><img src="../singular_images/a_right_na.png" border="0" alt="Forward" align="middle"></td>
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
<td valign="middle" align="left"><img src="../singular_images/a_rightdouble_na.png" border="0" alt="FastForward" align="middle"></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/formatting.2 b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
index 73d1423273..2683e8dda6 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/formatting.2
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
formatting.texi:25: warning: missing category for @deffnx (possibly involving @mymacro)
formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
@@ -21,6 +20,12 @@ formatting.texi:25: @dotless expects `i' or `j' as argument, not `truc' (possibl
formatting.texi:25: @dotless expects `i' or `j' as argument, not `ij' (possibly involving @mymacro)
formatting.texi:25: @dotless expects `i' or `j' as argument, not `--a' (possibly involving @mymacro)
formatting.texi:25: @dotless expects `i' or `j' as argument, not `a' (possibly involving @mymacro)
+formatting.texi:25: @U expected braces (possibly involving @mymacro)
+formatting.texi:25: warning: no argument specified for @U (possibly involving @mymacro)
+formatting.texi:25: non-hex digits in argument for @U: z (possibly involving @mymacro)
+formatting.texi:25: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
+formatting.texi:25: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
+formatting.texi:25: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
formatting.texi:25: @TeX expected braces (possibly involving @mymacro)
formatting.texi:25: unexpected @ (possibly involving @mymacro)
formatting.texi:25: @image missing filename argument (possibly involving @mymacro)
@@ -38,7 +43,6 @@ formatting.texi:25: warning: command @ref missing a node or external manual argu
formatting.texi:25: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
formatting.texi:25: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
formatting.texi:25: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
formatting.texi:35: warning: missing category for @deffnx (possibly involving @mymacro)
formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
@@ -61,6 +65,12 @@ formatting.texi:35: @dotless expects `i' or `j' as argument, not `truc' (possibl
formatting.texi:35: @dotless expects `i' or `j' as argument, not `ij' (possibly involving @mymacro)
formatting.texi:35: @dotless expects `i' or `j' as argument, not `--a' (possibly involving @mymacro)
formatting.texi:35: @dotless expects `i' or `j' as argument, not `a' (possibly involving @mymacro)
+formatting.texi:35: @U expected braces (possibly involving @mymacro)
+formatting.texi:35: warning: no argument specified for @U (possibly involving @mymacro)
+formatting.texi:35: non-hex digits in argument for @U: z (possibly involving @mymacro)
+formatting.texi:35: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
+formatting.texi:35: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
+formatting.texi:35: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
formatting.texi:35: @TeX expected braces (possibly involving @mymacro)
formatting.texi:35: unexpected @ (possibly involving @mymacro)
formatting.texi:35: @image missing filename argument (possibly involving @mymacro)
@@ -78,7 +88,6 @@ formatting.texi:35: warning: command @ref missing a node or external manual argu
formatting.texi:35: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
formatting.texi:35: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
formatting.texi:35: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
formatting.texi:45: warning: missing category for @deffnx (possibly involving @mymacro)
formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
@@ -101,6 +110,12 @@ formatting.texi:45: @dotless expects `i' or `j' as argument, not `truc' (possibl
formatting.texi:45: @dotless expects `i' or `j' as argument, not `ij' (possibly involving @mymacro)
formatting.texi:45: @dotless expects `i' or `j' as argument, not `--a' (possibly involving @mymacro)
formatting.texi:45: @dotless expects `i' or `j' as argument, not `a' (possibly involving @mymacro)
+formatting.texi:45: @U expected braces (possibly involving @mymacro)
+formatting.texi:45: warning: no argument specified for @U (possibly involving @mymacro)
+formatting.texi:45: non-hex digits in argument for @U: z (possibly involving @mymacro)
+formatting.texi:45: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
+formatting.texi:45: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
+formatting.texi:45: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
formatting.texi:45: @TeX expected braces (possibly involving @mymacro)
formatting.texi:45: unexpected @ (possibly involving @mymacro)
formatting.texi:45: @image missing filename argument (possibly involving @mymacro)
@@ -118,7 +133,6 @@ formatting.texi:45: warning: command @ref missing a node or external manual argu
formatting.texi:45: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
formatting.texi:45: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
formatting.texi:45: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
formatting.texi:49: warning: missing category for @deffnx (possibly involving @mymacro)
formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
@@ -141,6 +155,12 @@ formatting.texi:49: @dotless expects `i' or `j' as argument, not `truc' (possibl
formatting.texi:49: @dotless expects `i' or `j' as argument, not `ij' (possibly involving @mymacro)
formatting.texi:49: @dotless expects `i' or `j' as argument, not `--a' (possibly involving @mymacro)
formatting.texi:49: @dotless expects `i' or `j' as argument, not `a' (possibly involving @mymacro)
+formatting.texi:49: @U expected braces (possibly involving @mymacro)
+formatting.texi:49: warning: no argument specified for @U (possibly involving @mymacro)
+formatting.texi:49: non-hex digits in argument for @U: z (possibly involving @mymacro)
+formatting.texi:49: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
+formatting.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
+formatting.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
formatting.texi:49: @TeX expected braces (possibly involving @mymacro)
formatting.texi:49: unexpected @ (possibly involving @mymacro)
formatting.texi:49: @image missing filename argument (possibly involving @mymacro)
@@ -158,6 +178,7 @@ formatting.texi:49: warning: command @ref missing a node or external manual argu
formatting.texi:49: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
formatting.texi:49: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
formatting.texi:49: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:90: warning: @menu in invalid context
formatting.texi:25: @ref reference to nonexistent node `node' (possibly involving @mymacro)
formatting.texi:25: @ref reference to nonexistent node `node' (possibly involving @mymacro)
formatting.texi:25: @ref reference to nonexistent node `node' (possibly involving @mymacro)
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index 2f61d7f8de..7f5cea9ffb 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: Top section</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Top section (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: Top section">
-<meta name="keywords" content="title &ndash;a: Top section">
+<meta name="description" content="Top section (title &ndash;a)">
+<meta name="keywords" content="Top section (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -637,8 +634,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="Top"></a>
-<table border="0" cellpadding="0" cellspacing="0">
+<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -663,15 +659,15 @@ ul.no-bullet {list-style: none}
</table>
</td>
<td align="left">
-<a name="Top-section"></a>
-<h1 class="top">Top section</h1>
+<span id="Top-section"></span><h1 class="top">Top section</h1>
<blockquote><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="chapter.html#chapter">1 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="chapter.html">1 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
Menu comment
-</pre></th></tr><tr><td align="left" valign="top"><a href="chapter2.html#chapter2">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</pre></th></tr><tr><td align="left" valign="top"><a href="chapter2.html">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
</td></tr>
</table></blockquote>
@@ -696,10 +692,10 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
</p>
<p>&lsquo;<!-- /@w -->&lsquo;simple-double-<!-- /@w -->-three&mdash;four&mdash;-&rsquo;<!-- /@w -->&rsquo;<br>
</p>
-<a name="index-copying-_002d_002doption"></a>
-<a name="index-copying-_0060_0060"></a>
-<a name="index-copying-_0060_0060-1"></a>
-<a name="index-copying-_002d_002dfoption"></a>
+<span id="index-copying-_002d_002doption"></span>
+<span id="index-copying-_0060_0060"></span>
+<span id="index-copying-_0060_0060-1"></span>
+<span id="index-copying-_002d_002dfoption"></span>
<p>@&quot;u &uuml;
@&quot;{U} &Uuml;
@@ -718,6 +714,8 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
@,c &ccedil;
@,c@&quot;u &ccedil;&uuml; <br>
</p>
+<p>@U{0075} &#x0075;
+</p>
<p>@* <br>
@ followed by a space
&nbsp;
@@ -805,7 +803,6 @@ but , ,
<code>@cite{--a}</code> <cite>&ndash;a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
<code>@dfn{--a}</code> <em>&ndash;a</em>
<code>@dmn{--a}</code> &ndash;a
<code>@email{--a,--b}</code> <a href="mailto:--a">&ndash;b</a>
@@ -820,9 +817,7 @@ but , ,
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
$- -a {\frac{1}{2}} @minus{}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_2.svg"
ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
<code>@option{--a}</code> <samp>--a</samp>
<code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -868,13 +863,13 @@ but , ,
<code>@,{--c}</code> &ndash;c,
<code>@ogonek{a}</code> &#261;
<code>@ogonek{--a}</code> &ndash;a;
-<code>@footnote{in footnote}</code> <a name="DOCF1" href="sing_fot.htm#FOOT1"><sup>1</sup></a>
-<code>@footnote{in footnote2}</code> <a name="DOCF2" href="sing_fot.htm#FOOT2"><sup>2</sup></a>
+<code>@footnote{in footnote}</code> <a id="DOCF1" href="sing_fot.htm#FOOT1"><sup>1</sup></a>
+<code>@footnote{in footnote2}</code> <a id="DOCF2" href="sing_fot.htm#FOOT2"><sup>2</sup></a>
</p>
-<p><code>@image{f--ile}</code> <img src="f--ile.jpg" alt="f--ile">
-<code>@image{f--ile,l--i}</code> <img src="f--ile.jpg" alt="f--ile">
-<code>@image{f--ile,,l--e}</code> <img src="f--ile.jpg" alt="f--ile">
-<code>@image{f--ile,,,alt}</code> <img src="f--ile.jpg" alt="alt">
+<p><code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,,,alt}</code> <img src="f--ile.png" alt="alt">
<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.e--xt" alt="f--ile">
<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.e--xt" alt="alt">
<code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a&ndash;lt">
@@ -943,15 +938,15 @@ After clickstyle &rArr;
<blockquote>
</blockquote>
-<blockquote class="smallquotation">
+<blockquote>
<p>A small quot&mdash;ation
</p></blockquote>
-<blockquote class="smallquotation">
+<blockquote>
<p><b>Note:</b> A small Note
</p></blockquote>
-<blockquote class="smallquotation">
+<blockquote>
<p><b>something, other thing:</b> something, other thing
</p></blockquote>
@@ -980,7 +975,7 @@ After clickstyle &rArr;
</li></ul>
<ul class="no-bullet">
-<li>&bull; a&ndash;n itemize line <a name="index-copying-index-entry-within-itemize"></a>
+<li>&bull; a&ndash;n itemize line <span id="index-copying-index-entry-within-itemize"></span>
i&ndash;tem 1
</li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
</li></ul>
@@ -993,7 +988,7 @@ i&ndash;tem 1
<thead><tr><th width="40%">mu&ndash;ltitable headitem</th><th width="60%">another tab</th></tr></thead>
<tr><td width="40%">mu&ndash;ltitable item</td><td width="60%">multitable tab</td></tr>
<tr><td width="40%">mu&ndash;ltitable item 2</td><td width="60%">multitable tab 2
-<a name="index-copying-index-entry-within-multitable"></a></td></tr>
+<span id="index-copying-index-entry-within-multitable"></span></td></tr>
<tr><td width="40%">lone mu&ndash;ltitable item</td></tr>
</table>
@@ -1006,171 +1001,171 @@ i&ndash;tem 1
text
</pre></div>
-<div class="smallexample">
-<pre class="smallexample">s--mallexample
+<div class="example">
+<pre class="example">s--mallexample
</pre></div>
<div class="display">
<pre class="display">d&ndash;isplay
</pre></div>
-<div class="smalldisplay">
-<pre class="smalldisplay">s&ndash;malldisplay
+<div class="display">
+<pre class="display">s&ndash;malldisplay
</pre></div>
<div class="lisp">
<pre class="lisp">l--isp
</pre></div>
-<div class="smalllisp">
-<pre class="smalllisp">s--malllisp
+<div class="lisp">
+<pre class="lisp">s--malllisp
</pre></div>
<div class="format">
<pre class="format">f&ndash;ormat
</pre></div>
-<div class="smallformat">
-<pre class="smallformat">s&ndash;mallformat
+<div class="format">
+<pre class="format">s&ndash;mallformat
</pre></div>
<dl>
-<dt><a name="index-copying-d_002d_002deffn_005fname"></a>c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002deffn_005fname">c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;effn
</p></dd></dl>
<dl>
-<dt><a name="index-copying-de_002d_002dffn_005fname"></a>cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args <br> even more so</em></dt>
+<dt id="index-copying-de_002d_002dffn_005fname">cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args <br> even more so</em></dt>
<dd><p>def&ndash;fn
</p></dd></dl>
<dl>
-<dt><a name="index-copying-i"></a>fset: <strong><var>i</var></strong> <em>a g</em></dt>
-<dd><a name="index-copying-index-entry-within-deffn"></a>
-</dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
-<dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> <em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> <em> </em></dt>
-<dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> <em></em></dt>
-<dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
-<dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
+<dt id="index-copying-i">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dd><span id="index-copying-index-entry-within-deffn"></span>
+</dd><dt id="index-copying-truc">cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-copying-log-trap">Command: <strong>log trap</strong> <em></em></dt>
+<dt id="index-copying-log-trap1">Command: <strong>log trap1</strong> <em></em></dt>
+<dt id="index-copying-log-trap2">Command: <strong>log trap2</strong> <em></em></dt>
+<dt id="index-copying-id-ule">cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
+<dt id="index-copying-id-i-ule">cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
<dt><b>id &lsquo;<samp>i</samp>&rsquo; ule</b>: <strong></strong></dt>
<dt>: <strong></strong></dt>
<dt>aaa: <strong></strong></dt>
<dt>: <strong></strong></dt>
<dt>: <strong></strong></dt>
-<dt><a name="index-copying-machin"></a>: <strong>machin</strong></dt>
-<dt><a name="index-copying-bidule-machin"></a>: <strong>bidule machin</strong></dt>
-<dt><a name="index-copying-machin-1"></a>truc: <strong>machin</strong></dt>
+<dt id="index-copying-machin">: <strong>machin</strong></dt>
+<dt id="index-copying-bidule-machin">: <strong>bidule machin</strong></dt>
+<dt id="index-copying-machin-1">truc: <strong>machin</strong></dt>
<dt>truc: <strong></strong></dt>
-<dt><a name="index-copying-followed"></a>truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt id="index-copying-followed">truc: <strong>followed</strong> <em>by a comment</em></dt>
<dt>truc: <strong></strong></dt>
<dt>: <strong></strong></dt>
-<dt><a name="index-copying-a"></a>truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
-<dt><a name="index-copying-deffnx"></a>truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
+<dt id="index-copying-a">truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
+<dt id="index-copying-deffnx">truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
</dl>
<dl>
-<dt><a name="index-copying-deffn"></a>empty: <strong>deffn</strong></dt>
+<dt id="index-copying-deffn">empty: <strong>deffn</strong></dt>
</dl>
<dl>
-<dt><a name="index-copying-deffn-1"></a>empty: <strong>deffn</strong> <em>with deffnx</em></dt>
-<dt><a name="index-copying-deffnx-1"></a>empty: <strong>deffnx</strong></dt>
+<dt id="index-copying-deffn-1">empty: <strong>deffn</strong> <em>with deffnx</em></dt>
+<dt id="index-copying-deffnx-1">empty: <strong>deffnx</strong></dt>
</dl>
<dl>
-<dt><a name="index-copying-i-1"></a>fset: <strong><var>i</var></strong> <em>a g</em></dt>
-<dt><a name="index-copying-truc-1"></a>cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-copying-i-1">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dt id="index-copying-truc-1">cmde: <strong>truc</strong> <em></em></dt>
<dd><p>text in def item for second def item
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defvr_005fname"></a>c--ategory: <strong>d--efvr_name</strong></dt>
+<dt id="index-copying-d_002d_002defvr_005fname">c--ategory: <strong>d--efvr_name</strong></dt>
<dd><p>d&ndash;efvr
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002deftypefn_005fname"></a>c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002deftypefn_005fname">c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;eftypefn
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"></a>c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass">c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;eftypeop
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002deftypevr_005fname"></a>c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
+<dt id="index-copying-d_002d_002deftypevr_005fname">c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
<dd><p>d&ndash;eftypevr
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defcv_005fname"></a>c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
+<dt id="index-copying-d_002d_002defcv_005fname">c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
<dd><p>d&ndash;efcv
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"></a>c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass">c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efop
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002deftp_005fname"></a>c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
+<dt id="index-copying-d_002d_002deftp_005fname">c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
<dd><p>d&ndash;eftp
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defun_005fname"></a>Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002defun_005fname">Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efun
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defmac_005fname"></a>Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002defmac_005fname">Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efmac
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defspec_005fname"></a>Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002defspec_005fname">Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efspec
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defvar_005fname"></a>Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
+<dt id="index-copying-d_002d_002defvar_005fname">Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
<dd><p>d&ndash;efvar
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defopt_005fname"></a>User Option: <strong>d--efopt_name</strong></dt>
+<dt id="index-copying-d_002d_002defopt_005fname">User Option: <strong>d--efopt_name</strong></dt>
<dd><p>d&ndash;efopt
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002deftypefun_005fname"></a>Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002deftypefun_005fname">Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;eftypefun
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002deftypevar_005fname"></a>Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
+<dt id="index-copying-d_002d_002deftypevar_005fname">Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
<dd><p>d&ndash;eftypevar
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"></a>Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
+<dt id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass">Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
<dd><p>d&ndash;efivar
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"></a>Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
+<dt id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass">Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
<dd><p>d&ndash;eftypeivar
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"></a>Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass">Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efmethod
</p></dd></dl>
<dl>
-<dt><a name="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"></a>Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass">Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;eftypemethod
</p></dd></dl>
@@ -1179,20 +1174,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -1244,10 +1239,10 @@ ref</a>
<dl compact="compact">
<dt>a
-<a name="index-copying-a-2"></a>
+<span id="index-copying-a-2"></span>
</dt>
<dt>b
-<a name="index-copying-b-1"></a>
+<span id="index-copying-b-1"></span>
</dt>
<dd><p>l&ndash;ine
</p></dd>
@@ -1255,12 +1250,12 @@ ref</a>
<dl compact="compact">
<dt>a
-<a name="index-copying-a-1"></a>
+<span id="index-copying-a-1"></span>
</dt>
-<dd><a name="index-copying-index-entry-between-item-and-itemx"></a>
+<dd><span id="index-copying-index-entry-between-item-and-itemx"></span>
</dd>
<dt>b
-<a name="index-copying-b"></a>
+<span id="index-copying-b"></span>
</dt>
<dd><p>l&ndash;ine
</p></dd>
@@ -1292,37 +1287,32 @@ This is a very simple texi manual @ &lt;&gt;.
</pre>
html ''
+
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_t \eta (t) = g(\eta(t),\varphi(t))
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="sing_1.png"
+<IMG STYLE=""
+ SRC="sing_1.svg"
ALT="\begin{displaymath}\partial_t \eta (t) = g(\eta(t),\varphi(t))\end{displaymath}">
</DIV>
<BR CLEAR="ALL">
-<P></P> ''
+<P></P> &rdquo;
-<a name="majorheading"></a>
-<h1 class="majorheading">majorheading</h1>
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
-<a name="chapheading"></a>
-<h1 class="chapheading">chapheading</h1>
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
-<a name="heading"></a>
-<h2 class="heading">heading</h2>
+<span id="heading"></span><h2 class="heading">heading</h2>
-<a name="subheading"></a>
-<h3 class="subheading">subheading</h3>
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
-<a name="subsubheading"></a>
-<h4 class="subsubheading">subsubheading</h4>
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
<p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an accronym , ...">&ndash;a</acronym> (an accronym , <small class="enddots">...</small>)
@@ -1332,9 +1322,7 @@ html ''
<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <!-- MATH
$- -a@minus{} {\frac{1}{2}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
</p>
<p><code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img src="f-ile.jpg" alt="altjk _&quot; %@">
@@ -1359,6 +1347,12 @@ html ''
<code>@dotless{--a}</code> &ndash;a
<code>@dotless{a}</code> a
</p>
+<p>@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg &#xz;
+@U{abc}, with &lt;4 hex digits &#xabc;
+@U{FFFFFFFFFFFFFF}, value much too large &#xFFFFFFFFFFFFFF;
+@U{110000}, value just beyond Unicode &#x110000;
+</p>
<p>@TeX, but without brace TeX<code>@#</code> #
</p>
<p><code>@w{--a}</code> &ndash;a<!-- /@w -->
@@ -1379,13 +1373,13 @@ html ''
<dl>
<dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> <em>bidule chose and </em></dt>
-<dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
-<dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> <em>bidule chose and </em></dt>
-<dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
-<dt><a name="index-copying-followed-1"></a>truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt id="index-copying-machin-2">truc: <strong>machin</strong> <em>bidule chose and</em></dt>
+<dt id="index-copying-machin-3">truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
+<dt id="index-copying-machin-4">truc: <strong>machin</strong> <em>bidule chose and </em></dt>
+<dt id="index-copying-machin-5">truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
+<dt id="index-copying-followed-1">truc: <strong>followed</strong> <em>by a comment</em></dt>
<dd><p>Various deff lines
-</p></dd><dt><a name="index-copying-after"></a>truc: <strong>after</strong> <em>a deff item</em></dt>
+</p></dd><dt id="index-copying-after">truc: <strong>after</strong> <em>a deff item</em></dt>
</dl>
<p><code>@ref{node}</code> &lsquo;node&rsquo;
@@ -1427,7 +1421,6 @@ html ''
</p>
-
<p>Normal text
</p>
<p>&lt;
@@ -1445,10 +1438,10 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
</p>
<p>&lsquo;<!-- /@w -->&lsquo;simple-double-<!-- /@w -->-three&mdash;four&mdash;-&rsquo;<!-- /@w -->&rsquo;<br>
</p>
-<a name="index-_002d_002doption"></a>
-<a name="index-_0060_0060"></a>
-<a name="index-_0060_0060-2"></a>
-<a name="index-_002d_002dfoption"></a>
+<span id="index-_002d_002doption"></span>
+<span id="index-_0060_0060"></span>
+<span id="index-_0060_0060-2"></span>
+<span id="index-_002d_002dfoption"></span>
<p>@&quot;u &uuml;
@&quot;{U} &Uuml;
@@ -1467,6 +1460,8 @@ kbd: <kbd>``simple-double--three---four----''</kbd> <br>
@,c &ccedil;
@,c@&quot;u &ccedil;&uuml; <br>
</p>
+<p>@U{0075} &#x0075;
+</p>
<p>@* <br>
@ followed by a space
&nbsp;
@@ -1554,7 +1549,6 @@ but , ,
<code>@cite{--a}</code> <cite>&ndash;a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
<code>@dfn{--a}</code> <em>&ndash;a</em>
<code>@dmn{--a}</code> &ndash;a
<code>@email{--a,--b}</code> <a href="mailto:--a">&ndash;b</a>
@@ -1569,9 +1563,7 @@ but , ,
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
$- -a {\frac{1}{2}} @minus{}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_2.svg"
ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
<code>@option{--a}</code> <samp>--a</samp>
<code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1617,13 +1609,13 @@ but , ,
<code>@,{--c}</code> &ndash;c,
<code>@ogonek{a}</code> &#261;
<code>@ogonek{--a}</code> &ndash;a;
-<code>@footnote{in footnote}</code> <a name="DOCF5" href="sing_fot.htm#FOOT5"><sup>3</sup></a>
-<code>@footnote{in footnote2}</code> <a name="DOCF6" href="sing_fot.htm#FOOT6"><sup>4</sup></a>
+<code>@footnote{in footnote}</code> <a id="DOCF5" href="sing_fot.htm#FOOT5"><sup>3</sup></a>
+<code>@footnote{in footnote2}</code> <a id="DOCF6" href="sing_fot.htm#FOOT6"><sup>4</sup></a>
</p>
-<p><code>@image{f--ile}</code> <img src="f--ile.jpg" alt="f--ile">
-<code>@image{f--ile,l--i}</code> <img src="f--ile.jpg" alt="f--ile">
-<code>@image{f--ile,,l--e}</code> <img src="f--ile.jpg" alt="f--ile">
-<code>@image{f--ile,,,alt}</code> <img src="f--ile.jpg" alt="alt">
+<p><code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,,,alt}</code> <img src="f--ile.png" alt="alt">
<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.e--xt" alt="f--ile">
<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.e--xt" alt="alt">
<code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a&ndash;lt">
@@ -1692,15 +1684,15 @@ After clickstyle &rArr;
<blockquote>
</blockquote>
-<blockquote class="smallquotation">
+<blockquote>
<p>A small quot&mdash;ation
</p></blockquote>
-<blockquote class="smallquotation">
+<blockquote>
<p><b>Note:</b> A small Note
</p></blockquote>
-<blockquote class="smallquotation">
+<blockquote>
<p><b>something, other thing:</b> something, other thing
</p></blockquote>
@@ -1729,7 +1721,7 @@ After clickstyle &rArr;
</li></ul>
<ul class="no-bullet">
-<li>&bull; a&ndash;n itemize line <a name="index-index-entry-within-itemize"></a>
+<li>&bull; a&ndash;n itemize line <span id="index-index-entry-within-itemize"></span>
i&ndash;tem 1
</li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
</li></ul>
@@ -1742,7 +1734,7 @@ i&ndash;tem 1
<thead><tr><th width="40%">mu&ndash;ltitable headitem</th><th width="60%">another tab</th></tr></thead>
<tr><td width="40%">mu&ndash;ltitable item</td><td width="60%">multitable tab</td></tr>
<tr><td width="40%">mu&ndash;ltitable item 2</td><td width="60%">multitable tab 2
-<a name="index-index-entry-within-multitable"></a></td></tr>
+<span id="index-index-entry-within-multitable"></span></td></tr>
<tr><td width="40%">lone mu&ndash;ltitable item</td></tr>
</table>
@@ -1755,171 +1747,171 @@ i&ndash;tem 1
text
</pre></div>
-<div class="smallexample">
-<pre class="smallexample">s--mallexample
+<div class="example">
+<pre class="example">s--mallexample
</pre></div>
<div class="display">
<pre class="display">d&ndash;isplay
</pre></div>
-<div class="smalldisplay">
-<pre class="smalldisplay">s&ndash;malldisplay
+<div class="display">
+<pre class="display">s&ndash;malldisplay
</pre></div>
<div class="lisp">
<pre class="lisp">l--isp
</pre></div>
-<div class="smalllisp">
-<pre class="smalllisp">s--malllisp
+<div class="lisp">
+<pre class="lisp">s--malllisp
</pre></div>
<div class="format">
<pre class="format">f&ndash;ormat
</pre></div>
-<div class="smallformat">
-<pre class="smallformat">s&ndash;mallformat
+<div class="format">
+<pre class="format">s&ndash;mallformat
</pre></div>
<dl>
-<dt><a name="index-d_002d_002deffn_005fname"></a>c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deffn_005fname">c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;effn
</p></dd></dl>
<dl>
-<dt><a name="index-de_002d_002dffn_005fname"></a>cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args <br> even more so</em></dt>
+<dt id="index-de_002d_002dffn_005fname">cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args <br> even more so</em></dt>
<dd><p>def&ndash;fn
</p></dd></dl>
<dl>
-<dt><a name="index-i"></a>fset: <strong><var>i</var></strong> <em>a g</em></dt>
-<dd><a name="index-index-entry-within-deffn"></a>
-</dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
-<dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> <em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em> </em></dt>
-<dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> <em></em></dt>
-<dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
-<dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
+<dt id="index-i">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dd><span id="index-index-entry-within-deffn"></span>
+</dd><dt id="index-truc">cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-log-trap">Command: <strong>log trap</strong> <em></em></dt>
+<dt id="index-log-trap1">Command: <strong>log trap1</strong> <em></em></dt>
+<dt id="index-log-trap2">Command: <strong>log trap2</strong> <em></em></dt>
+<dt id="index-id-ule">cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
+<dt id="index-id-i-ule">cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
<dt><b>id &lsquo;<samp>i</samp>&rsquo; ule</b>: <strong></strong></dt>
<dt>: <strong></strong></dt>
<dt>aaa: <strong></strong></dt>
<dt>: <strong></strong></dt>
<dt>: <strong></strong></dt>
-<dt><a name="index-machin"></a>: <strong>machin</strong></dt>
-<dt><a name="index-bidule-machin"></a>: <strong>bidule machin</strong></dt>
-<dt><a name="index-machin-1"></a>truc: <strong>machin</strong></dt>
+<dt id="index-machin">: <strong>machin</strong></dt>
+<dt id="index-bidule-machin">: <strong>bidule machin</strong></dt>
+<dt id="index-machin-1">truc: <strong>machin</strong></dt>
<dt>truc: <strong></strong></dt>
-<dt><a name="index-followed"></a>truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt id="index-followed">truc: <strong>followed</strong> <em>by a comment</em></dt>
<dt>truc: <strong></strong></dt>
<dt>: <strong></strong></dt>
-<dt><a name="index-a-1"></a>truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
-<dt><a name="index-deffnx"></a>truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
+<dt id="index-a-1">truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
+<dt id="index-deffnx">truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
</dl>
<dl>
-<dt><a name="index-deffn"></a>empty: <strong>deffn</strong></dt>
+<dt id="index-deffn">empty: <strong>deffn</strong></dt>
</dl>
<dl>
-<dt><a name="index-deffn-1"></a>empty: <strong>deffn</strong> <em>with deffnx</em></dt>
-<dt><a name="index-deffnx-1"></a>empty: <strong>deffnx</strong></dt>
+<dt id="index-deffn-1">empty: <strong>deffn</strong> <em>with deffnx</em></dt>
+<dt id="index-deffnx-1">empty: <strong>deffnx</strong></dt>
</dl>
<dl>
-<dt><a name="index-i-1"></a>fset: <strong><var>i</var></strong> <em>a g</em></dt>
-<dt><a name="index-truc-1"></a>cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-i-1">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dt id="index-truc-1">cmde: <strong>truc</strong> <em></em></dt>
<dd><p>text in def item for second def item
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defvr_005fname"></a>c--ategory: <strong>d--efvr_name</strong></dt>
+<dt id="index-d_002d_002defvr_005fname">c--ategory: <strong>d--efvr_name</strong></dt>
<dd><p>d&ndash;efvr
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002deftypefn_005fname"></a>c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deftypefn_005fname">c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;eftypefn
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"></a>c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass">c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;eftypeop
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002deftypevr_005fname"></a>c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
+<dt id="index-d_002d_002deftypevr_005fname">c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
<dd><p>d&ndash;eftypevr
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defcv_005fname"></a>c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
+<dt id="index-d_002d_002defcv_005fname">c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
<dd><p>d&ndash;efcv
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defop_005fname-on-c_002d_002dlass"></a>c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defop_005fname-on-c_002d_002dlass">c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efop
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002deftp_005fname"></a>c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
+<dt id="index-d_002d_002deftp_005fname">c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
<dd><p>d&ndash;eftp
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defun_005fname"></a>Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defun_005fname">Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efun
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defmac_005fname"></a>Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defmac_005fname">Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efmac
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defspec_005fname"></a>Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defspec_005fname">Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efspec
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defvar_005fname"></a>Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
+<dt id="index-d_002d_002defvar_005fname">Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
<dd><p>d&ndash;efvar
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defopt_005fname"></a>User Option: <strong>d--efopt_name</strong></dt>
+<dt id="index-d_002d_002defopt_005fname">User Option: <strong>d--efopt_name</strong></dt>
<dd><p>d&ndash;efopt
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002deftypefun_005fname"></a>Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deftypefun_005fname">Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;eftypefun
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002deftypevar_005fname"></a>Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
+<dt id="index-d_002d_002deftypevar_005fname">Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
<dd><p>d&ndash;eftypevar
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defivar_005fname-of-c_002d_002dlass"></a>Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
+<dt id="index-d_002d_002defivar_005fname-of-c_002d_002dlass">Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
<dd><p>d&ndash;efivar
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"></a>Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
+<dt id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass">Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
<dd><p>d&ndash;eftypeivar
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002defmethod_005fname-on-c_002d_002dlass"></a>Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass">Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;efmethod
</p></dd></dl>
<dl>
-<dt><a name="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"></a>Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass">Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
<dd><p>d&ndash;eftypemethod
</p></dd></dl>
@@ -1928,20 +1920,20 @@ i&ndash;tem 1
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
</p>
-<p><code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
</p>
<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
</p>
-<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -1993,10 +1985,10 @@ ref</a>
<dl compact="compact">
<dt>a
-<a name="index-a-6"></a>
+<span id="index-a-6"></span>
</dt>
<dt>b
-<a name="index-b-2"></a>
+<span id="index-b-2"></span>
</dt>
<dd><p>l&ndash;ine
</p></dd>
@@ -2004,12 +1996,12 @@ ref</a>
<dl compact="compact">
<dt>a
-<a name="index-a-2"></a>
+<span id="index-a-2"></span>
</dt>
-<dd><a name="index-index-entry-between-item-and-itemx"></a>
+<dd><span id="index-index-entry-between-item-and-itemx"></span>
</dd>
<dt>b
-<a name="index-b"></a>
+<span id="index-b"></span>
</dt>
<dd><p>l&ndash;ine
</p></dd>
@@ -2041,37 +2033,32 @@ This is a very simple texi manual @ &lt;&gt;.
</pre>
html ''
+
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_t \eta (t) = g(\eta(t),\varphi(t))
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="sing_1.png"
+<IMG STYLE=""
+ SRC="sing_1.svg"
ALT="\begin{displaymath}\partial_t \eta (t) = g(\eta(t),\varphi(t))\end{displaymath}">
</DIV>
<BR CLEAR="ALL">
-<P></P> ''
+<P></P> &rdquo;
-<a name="majorheading-1"></a>
-<h1 class="majorheading">majorheading</h1>
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
-<a name="chapheading-1"></a>
-<h1 class="chapheading">chapheading</h1>
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
-<a name="heading-1"></a>
-<h2 class="heading">heading</h2>
+<span id="heading-1"></span><h2 class="heading">heading</h2>
-<a name="subheading-1"></a>
-<h3 class="subheading">subheading</h3>
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
-<a name="subsubheading-1"></a>
-<h4 class="subsubheading">subsubheading</h4>
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
<p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an accronym , ...">&ndash;a</acronym> (an accronym , <small class="enddots">...</small>)
@@ -2081,9 +2068,7 @@ html ''
<p><code>@math{--a@minus{} {\frac{1}{2}}}</code> <!-- MATH
$- -a@minus{} {\frac{1}{2}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
</p>
<p><code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img src="f-ile.jpg" alt="altjk _&quot; %@">
@@ -2108,6 +2093,12 @@ html ''
<code>@dotless{--a}</code> &ndash;a
<code>@dotless{a}</code> a
</p>
+<p>@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg &#xz;
+@U{abc}, with &lt;4 hex digits &#xabc;
+@U{FFFFFFFFFFFFFF}, value much too large &#xFFFFFFFFFFFFFF;
+@U{110000}, value just beyond Unicode &#x110000;
+</p>
<p>@TeX, but without brace TeX<code>@#</code> #
</p>
<p><code>@w{--a}</code> &ndash;a<!-- /@w -->
@@ -2128,13 +2119,13 @@ html ''
<dl>
<dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule chose and </em></dt>
-<dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
-<dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule chose and </em></dt>
-<dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
-<dt><a name="index-followed-1"></a>truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt id="index-machin-2">truc: <strong>machin</strong> <em>bidule chose and</em></dt>
+<dt id="index-machin-3">truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
+<dt id="index-machin-4">truc: <strong>machin</strong> <em>bidule chose and </em></dt>
+<dt id="index-machin-5">truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
+<dt id="index-followed-1">truc: <strong>followed</strong> <em>by a comment</em></dt>
<dd><p>Various deff lines
-</p></dd><dt><a name="index-after"></a>truc: <strong>after</strong> <em>a deff item</em></dt>
+</p></dd><dt id="index-after">truc: <strong>after</strong> <em>a deff item</em></dt>
</dl>
<p><code>@ref{node}</code> &lsquo;node&rsquo;
@@ -2179,6 +2170,7 @@ html ''
<p>In example.
</p><div class="example">
<pre class="example">
+
&lt;
&gt;
&quot;
@@ -2200,7 +2192,7 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
-<a name="index-_002d_002doption-1"></a><a name="index-_0060_0060-1"></a><a name="index-_0060_0060-3"></a><a name="index-_002d_002dfoption-1"></a>
+<span id="index-_002d_002doption-1"></span><span id="index-_0060_0060-1"></span><span id="index-_0060_0060-3"></span><span id="index-_002d_002dfoption-1"></span>
@&quot;u &uuml;
@&quot;{U} &Uuml;
@~n &ntilde;
@@ -2219,6 +2211,8 @@ kbd: <kbd>``simple-double--three---four----''</kbd>
@,c@&quot;u &ccedil;&uuml;
+@U{0075} &#x0075;
+
@*
@ followed by a space
@@ -2307,7 +2301,6 @@ but , ,
<code>@cite{--a}</code> <cite>--a</cite>
<code>@code{--a}</code> <code>--a</code>
<code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
<code>@dfn{--a}</code> <em>--a</em>
<code>@dmn{--a}</code> --a
<code>@email{--a,--b}</code> <a href="mailto:--a">--b</a>
@@ -2322,9 +2315,7 @@ but , ,
<code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
$- -a {\frac{1}{2}} @minus{}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_2.svg"
ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
<code>@option{--a}</code> <samp>--a</samp>
<code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2335,6 +2326,7 @@ but , ,
<code>@sansserif{--a}</code> <span class="sansserif">&ndash;a</span>
<code>@slanted{--a}</code> <i>&ndash;a</i>
<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre class="example">
+
<code>@indicateurl{--a}</code> &lsquo;<code>--a</code>&rsquo;
<code>@uref{--a,--b}</code> <a href="--a">--b</a>
<code>@uref{--a}</code> <a href="--a">--a</a>
@@ -2370,8 +2362,8 @@ but , ,
<code>@,{--c}</code> --c,
<code>@ogonek{a}</code> &#261;
<code>@ogonek{--a}</code> --a;
-<code>@footnote{in footnote}</code> <a name="DOCF7" href="sing_fot.htm#FOOT7">(5)</a>
-<code>@footnote{in footnote2}</code> <a name="DOCF8" href="sing_fot.htm#FOOT8">(6)</a>
+<code>@footnote{in footnote}</code> <a id="DOCF7" href="sing_fot.htm#FOOT7">(5)</a>
+<code>@footnote{in footnote2}</code> <a id="DOCF8" href="sing_fot.htm#FOOT8">(6)</a>
<code>@image{f--ile}</code> [ f--ile ]
<code>@image{f--ile,l--i}</code> [ f--ile ]
@@ -2393,307 +2385,366 @@ After clickstyle &rArr;
<pre class="example">A quot---ation
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>Note:</b> A Note
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>note:</b> A note
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>Caution:</b> Caution
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>Important:</b> Important
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>Tip:</b> a Tip
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>Warning:</b> a Warning.
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>something &eacute; TeX:</b> The something &eacute; TeX is here.
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>@ at the end of line &nbsp;:</b> A @ at the end of the @quotation line.
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>something, other thing:</b> something, other thing
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
<pre class="example"><b>Note, the note:</b> Note, the note
</pre></blockquote>
<pre class="example">
+
</pre><blockquote>
</blockquote>
<pre class="example">
+
</pre><blockquote>
</blockquote>
<pre class="example">
+
</pre><blockquote>
</blockquote>
<pre class="example">
+
</pre><blockquote>
</blockquote>
<pre class="example">
-</pre><blockquote class="smallquotation">
+
+</pre><blockquote>
<pre class="example">A small quot---ation
</pre></blockquote>
<pre class="example">
-</pre><blockquote class="smallquotation">
+
+</pre><blockquote>
<pre class="example"><b>Note:</b> A small Note
</pre></blockquote>
<pre class="example">
-</pre><blockquote class="smallquotation">
+
+</pre><blockquote>
<pre class="example"><b>something, other thing:</b> something, other thing
</pre></blockquote>
<pre class="example">
+
</pre><ul>
<li> <pre class="example">i--temize
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
<li>+ <pre class="example">i--tem +
</pre></li></ul>
<pre class="example">
+
</pre><ul>
<li> <pre class="example">b--ullet
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
<li>- <pre class="example">minu--s
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
<li> <pre class="example">e--mph item
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
<li><em>after emph</em> <pre class="example">e--mph item
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
-<li>&bull; a&ndash;n itemize line <pre class="example"><a name="index-index-entry-within-itemize-1"></a>i--tem 1
+<li>&bull; a&ndash;n itemize line <pre class="example"><span id="index-index-entry-within-itemize-1"></span>i--tem 1
</pre></li><li>&bull; a&ndash;n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
+
</pre><ol>
<li> <pre class="example">e--numerate
</pre></li></ol>
<pre class="example">
+
</pre><table>
<thead><tr><th width="40%"><pre class="example">mu--ltitable headitem</pre></th><th width="60%"><pre class="example">another tab</pre></th></tr></thead>
<tr><td width="40%"><pre class="example">mu--ltitable item</pre></td><td width="60%"><pre class="example">multitable tab</pre></td></tr>
<tr><td width="40%"><pre class="example">mu--ltitable item 2</pre></td><td width="60%"><pre class="example">multitable tab 2
-<a name="index-index-entry-within-multitable-1"></a></pre></td></tr>
+<span id="index-index-entry-within-multitable-1"></span></pre></td></tr>
<tr><td width="40%"><pre class="example">lone mu--ltitable item</pre></td></tr>
</table>
<pre class="example">
+
</pre><table>
<tr><td><pre class="example">truc</pre></td><td><pre class="example">bidule</pre></td></tr>
</table>
<pre class="example">
+
</pre><div class="example">
<pre class="example">e--xample some
text
</pre></div>
<pre class="example">
-</pre><div class="smallexample">
-<pre class="smallexample">s--mallexample
+
+</pre><div class="example">
+<pre class="example">s--mallexample
</pre></div>
<pre class="example">
+
</pre><div class="display">
<pre class="example">d--isplay
</pre></div>
<pre class="example">
-</pre><div class="smalldisplay">
+
+</pre><div class="display">
<pre class="example">s--malldisplay
</pre></div>
<pre class="example">
+
</pre><div class="lisp">
<pre class="lisp">l--isp
</pre></div>
<pre class="example">
-</pre><div class="smalllisp">
-<pre class="smalllisp">s--malllisp
+
+</pre><div class="lisp">
+<pre class="lisp">s--malllisp
</pre></div>
<pre class="example">
+
</pre><div class="format">
<pre class="example">f--ormat
</pre></div>
<pre class="example">
-</pre><div class="smallformat">
+
+</pre><div class="format">
<pre class="example">s--mallformat
</pre></div>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deffn_005fname-1"></a>c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deffn_005fname-1">c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--effn
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-de_002d_002dffn_005fname-1"></a>cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args
+<dt id="index-de_002d_002dffn_005fname-1">cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args
even more so</em></dt>
<dd><pre class="example">def--fn
</pre></dd></dl>
<pre class="example">
</pre><dl>
-<dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a g</em></dt>
-<dd><pre class="example"><a name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
-<dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> <em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em> </em></dt>
-<dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> <em></em></dt>
-<dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
-<dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
+<dt id="index-i-2">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dd><pre class="example"><span id="index-index-entry-within-deffn-1"></span></pre></dd><dt id="index-truc-2">cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-log-trap-1">Command: <strong>log trap</strong> <em></em></dt>
+<dt id="index-log-trap1-1">Command: <strong>log trap1</strong> <em></em></dt>
+<dt id="index-log-trap2-1">Command: <strong>log trap2</strong> <em></em></dt>
+<dt id="index-id-ule-1">cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
+<dt id="index-id-i-ule-1">cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
<dt><b>id &lsquo;<samp>i</samp>&rsquo; ule</b>: <strong></strong></dt>
<dt>: <strong></strong></dt>
<dt>aaa: <strong></strong></dt>
<dt>: <strong></strong></dt>
<dt>: <strong></strong></dt>
-<dt><a name="index-machin-6"></a>: <strong>machin</strong></dt>
-<dt><a name="index-bidule-machin-1"></a>: <strong>bidule machin</strong></dt>
-<dt><a name="index-machin-7"></a>truc: <strong>machin</strong></dt>
+<dt id="index-machin-6">: <strong>machin</strong></dt>
+<dt id="index-bidule-machin-1">: <strong>bidule machin</strong></dt>
+<dt id="index-machin-7">truc: <strong>machin</strong></dt>
<dt>truc: <strong></strong></dt>
-<dt><a name="index-followed-2"></a>truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt id="index-followed-2">truc: <strong>followed</strong> <em>by a comment</em></dt>
<dt>truc: <strong></strong></dt>
<dt>: <strong></strong></dt>
-<dt><a name="index-a-3"></a>truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
-<dt><a name="index-deffnx-2"></a>truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
+<dt id="index-a-3">truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
+<dt id="index-deffnx-2">truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
</dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-deffn-2"></a>empty: <strong>deffn</strong></dt>
+<dt id="index-deffn-2">empty: <strong>deffn</strong></dt>
</dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-deffn-3"></a>empty: <strong>deffn</strong> <em>with deffnx</em></dt>
-<dt><a name="index-deffnx-3"></a>empty: <strong>deffnx</strong></dt>
+<dt id="index-deffn-3">empty: <strong>deffn</strong> <em>with deffnx</em></dt>
+<dt id="index-deffnx-3">empty: <strong>deffnx</strong></dt>
</dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-i-3"></a>fset: <strong><var>i</var></strong> <em>a g</em></dt>
-<dt><a name="index-truc-3"></a>cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-i-3">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dt id="index-truc-3">cmde: <strong>truc</strong> <em></em></dt>
<dd><pre class="example">text in def item for second def item
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defvr_005fname-1"></a>c--ategory: <strong>d--efvr_name</strong></dt>
+<dt id="index-d_002d_002defvr_005fname-1">c--ategory: <strong>d--efvr_name</strong></dt>
<dd><pre class="example">d--efvr
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deftypefn_005fname-1"></a>c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deftypefn_005fname-1">c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--eftypefn
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"></a>c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1">c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--eftypeop
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deftypevr_005fname-1"></a>c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
+<dt id="index-d_002d_002deftypevr_005fname-1">c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
<dd><pre class="example">d--eftypevr
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defcv_005fname-1"></a>c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
+<dt id="index-d_002d_002defcv_005fname-1">c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
<dd><pre class="example">d--efcv
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defop_005fname-on-c_002d_002dlass-1"></a>c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defop_005fname-on-c_002d_002dlass-1">c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--efop
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deftp_005fname-1"></a>c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
+<dt id="index-d_002d_002deftp_005fname-1">c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
<dd><pre class="example">d--eftp
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defun_005fname-1"></a>Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defun_005fname-1">Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--efun
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defmac_005fname-1"></a>Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defmac_005fname-1">Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--efmac
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defspec_005fname-1"></a>Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defspec_005fname-1">Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--efspec
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defvar_005fname-1"></a>Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
+<dt id="index-d_002d_002defvar_005fname-1">Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
<dd><pre class="example">d--efvar
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defopt_005fname-1"></a>User Option: <strong>d--efopt_name</strong></dt>
+<dt id="index-d_002d_002defopt_005fname-1">User Option: <strong>d--efopt_name</strong></dt>
<dd><pre class="example">d--efopt
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deftypefun_005fname-1"></a>Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deftypefun_005fname-1">Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--eftypefun
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deftypevar_005fname-1"></a>Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
+<dt id="index-d_002d_002deftypevar_005fname-1">Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
<dd><pre class="example">d--eftypevar
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1"></a>Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
+<dt id="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1">Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
<dd><pre class="example">d--efivar
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1"></a>Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
+<dt id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1">Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
<dd><pre class="example">d--eftypeivar
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"></a>Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1">Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--efmethod
</pre></dd></dl>
<pre class="example">
+
</pre><dl>
-<dt><a name="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"></a>Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
+<dt id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1">Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
<dd><pre class="example">d--eftypemethod
</pre></dd></dl>
<pre class="example">
+
<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}</code> See <a href="../file n---ame@/c_002d_002d_002dhapter_0040.html#c_002d_002d_002dhapter_0040">t---itle@</a> in <cite>ma---nual@</cite>.
<code>@ref{chapter, cross ref name, title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
-<code>@ref{chapter}</code> <a href="chapter.html#chapter">chapter</a>
-<code>@xref{chapter}</code> See section <a href="chapter.html#chapter">chapter</a>.
-<code>@pxref{chapter}</code> see section <a href="chapter.html#chapter">chapter</a>
-<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">s--ect,ion</a>
+<code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
<code>@ref{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
-<code>@ref{chapter,cross ref name}</code> <a href="chapter.html#chapter">cross ref name</a>
-<code>@ref{chapter,,title}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
<code>@ref{chapter,,,,manual}</code> `chapter' in <cite>manual</cite>
-<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html#chapter">title</a>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
<code>@ref{chapter,cross ref name,,,manual}</code> `cross ref name' in <cite>manual</cite>
<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
@@ -2743,41 +2794,49 @@ ref</a>
</pre></dd>
</dl>
<pre class="example">
+
</pre><dl compact="compact">
<dt><tt>a</tt>
-<a name="index-a-7"></a>
+<span id="index-a-7"></span>
</dt>
<dt><tt>b</tt>
-<a name="index-b-3"></a>
+<span id="index-b-3"></span>
</dt>
<dd><pre class="example">l--ine
</pre></dd>
</dl>
<pre class="example">
+
</pre><dl compact="compact">
<dt><tt>a</tt>
-<a name="index-a-4"></a>
+<span id="index-a-4"></span>
</dt>
-<dd><pre class="example"><a name="index-index-entry-between-item-and-itemx-1"></a></pre></dd>
+<dd><pre class="example"><span id="index-index-entry-between-item-and-itemx-1"></span></pre></dd>
<dt><tt>b</tt>
-<a name="index-b-1"></a>
+<span id="index-b-1"></span>
</dt>
<dd><pre class="example">l--ine
</pre></dd>
</dl>
<pre class="example">
+
</pre><table class="cartouche" border="1"><tr><td>
<pre class="example">c--artouche
</pre></td></tr></table>
<pre class="example">
+
</pre><pre class="example">g--roupe
</pre><pre class="example">
+
</pre><pre class="example">f--lushleft
</pre><pre class="example">
+
</pre><pre class="example">f--lushright
</pre><pre class="example">
+
</pre><div align="center">ce--ntered line
</div><pre class="example">
+
</pre><pre class="verbatim">\input texinfo @c -*-texinfo-*-
@setfilename simplest.info
@@ -2788,43 +2847,45 @@ This is a very simple texi manual @ &lt;&gt;.
@bye
</pre><pre class="example">
+
</pre><pre class="verbatim">in verbatim ''
</pre><pre class="example">
+
html ''
+
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_t \eta (t) = g(\eta(t),\varphi(t))
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="sing_1.png"
+<IMG STYLE=""
+ SRC="sing_1.svg"
ALT="\begin{displaymath}\partial_t \eta (t) = g(\eta(t),\varphi(t))\end{displaymath}">
</DIV>
<BR CLEAR="ALL">
-<P></P> ''
+<P></P> &rdquo;
-</pre><a name="majorheading-2"></a>
-<strong>majorheading</strong>
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
<pre class="example">
-</pre><a name="chapheading-2"></a>
-<strong>chapheading</strong>
+
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
<pre class="example">
-</pre><a name="heading-2"></a>
-<strong>heading</strong>
+
+</pre><span id="heading-2"></span><strong>heading</strong>
<pre class="example">
-</pre><a name="subheading-2"></a>
-<strong>subheading</strong>
+
+</pre><span id="subheading-2"></span><strong>subheading</strong>
<pre class="example">
-</pre><a name="subsubheading-2"></a>
-<strong>subsubheading</strong>
+
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
<pre class="example">
+
<code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an accronym , ...">--a</acronym> (an accronym , ...)
<code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude--, <b>Autonome</b>)
<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
@@ -2832,9 +2893,7 @@ html ''
<code>@math{--a@minus{} {\frac{1}{2}}}</code> <!-- MATH
$- -a@minus{} {\frac{1}{2}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
<code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> [ alt<tt>jk _&quot; %@</tt> ]
@@ -2863,6 +2922,12 @@ Invalid use of @':
<code>@dotless{--a}</code> --a
<code>@dotless{a}</code> a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg &#xz;
+@U{abc}, with &lt;4 hex digits &#xabc;
+@U{FFFFFFFFFFFFFF}, value much too large &#xFFFFFFFFFFFFFF;
+@U{110000}, value just beyond Unicode &#x110000;
+
@TeX, but without brace TeX<code>@#</code> #
<code>@w{--a}</code> --a<!-- /@w -->
@@ -2876,22 +2941,25 @@ Invalid use of @':
<li> after emph <pre class="example">e--mph item
</pre></li></ul>
<pre class="example">
+
</pre><ul class="no-bullet">
<li>&bull; a&ndash;n itemize line <pre class="example">i--tem 1
</pre></li><li>&bull; a&ndash;n itemize line <pre class="example">i--tem 2
</pre></li></ul>
<pre class="example">
+
</pre><dl>
<dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule chose and </em></dt>
-<dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
-<dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule chose and </em></dt>
-<dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
-<dt><a name="index-followed-3"></a>truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt id="index-machin-8">truc: <strong>machin</strong> <em>bidule chose and</em></dt>
+<dt id="index-machin-9">truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
+<dt id="index-machin-10">truc: <strong>machin</strong> <em>bidule chose and </em></dt>
+<dt id="index-machin-11">truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
+<dt id="index-followed-3">truc: <strong>followed</strong> <em>by a comment</em></dt>
<dd><pre class="example">Various deff lines
-</pre></dd><dt><a name="index-after-1"></a>truc: <strong>after</strong> <em>a deff item</em></dt>
+</pre></dd><dt id="index-after-1">truc: <strong>after</strong> <em>a deff item</em></dt>
</dl>
<pre class="example">
+
<code>@ref{node}</code> `node'
<code>@ref{,cross ref name}</code> `cross ref name'
@@ -2932,16 +3000,16 @@ Invalid use of @':
</pre></div>
-<a name="index-t_002d_002druc"></a>
-<a name="index-T_002d_002druc"></a>
-<a name="index-_002e"></a>
-<a name="index-_003f"></a>
-<a name="index-a"></a>
-<a name="index-t_002d_002druc-1"></a>
-<a name="index-T_002d_002druc-1"></a>
-<a name="index-_002e-1"></a>
-<a name="index-_003f-1"></a>
-<a name="index-a-5"></a>
+<span id="index-t_002d_002druc"></span>
+<span id="index-T_002d_002druc"></span>
+<span id="index-_002e"></span>
+<span id="index-_003f"></span>
+<span id="index-a"></span>
+<span id="index-t_002d_002druc-1"></span>
+<span id="index-T_002d_002druc-1"></span>
+<span id="index-_002e-1"></span>
+<span id="index-_003f-1"></span>
+<span id="index-a-5"></span>
<p>cp
@@ -2964,28 +3032,28 @@ Invalid use of @':
<table class="index-cp" border="0">
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_cp_symbol-1">&quot;</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_cp_symbol-1">&quot;</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_cp_symbol-2">-</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_cp_symbol-2">-</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_cp_symbol-3">.</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_cp_symbol-3">.</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_cp_symbol-4">?</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_cp_symbol-4">?</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_cp_letter-A">A</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_cp_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_cp_letter-I">I</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_cp_letter-I">I</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3003,7 +3071,7 @@ Invalid use of @':
<tr><td></td><td valign="top"><a href="#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_cp_letter-T">T</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_cp_letter-T">T</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
@@ -3055,25 +3123,25 @@ Invalid use of @':
<table class="index-fn" border="0">
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_symbol-1">-</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_symbol-1">-</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_symbol-2">.</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_symbol-2">.</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_symbol-3">?</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_symbol-3">?</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_symbol-4">`</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_symbol-4">`</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_letter-A">A</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3088,7 +3156,7 @@ Invalid use of @':
<tr><td></td><td valign="top"><a href="#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_letter-B">B</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3098,7 +3166,7 @@ Invalid use of @':
<tr><td></td><td valign="top"><a href="#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_letter-D">D</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_letter-D">D</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3160,7 +3228,7 @@ Invalid use of @':
<tr><td></td><td valign="top"><a href="#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_letter-F">F</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_letter-F">F</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3170,7 +3238,7 @@ Invalid use of @':
<tr><td></td><td valign="top"><a href="#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_letter-I">I</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_letter-I">I</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3188,7 +3256,7 @@ Invalid use of @':
<tr><td></td><td valign="top"><a href="#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_letter-L">L</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_letter-L">L</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3202,7 +3270,7 @@ Invalid use of @':
<tr><td></td><td valign="top"><a href="#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_letter-M">M</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_letter-M">M</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3228,7 +3296,7 @@ Invalid use of @':
<tr><td></td><td valign="top"><a href="#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_fn_letter-T">T</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_fn_letter-T">T</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3279,19 +3347,19 @@ Invalid use of @':
<table class="index-vr" border="0">
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_vr_letter-A">A</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_vr_letter-A">A</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-a-6"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-a-7"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_vr_letter-B">B</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_vr_letter-B">B</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-b-2"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-b-3"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_vr_letter-D">D</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_vr_letter-D">D</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defcv_005fname"><code>d--efcv_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defcv_005fname"><code>d--efcv_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-d_002d_002defcv_005fname"><code>d--efcv_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
@@ -3345,7 +3413,7 @@ Invalid use of @':
<table class="index-tp" border="0">
<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="Top-section_tp_letter-D">D</a></th><td></td><td></td></tr>
+<tr><th id="Top-section_tp_letter-D">D</th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftp_005fname"><code>d--eftp_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftp_005fname"><code>d--eftp_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-d_002d_002deftp_005fname"><code>d--eftp_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html
index a756342df8..c1e0eae17c 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -595,39 +602,29 @@ truc: after a deff item
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<!-- This file redirects to the location of a node or anchor -->
<head>
-<title>title &ndash;a: Top</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Top (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: Top">
-<meta name="keywords" content="title &ndash;a: Top">
+<meta name="description" content="Top (title &ndash;a)">
+<meta name="keywords" content="Top (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
index 07db2f80df..6483d50507 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: 1.1 A section</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1.1 A section (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: 1.1 A section">
-<meta name="keywords" content="title &ndash;a: 1.1 A section">
+<meta name="description" content="1.1 A section (title &ndash;a)">
+<meta name="keywords" content="1.1 A section (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,8 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="s_002d_002dect_002cion"></a>
-<table border="0" cellpadding="0" cellspacing="0">
+<span id="s_002d_002dect_002cion"></span><table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -648,28 +644,28 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1 chapter" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="subsection.html#subsection" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1 subsection" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1 chapter" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -677,18 +673,18 @@ ul.no-bullet {list-style: none}
</table>
</td>
<td align="left">
-<a name="A-section"></a>
-<h2 class="section">1.1 A section</h2>
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
<blockquote><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsection.html#subsection">1.1.1 subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsection.html">1.1.1 subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
</pre></th></tr><tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">In detailmenu
-</pre></th></tr><tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</pre></th></tr><tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table></blockquote>
@@ -701,14 +697,14 @@ ul.no-bullet {list-style: none}
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1 chapter" align="middle"></a></td>
-<td valign="middle" align="left"><a href="subsection.html#subsection" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1 subsection" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1 chapter" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
index 0ed6d4ec57..3f99bf5959 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
@@ -1,36 +1,31 @@
$l2h_cache_key = q/$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''/;
$l2h_cache{$l2h_cache_key} = q|<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_t \eta (t) = g(\eta(t),\varphi(t))
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="sing_1.png"
+<IMG STYLE=""
+ SRC="sing_1.svg"
ALT="\begin{displaymath}\partial_t \eta (t) = g(\eta(t),\varphi(t))\end{displaymath}">
</DIV>
<BR CLEAR="ALL">
-<P></P> ''|;
+<P></P> &rdquo;|;
$l2h_cache_key = q/$--a {\frac{1}{2}} @minus{}$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$- -a {\frac{1}{2}} @minus{}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_2.svg"
ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>|;
$l2h_cache_key = q/$--a@minus{} {\frac{1}{2}}$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$- -a@minus{} {\frac{1}{2}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>|;
1; \ No newline at end of file
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
index 287d4df892..4b82a450f5 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: About This Document</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>About This Document (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: About This Document">
-<meta name="keywords" content="title &ndash;a: About This Document">
+<meta name="description" content="About This Document (title &ndash;a)">
+<meta name="keywords" content="About This Document (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,7 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="SEC_About"></a>
+<span id="SEC_About"></span>
<table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
@@ -648,13 +645,13 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -782,9 +779,9 @@ and is best viewed with a 16 or 18 point screen font.
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index d6a877bb36..15df977123 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: Footnotes</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Footnotes (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: Footnotes">
-<meta name="keywords" content="title &ndash;a: Footnotes">
+<meta name="description" content="Footnotes (title &ndash;a)">
+<meta name="keywords" content="Footnotes (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,7 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="SEC_Foot"></a>
+<span id="SEC_Foot"></span>
<table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
@@ -648,13 +645,13 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -664,19 +661,19 @@ ul.no-bullet {list-style: none}
<td align="left">
<h1 class="footnotes-heading">Footnotes</h1>
-<h3><a name="FOOT1" href="index.htm#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="index.htm#DOCF1">(1)</a></h3>
<p>in footnote</p>
-<h3><a name="FOOT2" href="index.htm#DOCF2">(2)</a></h3>
+<h5><a id="FOOT2" href="index.htm#DOCF2">(2)</a></h3>
<p>in footnote2</p>
-<h3><a name="FOOT5" href="index.htm#DOCF5">(3)</a></h3>
+<h5><a id="FOOT5" href="index.htm#DOCF5">(3)</a></h3>
<p>in footnote</p>
-<h3><a name="FOOT6" href="index.htm#DOCF6">(4)</a></h3>
+<h5><a id="FOOT6" href="index.htm#DOCF6">(4)</a></h3>
<p>in footnote2</p>
-<h3><a name="FOOT7" href="index.htm#DOCF7">(5)</a></h3>
+<h5><a id="FOOT7" href="index.htm#DOCF7">(5)</a></h3>
<p>in footnote</p>
-<h3><a name="FOOT8" href="index.htm#DOCF8">(6)</a></h3>
+<h5><a id="FOOT8" href="index.htm#DOCF8">(6)</a></h3>
<p>in footnote2</p>
-<h3><a name="FOOT9" href="chapter.html#DOCF9">(7)</a></h3>
+<h5><a id="FOOT9" href="chapter.html#DOCF9">(7)</a></h3>
<p>in footnote</p>
</td>
</tr>
@@ -687,9 +684,9 @@ ul.no-bullet {list-style: none}
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
index c150ef026f..3d3956ce95 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>sing_l2h</TITLE>
<META NAME="description" CONTENT="sing_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="sing_l2h.css">
@@ -24,20 +21,19 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<!-- l2h_begin sing_l2h 1 -->
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_t \eta (t) = g(\eta(t),\varphi(t))
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="sing_l2h_img1.png"
+<IMG STYLE=""
+ SRC="sing_l2h_img1.svg"
ALT="\begin{displaymath}\partial_t \eta (t) = g(\eta(t),\varphi(t))\end{displaymath}">
</DIV>
<BR CLEAR="ALL">
-<P></P> ''
+<P></P> &rdquo;
<!-- l2h_end sing_l2h 1 -->
@@ -45,9 +41,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<!-- MATH
$- -a {\frac{1}{2}} @minus{}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_l2h_img2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_l2h_img2.svg"
ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
<!-- l2h_end sing_l2h 2 -->
@@ -56,9 +50,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<!-- MATH
$- -a@minus{} {\frac{1}{2}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="sing_l2h_img3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_l2h_img3.svg"
ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
<!-- l2h_end sing_l2h 3 -->
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
index 63425f0e67..ec5a9491dc 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
@@ -7,10 +7,7 @@
\usepackage{html}
-\usepackage[dvips]{color}
-
-
-\pagecolor[gray]{.7}
+\usepackage{xcolor}
\usepackage[]{inputenc}
@@ -56,56 +53,40 @@
\parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
\def\phantompar{\csname par\endcsname}\normalsize}%
\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
-\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }%
-\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }%
-\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup %
- \let\ifinner=\iffalse \let\)\liih@math }%
-\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
- \expandafter\box\next\egroup}%
-\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
-\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
- \ifdim\dimen0>.95\vsize
- \lthtmltypeout{%
-*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
- \ht\sizebox.95\vsize \dp\sizebox\z@ \fi
- \lthtmltypeout{l2hSize %
-:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
-\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
- \lthtmlmathtype{#1}\lthtmlvboxmathA}%
-\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}%
-\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup
- \let\@savefreelist\@freelist \lthtmlhboxmathB}%
-\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}%
-\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox
- \global\let\@freelist\@savefreelist}%
-\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}%
-\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}%
-\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}%
- \lthtmldisplayA{#1}\let\@eqnnum\relax}%
-\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}%
-\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB}
-\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA
- \vrule height1.5ex width0pt }%
-\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}%
-\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}%
-\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline}
-\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath}
-\newcommand\lthtmlindisplaymathZ{\egroup %
- \centerinlinemath\lthtmllogmath\lthtmlsetmath}
-\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{%
- \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{%
- \kern.1em\kern0.75 pt\hbox{\hglue.17em\copy\sizebox\hglue0.75 pt}}\kern.3pt%
- \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.75 pt%
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\centerinlinemath{%
- \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi
- \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1
- \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax}
-
+\usepackage[tightpage,active]{preview}
+\newbox\lthtmlPageBox
+\newdimen\lthtmlCropMarkHeight
+\newdimen\lthtmlCropMarkDepth
+\long\def\lthtmlTightVBox#1#2{%
+ \setbox\lthtmlPageBox\vbox{\hbox{\catcode`\_=8 #2}}%
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}}%
+\long\def\lthtmlTightFBox#1#2{%
+ \adjustnormalsize\setbox\lthtmlPageBox=\vbox\bgroup %
+ \let\ifinner=\iffalse \let\)\liih@math %
+ {\catcode`\_=8 #2}%
+ \@next\next\@currlist{}{\def\next{\voidb@x}}%
+ \expandafter\box\next\egroup %
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}%
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayB#1#2\lthtmldisplayZ{\\edef\preveqno{(\theequation)}%
+ \lthtmlTightVBox{#1}{\let\@eqnnum\relax#2}}
+ \long\def\lthtmlfigureA#1#2\lthtmlfigureZ{\let\@savefreelist\@freelist
+ \lthtmlTightFBox{#1}{#2}\global\let\@freelist\@savefreelist}
+ \long\def\lthtmlpictureA#1#2\lthtmlpictureZ{\let\@savefreelist\@freelist
+ \lthtmlTightVBox{#1}{#2}\global\let\@freelist\@savefreelist}
\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
\ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
\else\expandafter\vss\fi}%
@@ -144,13 +125,13 @@
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline15}%
$--a {\frac{1}{2}} @minus{}$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline17}%
$--a@minus{} {\frac{1}{2}}$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
index acdb6f2278..8d686ade96 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: Short Table of Contents</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Short Table of Contents (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: Short Table of Contents">
-<meta name="keywords" content="title &ndash;a: Short Table of Contents">
+<meta name="description" content="Short Table of Contents (title &ndash;a)">
+<meta name="keywords" content="Short Table of Contents (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,7 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="SEC_Overview"></a>
+<span id="SEC_Overview"></span>
<table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
@@ -648,13 +645,13 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -666,8 +663,8 @@ ul.no-bullet {list-style: none}
<div class="shortcontents">
<ul class="no-bullet">
-<li><a name="stoc-chapter-1" href="chapter.html#chapter">1 chapter</a></li>
-<li><a name="stoc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+<li><a id="stoc-chapter-1" href="chapter.html">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="chapter2.html">chapter 2</a></li>
</ul>
</div>
</td>
@@ -679,9 +676,9 @@ ul.no-bullet {list-style: none}
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
index 7dad4d4d89..ad2e3516d6 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: Table of Contents</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Table of Contents (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: Table of Contents">
-<meta name="keywords" content="title &ndash;a: Table of Contents">
+<meta name="description" content="Table of Contents (title &ndash;a)">
+<meta name="keywords" content="Table of Contents (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,7 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="SEC_Contents"></a>
+<span id="SEC_Contents"></span>
<table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
@@ -648,13 +645,13 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -667,18 +664,18 @@ ul.no-bullet {list-style: none}
<div class="contents">
<ul class="no-bullet">
- <li><a name="toc-chapter-1" href="chapter.html#chapter">1 chapter</a>
+ <li><a id="toc-chapter-1" href="chapter.html">1 chapter</a>
<ul class="no-bullet">
- <li><a name="toc-A-section" href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">1.1 A section</a>
+ <li><a id="toc-A-section" href="s_002d_002dect_002cion.html">1.1 A section</a>
<ul class="no-bullet">
- <li><a name="toc-subsection-1" href="subsection.html#subsection">1.1.1 subsection</a>
+ <li><a id="toc-subsection-1" href="subsection.html">1.1.1 subsection</a>
<ul class="no-bullet">
- <li><a name="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
- <li><a name="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
+ <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
+ <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
</ul></li>
</ul></li>
</ul></li>
- <li><a name="toc-chapter-2" href="chapter2.html#chapter2">chapter 2</a></li>
+ <li><a id="toc-chapter-2" href="chapter2.html">chapter 2</a></li>
</ul>
</div>
</td>
@@ -690,9 +687,9 @@ ul.no-bullet {list-style: none}
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
index c64b3784b4..3defd86ab2 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: 1.1.1 subsection</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1.1.1 subsection (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: 1.1.1 subsection">
-<meta name="keywords" content="title &ndash;a: 1.1.1 subsection">
+<meta name="description" content="1.1.1 subsection (title &ndash;a)">
+<meta name="keywords" content="1.1.1 subsection (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,8 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="subsection"></a>
-<table border="0" cellpadding="0" cellspacing="0">
+<span id="subsection"></span><table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -648,28 +644,28 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1 A section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1 A section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -677,17 +673,16 @@ ul.no-bullet {list-style: none}
</table>
</td>
<td align="left">
-<a name="subsection-1"></a>
-<h3 class="subsection">1.1.1 subsection</h3>
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
<blockquote><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
-<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
</table></blockquote>
-<a name="anchor"></a>
+<span id="anchor"></span>
</td>
</tr>
</table>
@@ -697,14 +692,14 @@ ul.no-bullet {list-style: none}
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1 A section" align="middle"></a></td>
-<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
-<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html#s_002d_002dect_002cion" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1 A section" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index c016dd0aaf..b38dd26008 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1.1.1.1 subsubsection &ldquo;simple-double&ndash; (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;">
-<meta name="keywords" content="title &ndash;a: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;">
+<meta name="description" content="1.1.1.1 subsubsection &ldquo;simple-double&ndash; (title &ndash;a)">
+<meta name="keywords" content="1.1.1.1 subsubsection &ldquo;simple-double&ndash; (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,8 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="subsubsection-_0060_0060simple_002ddouble_002d_002d"></a>
-<table border="0" cellpadding="0" cellspacing="0">
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d"></span><table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -648,28 +644,28 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="subsection.html#subsection" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1 subsection" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="subsection.html#subsection" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -677,8 +673,7 @@ ul.no-bullet {list-style: none}
</table>
</td>
<td align="left">
-<a name="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></a>
-<h4 class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
</td>
</tr>
@@ -689,14 +684,14 @@ ul.no-bullet {list-style: none}
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="subsection.html#subsection" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1 subsection" align="middle"></a></td>
-<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
-<td valign="middle" align="left"><a href="subsection.html#subsection" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index d2a1f35d24..7bff2fac5e 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -42,6 +42,8 @@ kbd: ``simple-double-three-four-''
@,c@"u c,u"
+@U{0075} 0075
+
@*
@ followed by a space
@@ -130,7 +132,6 @@ but , ,
@cite{-a} -a
@code{-a} -a
@command{-a} -a
-@ctrl{-a} -a
@dfn{-a} -a
@dmn{-a} -a
@email{-a,-b} -b
@@ -302,7 +303,7 @@ def-fn
fset: i a g
cmde: truc
Command: log trap
-Command: log trap1
+Command: log trap1
Command: log trap2
cmde: id ule truc
cmde2: id i ule truc
@@ -531,6 +532,12 @@ Invalid use of @':
@dotless{-a} -a
@dotless{a} a
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
@TeX, but without brace TeX@# #
@w{-a} -a
@@ -546,7 +553,7 @@ i-tem 1
i-tem 2
fun:
-truc: machin bidule chose and
+truc: machin bidule chose and
truc: machin bidule chose and after
truc: machin bidule chose and
truc: machin bidule chose and and after
@@ -594,39 +601,29 @@ truc: after a deff item
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
-<title>title &ndash;a: 1.1.1.2 three&mdash;four&mdash;-&rdquo;</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1.1.1.2 three&mdash;four&mdash;-&rdquo; (title &ndash;a)</title>
-<meta name="description" content="title &ndash;a: 1.1.1.2 three&mdash;four&mdash;-&rdquo;">
-<meta name="keywords" content="title &ndash;a: 1.1.1.2 three&mdash;four&mdash;-&rdquo;">
+<meta name="description" content="1.1.1.2 three&mdash;four&mdash;-&rdquo; (title &ndash;a)">
+<meta name="keywords" content="1.1.1.2 three&mdash;four&mdash;-&rdquo; (title &ndash;a)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -636,8 +633,7 @@ ul.no-bullet {list-style: none}
<body lang="en" background="../singular_images/Mybg.png">
-<a name="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></a>
-<table border="0" cellpadding="0" cellspacing="0">
+<span id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><table border="0" cellpadding="0" cellspacing="0">
<tr valign="top">
<td align="left">
<table class="header" cellpadding="1" cellspacing="1" border="0">
@@ -648,28 +644,28 @@ ul.no-bullet {list-style: none}
</td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: chapter 2" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="subsection.html#subsection" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
</tr>
<tr valign="top" align="left">
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
@@ -677,8 +673,7 @@ ul.no-bullet {list-style: none}
</table>
</td>
<td align="left">
-<a name="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></a>
-<h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
</td>
</tr>
@@ -689,14 +684,14 @@ ul.no-bullet {list-style: none}
src="../singular_images/singular-icon-transparent.png" width="50"
border="0" alt="Top"></a>
</td>
-<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html#subsubsection-_0060_0060simple_002ddouble_002d_002d" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: chapter 2" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter.html#chapter" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
-<td valign="middle" align="left"><a href="chapter2.html#chapter2" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
-<td valign="middle" align="left"><a href="subsection.html#subsection" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
-<td valign="middle" align="left"><a href="index.htm#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
</tr></table>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/anchor.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/anchor.html
new file mode 100644
index 0000000000..0336bc1052
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/anchor.html
@@ -0,0 +1,643 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<!-- This file redirects to the location of a node or anchor -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>anchor (title &ndash;a)</title>
+
+<meta name="description" content="anchor (title &ndash;a)">
+<meta name="keywords" content="anchor (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+<meta http-equiv="Refresh" content="0; url=subsection.html#anchor">
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+
+<p>The node you are looking for is at <a href="subsection.html#anchor">anchor</a>.</p>
+</body>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/chapter.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/chapter.html
new file mode 100644
index 0000000000..fef4b97c3e
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/chapter.html
@@ -0,0 +1,722 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1 chapter (title &ndash;a)</title>
+
+<meta name="description" content="1 chapter (title &ndash;a)">
+<meta name="keywords" content="1 chapter (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="chapter"></span><table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1 A section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
+
+<p><a id="DOCF9" href="sing_fot.htm#FOOT9"><sup>7</sup></a>
+</p>
+<div class="format">
+<blockquote><table class="menu" border="0" cellspacing="0">
+<pre class="menu-preformatted">&bull; <a href="s_002d_002dect_002cion.html">s--ect,ion</a>:: s&ndash;ect,ion
+</pre><pre class="menu-comment">
+
+Menu comment
+&ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo;
+
+
+</pre></table></blockquote>
+</div>
+
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="index.htm" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/chapter2.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/chapter2.html
new file mode 100644
index 0000000000..a5e42764bd
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/chapter2.html
@@ -0,0 +1,1029 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>chapter 2 (title &ndash;a)</title>
+
+<meta name="description" content="chapter 2 (title &ndash;a)">
+<meta name="keywords" content="chapter 2 (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="chapter2"></span><table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><img src="../singular_images/a_right_na.png" border="0" alt="Forward" align="middle"></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><img src="../singular_images/a_rightdouble_na.png" border="0" alt="FastForward" align="middle"></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<span id="chapter-2"></span><h1 class="centerchap" align="center">chapter 2</h1>
+
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_symbol-2"><b>-</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_symbol-3"><b>.</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_symbol-4"><b>?</b></a>
+ &nbsp;
+<br>
+<a class="summary-letter" href="#chapter-2_cp_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_letter-I"><b>I</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_letter-T"><b>T</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_cp_symbol-1">&quot;</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_cp_symbol-2">-</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_cp_symbol-3">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_cp_symbol-4">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_cp_letter-I">I</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_cp_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_cp_symbol-1"><b>&quot;</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_symbol-2"><b>-</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_symbol-3"><b>.</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_symbol-4"><b>?</b></a>
+ &nbsp;
+<br>
+<a class="summary-letter" href="#chapter-2_cp_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_letter-I"><b>I</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_cp_letter-T"><b>T</b></a>
+ &nbsp;
+</td></tr></table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_fn_symbol-1"><b>-</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_symbol-2"><b>.</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_symbol-3"><b>?</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_symbol-4"><b>`</b></a>
+ &nbsp;
+<br>
+<a class="summary-letter" href="#chapter-2_fn_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-B"><b>B</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-D"><b>D</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-F"><b>F</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-I"><b>I</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-L"><b>L</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-M"><b>M</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-T"><b>T</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-fn" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_symbol-1">-</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_symbol-2">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_symbol-3">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_symbol-4">`</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_letter-B">B</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_letter-D">D</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_letter-F">F</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_letter-I">I</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_letter-L">L</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_letter-M">M</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="chapter-2_fn_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="index.htm#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="index.htm">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#chapter-2_fn_symbol-1"><b>-</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_symbol-2"><b>.</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_symbol-3"><b>?</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_symbol-4"><b>`</b></a>
+ &nbsp;
+<br>
+<a class="summary-letter" href="#chapter-2_fn_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-B"><b>B</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-D"><b>D</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-F"><b>F</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-I"><b>I</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-L"><b>L</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-M"><b>M</b></a>
+ &nbsp;
+<a class="summary-letter" href="#chapter-2_fn_letter-T"><b>T</b></a>
+ &nbsp;
+</td></tr></table>
+
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
+<td valign="middle" align="left"><img src="../singular_images/a_right_na.png" border="0" alt="Forward" align="middle"></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><img src="../singular_images/a_rightdouble_na.png" border="0" alt="FastForward" align="middle"></td>
+<td valign="middle" align="left"><a href="index.htm" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/formatting.1 b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/formatting.1
new file mode 100644
index 0000000000..913b95fff8
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/formatting.1
@@ -0,0 +1,192 @@
+This is TeX, Version 3.14159265 (TeX Live 2019/dev/Debian) (preloaded format=tex)
+(./sing_tex4ht_tex.tex
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
+::::::::::::::::::::::::::::::::::::::::::
+ TeX4ht info is available in the log file
+::::::::::::::::::::::::::::::::::::::::::
+) (/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+--- needs --- tex4ht sing_tex4ht_tex ---
+(./sing_tex4ht_tex.tmp)
+l.1444 --- TeX4ht warning --- No file sing_tex4ht_tex.xref ---
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/plain.4ht
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)) [1]
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht))) [1]
+[2] )
+Output written on sing_tex4ht_tex.dvi (3 pages, 6880 bytes).
+Transcript written on sing_tex4ht_tex.log.
+This is TeX, Version 3.14159265 (TeX Live 2019/dev/Debian) (preloaded format=tex)
+(./sing_tex4ht_tex.tex
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
+::::::::::::::::::::::::::::::::::::::::::
+ TeX4ht info is available in the log file
+::::::::::::::::::::::::::::::::::::::::::
+) (/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+--- needs --- tex4ht sing_tex4ht_tex ---
+(./sing_tex4ht_tex.tmp) (./sing_tex4ht_tex.xref)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/plain.4ht
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)) [1]
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht))) [1]
+[2] )
+Output written on sing_tex4ht_tex.dvi (3 pages, 6880 bytes).
+Transcript written on sing_tex4ht_tex.log.
+This is TeX, Version 3.14159265 (TeX Live 2019/dev/Debian) (preloaded format=tex)
+(./sing_tex4ht_tex.tex
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
+::::::::::::::::::::::::::::::::::::::::::
+ TeX4ht info is available in the log file
+::::::::::::::::::::::::::::::::::::::::::
+) (/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+--- needs --- tex4ht sing_tex4ht_tex ---
+(./sing_tex4ht_tex.tmp) (./sing_tex4ht_tex.xref)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/plain.4ht
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht)) [1]
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht))) [1]
+[2] )
+Output written on sing_tex4ht_tex.dvi (3 pages, 6880 bytes).
+Transcript written on sing_tex4ht_tex.log.
+----------------------------
+tex4ht.c (2018-06-30-15:36 kpathsea)
+tex4ht -f/sing_tex4ht_tex.tex
+ -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/
+(/usr/share/texlive/texmf-dist/tex4ht/base/unix/tex4ht.env)
+(/usr/share/texlive/texmf-dist/tex4ht/ht-fonts/iso8859/1/charset/unicode.4hf)
+(/usr/share/texlive/texmf-dist/fonts/tfm/public/cm/cmmi7.tfm)
+(/usr/share/texlive/texmf-dist/tex4ht/ht-fonts/unicode/cm/cmmi.htf)
+(/usr/share/texlive/texmf-dist/fonts/tfm/public/cm/cmmi10.tfm)
+(/usr/share/texlive/texmf-dist/tex4ht/ht-fonts/unicode/cm/cmmi.htf)
+(/usr/share/texlive/texmf-dist/fonts/tfm/public/cm/cmr10.tfm)
+(/usr/share/texlive/texmf-dist/tex4ht/ht-fonts/alias/lm/lm-rep-cmrm/cmr.htf)
+Searching `lm-rep-cmrm.htf' for `cmr10.htf'
+(/usr/share/texlive/texmf-dist/tex4ht/ht-fonts/unicode/lm/lm-rep-cmrm.htf)
+[1 file sing_tex4ht_tex.html
+ file sing_tex4ht_tex.css
+ file sing_tex4ht_tex.tmp
+] [2] [3]
+Execute script `sing_tex4ht_tex.lg'
+This is dvipng 1.15 Copyright 2002-2015 Jan-Ake Larsson
+[1]
+This is dvipng 1.15 Copyright 2002-2015 Jan-Ake Larsson
+[2]
+This is dvipng 1.15 Copyright 2002-2015 Jan-Ake Larsson
+[3]
+This is dvipng 1.15 Copyright 2002-2015 Jan-Ake Larsson
+[4]
+----------------------------
+t4ht.c (2018-06-28-11:26 kpathsea)
+t4ht -f/sing_tex4ht_tex.tex
+(/usr/share/texlive/texmf-dist/tex4ht/base/unix/tex4ht.env)
+Entering sing_tex4ht_tex.lg
+System call: dvipng -T tight -D 144 -bg Transparent -pp 1:1 sing_tex4ht_tex.idv -o sing_tex4ht_tex0x.png
+System return: 0
+System call: dvipng -T tight -D 144 -bg Transparent -pp 2:2 sing_tex4ht_tex.idv -o sing_tex4ht_tex1x.png
+System return: 0
+System call: dvipng -T tight -D 144 -bg Transparent -pp 3:3 sing_tex4ht_tex.idv -o sing_tex4ht_tex2x.png
+System return: 0
+System call: dvipng -T tight -D 144 -bg Transparent -pp 4:4 sing_tex4ht_tex.idv -o sing_tex4ht_tex3x.png
+System return: 0
+Entering sing_tex4ht_tex.css
+Entering sing_tex4ht_tex.tmp
+This is TeX, Version 3.14159265 (TeX Live 2019/dev/Debian) (preloaded format=tex)
+(./sing_tex4ht_math.texi (/usr/share/texmf/tex/texinfo/texinfo.tex
+Loading texinfo [version 2018-01-09.11]: pdf, fonts, markup, glyphs,
+page headings, tables, conditionals, indexing, sectioning, toc, environments,
+defuns, macros, cross references, insertions,
+(/usr/share/texlive/texmf-dist/tex/generic/epsf/epsf.tex
+This is `epsf.tex' v2.7.4 <14 February 2011>
+) localization, formatting, and turning on texinfo input format.)
+! Undefined control sequence.
+<argument> --a {@frac
+ {1}{2}} @minus {}
+@finishmath #1->#1
+ $@endgroup
+l.8 @math{--a {\frac{1}{2}} @minus{}}
+
+?
+! Emergency stop.
+<argument> --a {@frac
+ {1}{2}} @minus {}
+@finishmath #1->#1
+ $@endgroup
+l.8 @math{--a {\frac{1}{2}} @minus{}}
+
+No pages of output.
+Transcript written on sing_tex4ht_math.log.
+This is TeX, Version 3.14159265 (TeX Live 2019/dev/Debian) (preloaded format=tex)
+(./sing_tex4ht_math.texi (/usr/share/texmf/tex/texinfo/texinfo.tex
+Loading texinfo [version 2018-01-09.11]: pdf, fonts, markup, glyphs,
+page headings, tables, conditionals, indexing, sectioning, toc, environments,
+defuns, macros, cross references, insertions,
+(/usr/share/texlive/texmf-dist/tex/generic/epsf/epsf.tex
+This is `epsf.tex' v2.7.4 <14 February 2011>
+) localization, formatting, and turning on texinfo input format.)
+! Undefined control sequence.
+<argument> --a {@frac
+ {1}{2}} @minus {}
+@finishmath #1->#1
+ $@endgroup
+l.8 @math{--a {\frac{1}{2}} @minus{}}
+
+?
+! Emergency stop.
+<argument> --a {@frac
+ {1}{2}} @minus {}
+@finishmath #1->#1
+ $@endgroup
+l.8 @math{--a {\frac{1}{2}} @minus{}}
+
+No pages of output.
+Transcript written on sing_tex4ht_math.log.
+This is TeX, Version 3.14159265 (TeX Live 2019/dev/Debian) (preloaded format=tex)
+(./sing_tex4ht_math.texi (/usr/share/texmf/tex/texinfo/texinfo.tex
+Loading texinfo [version 2018-01-09.11]: pdf, fonts, markup, glyphs,
+page headings, tables, conditionals, indexing, sectioning, toc, environments,
+defuns, macros, cross references, insertions,
+(/usr/share/texlive/texmf-dist/tex/generic/epsf/epsf.tex
+This is `epsf.tex' v2.7.4 <14 February 2011>
+) localization, formatting, and turning on texinfo input format.)
+! Undefined control sequence.
+<argument> --a {@frac
+ {1}{2}} @minus {}
+@finishmath #1->#1
+ $@endgroup
+l.8 @math{--a {\frac{1}{2}} @minus{}}
+
+?
+! Emergency stop.
+<argument> --a {@frac
+ {1}{2}} @minus {}
+@finishmath #1->#1
+ $@endgroup
+l.8 @math{--a {\frac{1}{2}} @minus{}}
+
+No pages of output.
+Transcript written on sing_tex4ht_math.log.
+----------------------------
+tex4ht.c (2018-06-30-15:36 kpathsea)
+tex4ht -f/sing_tex4ht_math.texi
+ -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/
+----------------------------
+t4ht.c (2018-06-28-11:26 kpathsea)
+t4ht -f/sing_tex4ht_math.texi
+(/usr/share/texlive/texmf-dist/tex4ht/base/unix/tex4ht.env)
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/formatting.2 b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/formatting.2
new file mode 100644
index 0000000000..4ddf0de77c
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/formatting.2
@@ -0,0 +1,219 @@
+formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:25: warning: missing category for @deffnx (possibly involving @mymacro)
+formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:25: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:25: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
+formatting.texi:25: command @minus not accepting argument in brace should not be on @ftable line (possibly involving @mymacro)
+formatting.texi:25: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:25: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:25: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:25: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:25: warning: accent command `@,' must not be followed by new line (possibly involving @mymacro)
+formatting.texi:25: use braces to give a command as an argument to @, (possibly involving @mymacro)
+formatting.texi:25: warning: accent command `@'' must not be followed by new line (possibly involving @mymacro)
+formatting.texi:25: use braces to give a command as an argument to @' (possibly involving @mymacro)
+formatting.texi:25: @dotless expects `i' or `j' as argument, not `truc' (possibly involving @mymacro)
+formatting.texi:25: @dotless expects `i' or `j' as argument, not `ij' (possibly involving @mymacro)
+formatting.texi:25: @dotless expects `i' or `j' as argument, not `--a' (possibly involving @mymacro)
+formatting.texi:25: @dotless expects `i' or `j' as argument, not `a' (possibly involving @mymacro)
+formatting.texi:25: @U expected braces (possibly involving @mymacro)
+formatting.texi:25: warning: no argument specified for @U (possibly involving @mymacro)
+formatting.texi:25: non-hex digits in argument for @U: z (possibly involving @mymacro)
+formatting.texi:25: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
+formatting.texi:25: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
+formatting.texi:25: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
+formatting.texi:25: @TeX expected braces (possibly involving @mymacro)
+formatting.texi:25: unexpected @ (possibly involving @mymacro)
+formatting.texi:25: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:25: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:25: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:25: @sp missing argument (possibly involving @mymacro)
+formatting.texi:25: warning: missing name for @deffn (possibly involving @mymacro)
+formatting.texi:25: misplaced } (possibly involving @mymacro)
+formatting.texi:25: misplaced } (possibly involving @mymacro)
+formatting.texi:25: misplaced { (possibly involving @mymacro)
+formatting.texi:25: misplaced { (possibly involving @mymacro)
+formatting.texi:25: must be after `@deffn' to use `@deffnx' (possibly involving @mymacro)
+formatting.texi:25: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:25: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:25: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:25: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:25: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:35: warning: missing category for @deffnx (possibly involving @mymacro)
+formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:35: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:35: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
+formatting.texi:35: command @minus not accepting argument in brace should not be on @ftable line (possibly involving @mymacro)
+formatting.texi:35: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:35: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:35: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:35: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:35: warning: accent command `@,' must not be followed by new line (possibly involving @mymacro)
+formatting.texi:35: use braces to give a command as an argument to @, (possibly involving @mymacro)
+formatting.texi:35: warning: accent command `@'' must not be followed by new line (possibly involving @mymacro)
+formatting.texi:35: use braces to give a command as an argument to @' (possibly involving @mymacro)
+formatting.texi:35: @dotless expects `i' or `j' as argument, not `truc' (possibly involving @mymacro)
+formatting.texi:35: @dotless expects `i' or `j' as argument, not `ij' (possibly involving @mymacro)
+formatting.texi:35: @dotless expects `i' or `j' as argument, not `--a' (possibly involving @mymacro)
+formatting.texi:35: @dotless expects `i' or `j' as argument, not `a' (possibly involving @mymacro)
+formatting.texi:35: @U expected braces (possibly involving @mymacro)
+formatting.texi:35: warning: no argument specified for @U (possibly involving @mymacro)
+formatting.texi:35: non-hex digits in argument for @U: z (possibly involving @mymacro)
+formatting.texi:35: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
+formatting.texi:35: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
+formatting.texi:35: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
+formatting.texi:35: @TeX expected braces (possibly involving @mymacro)
+formatting.texi:35: unexpected @ (possibly involving @mymacro)
+formatting.texi:35: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:35: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:35: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:35: @sp missing argument (possibly involving @mymacro)
+formatting.texi:35: warning: missing name for @deffn (possibly involving @mymacro)
+formatting.texi:35: misplaced } (possibly involving @mymacro)
+formatting.texi:35: misplaced } (possibly involving @mymacro)
+formatting.texi:35: misplaced { (possibly involving @mymacro)
+formatting.texi:35: misplaced { (possibly involving @mymacro)
+formatting.texi:35: must be after `@deffn' to use `@deffnx' (possibly involving @mymacro)
+formatting.texi:35: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:35: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:35: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:35: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:35: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:45: warning: missing category for @deffnx (possibly involving @mymacro)
+formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:45: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:45: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
+formatting.texi:45: command @minus not accepting argument in brace should not be on @ftable line (possibly involving @mymacro)
+formatting.texi:45: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:45: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:45: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:45: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:45: warning: accent command `@,' must not be followed by new line (possibly involving @mymacro)
+formatting.texi:45: use braces to give a command as an argument to @, (possibly involving @mymacro)
+formatting.texi:45: warning: accent command `@'' must not be followed by new line (possibly involving @mymacro)
+formatting.texi:45: use braces to give a command as an argument to @' (possibly involving @mymacro)
+formatting.texi:45: @dotless expects `i' or `j' as argument, not `truc' (possibly involving @mymacro)
+formatting.texi:45: @dotless expects `i' or `j' as argument, not `ij' (possibly involving @mymacro)
+formatting.texi:45: @dotless expects `i' or `j' as argument, not `--a' (possibly involving @mymacro)
+formatting.texi:45: @dotless expects `i' or `j' as argument, not `a' (possibly involving @mymacro)
+formatting.texi:45: @U expected braces (possibly involving @mymacro)
+formatting.texi:45: warning: no argument specified for @U (possibly involving @mymacro)
+formatting.texi:45: non-hex digits in argument for @U: z (possibly involving @mymacro)
+formatting.texi:45: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
+formatting.texi:45: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
+formatting.texi:45: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
+formatting.texi:45: @TeX expected braces (possibly involving @mymacro)
+formatting.texi:45: unexpected @ (possibly involving @mymacro)
+formatting.texi:45: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:45: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:45: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:45: @sp missing argument (possibly involving @mymacro)
+formatting.texi:45: warning: missing name for @deffn (possibly involving @mymacro)
+formatting.texi:45: misplaced } (possibly involving @mymacro)
+formatting.texi:45: misplaced } (possibly involving @mymacro)
+formatting.texi:45: misplaced { (possibly involving @mymacro)
+formatting.texi:45: misplaced { (possibly involving @mymacro)
+formatting.texi:45: must be after `@deffn' to use `@deffnx' (possibly involving @mymacro)
+formatting.texi:45: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:45: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:45: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:45: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:45: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:49: warning: missing category for @deffnx (possibly involving @mymacro)
+formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:49: warning: missing name for @deffnx (possibly involving @mymacro)
+formatting.texi:49: command @bullet not accepting argument in brace should not be on @table line (possibly involving @mymacro)
+formatting.texi:49: command @minus not accepting argument in brace should not be on @ftable line (possibly involving @mymacro)
+formatting.texi:49: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:49: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:49: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:49: warning: @verb should not appear in @image (possibly involving @mymacro)
+formatting.texi:49: warning: accent command `@,' must not be followed by new line (possibly involving @mymacro)
+formatting.texi:49: use braces to give a command as an argument to @, (possibly involving @mymacro)
+formatting.texi:49: warning: accent command `@'' must not be followed by new line (possibly involving @mymacro)
+formatting.texi:49: use braces to give a command as an argument to @' (possibly involving @mymacro)
+formatting.texi:49: @dotless expects `i' or `j' as argument, not `truc' (possibly involving @mymacro)
+formatting.texi:49: @dotless expects `i' or `j' as argument, not `ij' (possibly involving @mymacro)
+formatting.texi:49: @dotless expects `i' or `j' as argument, not `--a' (possibly involving @mymacro)
+formatting.texi:49: @dotless expects `i' or `j' as argument, not `a' (possibly involving @mymacro)
+formatting.texi:49: @U expected braces (possibly involving @mymacro)
+formatting.texi:49: warning: no argument specified for @U (possibly involving @mymacro)
+formatting.texi:49: non-hex digits in argument for @U: z (possibly involving @mymacro)
+formatting.texi:49: warning: fewer than four hex digits in argument for @U: abc (possibly involving @mymacro)
+formatting.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: FFFFFFFFFFFFFF (possibly involving @mymacro)
+formatting.texi:49: argument for @U exceeds Unicode maximum 0x10FFFF: 110000 (possibly involving @mymacro)
+formatting.texi:49: @TeX expected braces (possibly involving @mymacro)
+formatting.texi:49: unexpected @ (possibly involving @mymacro)
+formatting.texi:49: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:49: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:49: @image missing filename argument (possibly involving @mymacro)
+formatting.texi:49: @sp missing argument (possibly involving @mymacro)
+formatting.texi:49: warning: missing name for @deffn (possibly involving @mymacro)
+formatting.texi:49: misplaced } (possibly involving @mymacro)
+formatting.texi:49: misplaced } (possibly involving @mymacro)
+formatting.texi:49: misplaced { (possibly involving @mymacro)
+formatting.texi:49: misplaced { (possibly involving @mymacro)
+formatting.texi:49: must be after `@deffn' to use `@deffnx' (possibly involving @mymacro)
+formatting.texi:49: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:49: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:49: warning: command @ref missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:49: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:49: warning: command @inforef missing a node or external manual argument (possibly involving @mymacro)
+formatting.texi:90: warning: @menu in invalid context
+formatting.texi:25: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:25: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:25: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:25: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:35: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:35: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:35: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:35: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:45: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:45: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:45: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:45: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:49: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:49: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:49: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+formatting.texi:49: @ref reference to nonexistent node `node' (possibly involving @mymacro)
+--- warning --- Can't find/open file `sing_tex4ht_math.dvi'
+--- error --- Can't find/open file `sing_tex4ht_math.dvi'
+--- warning --- Can't find/open file `sing_tex4ht_math.lg'
+texi2any: warning: tex4ht.pm: could not open sing_tex4ht_math.html: No such file or directory
+texi2any: warning: tex4ht.pm: output has no HTML item for @math HASH(0x55f82e670718)
+formatting.texi:25: warning: @image file `f-ile' (for HTML) not found, using `f-ile.jpg' (possibly involving @mymacro)
+formatting.texi:25: warning: @image file `f--ile@.' (for HTML) not found, using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
+texi2any: warning: tex4ht.pm: output has no HTML item for @math HASH(0x55f82e7b5d70)
+formatting.texi:25: warning: @image file `f-ile' (for HTML) not found, using `f-ile.jpg' (possibly involving @mymacro)
+formatting.texi:25: warning: @image file `filejk _" %@' (for HTML) not found, using `filejk _" %@.jpg' (possibly involving @mymacro)
+texi2any: warning: tex4ht.pm: output has no HTML item for @math HASH(0x55f82eb61ad8)
+formatting.texi:45: warning: @image file `f-ile' (for HTML) not found, using `f-ile.jpg' (possibly involving @mymacro)
+formatting.texi:45: warning: @image file `f--ile@.' (for HTML) not found, using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
+texi2any: warning: tex4ht.pm: output has no HTML item for @math HASH(0x55f82ecb9c90)
+formatting.texi:45: warning: @image file `f-ile' (for HTML) not found, using `f-ile.jpg' (possibly involving @mymacro)
+formatting.texi:45: warning: @image file `filejk _" %@' (for HTML) not found, using `filejk _" %@.jpg' (possibly involving @mymacro)
+texi2any: warning: tex4ht.pm: output has no HTML item for @math HASH(0x55f82edf36c0)
+formatting.texi:49: warning: @image file `f-ile' (for HTML) not found, using `f-ile.jpg' (possibly involving @mymacro)
+formatting.texi:49: warning: @image file `f--ile@.' (for HTML) not found, using `f--ile@..file ext e--xt}' (possibly involving @mymacro)
+texi2any: warning: tex4ht.pm: output has no HTML item for @math HASH(0x55f82ef51c80)
+formatting.texi:49: warning: @image file `f-ile' (for HTML) not found, using `f-ile.jpg' (possibly involving @mymacro)
+formatting.texi:49: warning: @image file `filejk _" %@' (for HTML) not found, using `filejk _" %@.jpg' (possibly involving @mymacro)
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/index.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/index.htm
new file mode 100644
index 0000000000..2c87144c2c
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/index.htm
@@ -0,0 +1,3405 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Top section (title &ndash;a)</title>
+
+<meta name="description" content="Top section (title &ndash;a)">
+<meta name="keywords" content="Top section (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+
+<span id="Top"></span><table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<span id="Top-section"></span><h1 class="top">Top section</h1>
+
+<blockquote><table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="chapter.html">1 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
+Menu comment
+
+</pre></th></tr><tr><td align="left" valign="top"><a href="chapter2.html">chapter 2</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Chapter 2
+</td></tr>
+</table></blockquote>
+
+
+
+
+<p>Insertcopying in normal text
+</p><p>In copying
+</p>
+<p>&lt;
+&gt;
+&quot;
+&amp;
+&rsquo;
+&lsquo;
+</p>
+<p>&ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo;<br>
+code: <code>``simple-double--three---four----''</code> <br>
+asis: &ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo; <br>
+strong: <strong>&ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo;</strong> <br>
+kbd: <kbd>``simple-double--three---four----''</kbd> <br>
+</p>
+<p>&lsquo;<!-- /@w -->&lsquo;simple-double-<!-- /@w -->-three&mdash;four&mdash;-&rsquo;<!-- /@w -->&rsquo;<br>
+</p>
+<span id="index-copying-_002d_002doption"></span>
+<span id="index-copying-_0060_0060"></span>
+<span id="index-copying-_0060_0060-1"></span>
+<span id="index-copying-_002d_002dfoption"></span>
+
+<p>@&quot;u &uuml;
+@&quot;{U} &Uuml;
+@~n &ntilde;
+@^a &acirc;
+@&rsquo;e &eacute;
+@=o &#333;
+@&lsquo;i &igrave;
+@&rsquo;{e} &eacute;
+@&rsquo;{@dotless{i}} &iacute;
+@dotless{i} i
+@dotless{j} j
+@&lsquo;{@=E} &#274;`
+@l{} &#322;
+@,{@&rsquo;C} &#262;,
+@,c &ccedil;
+@,c@&quot;u &ccedil;&uuml; <br>
+</p>
+<p>@U{0075} &#x0075;
+</p>
+<p>@* <br>
+@ followed by a space
+&nbsp;
+@ followed by a tab
+&nbsp;
+@ followed by a new line
+&nbsp;<code>@-</code>
+<code>@|</code>
+<code>@:</code>
+<code>@!</code> !
+<code>@?</code> ?
+<code>@.</code> .
+<code>@@</code> @
+<code>@}</code> }
+<code>@{</code> {
+<code>@/</code>
+</p>
+<p>foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+</p>
+<p>@TeX TeX
+@LaTeX LaTeX
+@bullet &bull;
+@copyright &copy;
+@dots &hellip;
+@enddots <small class="enddots">...</small>
+@equiv &equiv;
+@error error&rarr;
+@expansion &rarr;
+@minus -
+@point &lowast;
+@print -|
+@result &rArr;
+@today a sunny day
+@aa &aring;
+@AA &Aring;
+@ae &aelig;
+@oe &oelig;
+@AE &AElig;
+@OE &OElig;
+@o &oslash;
+@O &Oslash;
+@ss &szlig;
+@l &#322;
+@L &#321;
+@DH &ETH;
+@TH &THORN;
+@dh &eth;
+@th &thorn;
+@exclamdown &iexcl;
+@questiondown &iquest;
+@pounds &pound;
+@registeredsymbol &reg;
+@ordf &ordf;
+@ordm &ordm;
+@comma ,
+@quotedblleft &ldquo;
+@quotedblright &rdquo;
+@quoteleft &lsquo;
+@quoteright &rsquo;
+@quotedblbase &bdquo;
+@quotesinglbase &sbquo;
+@guillemetleft &laquo;
+@guillemetright &raquo;
+@guillemotleft &laquo;
+@guillemotright &raquo;
+@guilsinglleft &lsaquo;
+@guilsinglright &rsaquo;
+@textdegree &deg;
+@euro &euro;
+@arrow &rarr;
+@leq &le;
+@geq &ge;
+</p>
+<p><code>@acronym{--a,an accronym}</code> <acronym title="an accronym">&ndash;a</acronym> (an accronym)
+<code>@acronym{--a}</code> <acronym title="an accronym">&ndash;a</acronym>
+<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr title="&Eacute;tude Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude Autonome)
+<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="&Eacute;tude Autonome">&Eacute;&ndash;. ,A.</abbr>
+<code>@asis{--a}</code> &ndash;a
+<code>@b{--a}</code> <b>&ndash;a</b>
+<code>@cite{--a}</code> <cite>&ndash;a</cite>
+<code>@code{--a}</code> <code>--a</code>
+<code>@command{--a}</code> <code>--a</code>
+<code>@dfn{--a}</code> <em>&ndash;a</em>
+<code>@dmn{--a}</code> &ndash;a
+<code>@email{--a,--b}</code> <a href="mailto:--a">&ndash;b</a>
+<code>@email{,--b}</code> &ndash;b
+<code>@email{--a}</code> <a href="mailto:--a">--a</a>
+<code>@emph{--a}</code> <em>&ndash;a</em>
+<code>@env{--a}</code> <code>--a</code>
+<code>@file{--a}</code> <samp>--a</samp>
+<code>@i{--a}</code> <i>&ndash;a</i>
+<code>@kbd{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> <tt class="key">--a</tt>
+<code>@math{--a {\frac{1}{2}} @minus{}}</code>
+<code>@option{--a}</code> <samp>--a</samp>
+<code>@r{--a}</code> <span class="roman">&ndash;a</span>
+<code>@samp{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
+<code>@sc{--a}</code> <small>&ndash;A</small>
+<code>@strong{--a}</code> <strong>&ndash;a</strong>
+<code>@t{--a}</code> <tt>--a</tt>
+<code>@sansserif{--a}</code> <span class="sansserif">&ndash;a</span>
+<code>@slanted{--a}</code> <i>&ndash;a</i>
+<code>@titlefont{--a}</code> </p><h1 class="titlefont">&ndash;a</h1>
+<p><code>@indicateurl{--a}</code> &lsquo;<code>--a</code>&rsquo;
+<code>@uref{--a,--b}</code> <a href="--a">&ndash;b</a>
+<code>@uref{--a}</code> <a href="--a">--a</a>
+<code>@uref{,--b}</code> &ndash;b
+<code>@uref{--a,--b,--c}</code> <a href="--a">&ndash;c</a>
+<code>@uref{,--b,--c}</code> &ndash;c
+<code>@uref{--a,,--c}</code> <a href="--a">&ndash;c</a>
+<code>@uref{,,--c}</code> &ndash;c
+<code>@url{--a,--b}</code> <a href="--a">&ndash;b</a>
+<code>@url{--a,}</code> <a href="--a">--a</a>
+<code>@url{,--b}</code> &ndash;b
+<code>@var{--a}</code> <var>&ndash;a</var>
+<code>@verb{:--a:}</code> <tt>--a</tt>
+<code>@verb{:a &lt; &amp; @ % &quot; -- b:}</code> <tt>a &lt; &amp; @ % &quot; -- b</tt>
+<code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}</code> a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!-- /@w -->
+<code>@H{a}</code> a''
+<code>@H{--a}</code> &ndash;a''
+<code>@dotaccent{a}</code> &#551;
+<code>@dotaccent{--a}</code> &ndash;a.
+<code>@ringaccent{a}</code> &aring;
+<code>@ringaccent{--a}</code> &ndash;a*
+<code>@tieaccent{a}</code> a[
+<code>@tieaccent{--a}</code> &ndash;a[
+<code>@u{a}</code> &#259;
+<code>@u{--a}</code> &ndash;a(
+<code>@ubaraccent{a}</code> a_
+<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@udotaccent{a}</code> &#7841;
+<code>@udotaccent{--a}</code> .&ndash;a
+<code>@v{a}</code> &#462;
+<code>@v{--a}</code> &ndash;a&lt;
+<code>@,{c}</code> &ccedil;
+<code>@,{--c}</code> &ndash;c,
+<code>@ogonek{a}</code> &#261;
+<code>@ogonek{--a}</code> &ndash;a;
+<code>@footnote{in footnote}</code> <a id="DOCF1" href="sing_fot.htm#FOOT1"><sup>1</sup></a>
+<code>@footnote{in footnote2}</code> <a id="DOCF2" href="sing_fot.htm#FOOT2"><sup>2</sup></a>
+</p>
+<p><code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.e--xt" alt="f--ile">
+<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.e--xt" alt="alt">
+<code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a&ndash;lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}</code> <img src="f--ile@..file ext e--xt}" alt="alt">
+</p>
+<br>
+<br>
+
+<p><code>@clicksequence{click @click{} A}</code> click &rarr; A
+After clickstyle &rArr;
+<code>@clicksequence{click @click{} A}</code> click &rArr; A
+</p>
+<blockquote>
+<p>A quot&mdash;ation
+</p></blockquote>
+
+<blockquote>
+<p><b>Note:</b> A Note
+</p></blockquote>
+
+<blockquote>
+<p><b>note:</b> A note
+</p></blockquote>
+
+<blockquote>
+<p><b>Caution:</b> Caution
+</p></blockquote>
+
+<blockquote>
+<p><b>Important:</b> Important
+</p></blockquote>
+
+<blockquote>
+<p><b>Tip:</b> a Tip
+</p></blockquote>
+
+<blockquote>
+<p><b>Warning:</b> a Warning.
+</p></blockquote>
+
+<blockquote>
+<p><b>something &eacute; TeX:</b> The something &eacute; TeX is here.
+</p></blockquote>
+
+<blockquote>
+<p><b>@ at the end of line &nbsp;:</b> A @ at the end of the @quotation line.
+</p></blockquote>
+
+<blockquote>
+<p><b>something, other thing:</b> something, other thing
+</p></blockquote>
+
+<blockquote>
+<p><b>Note, the note:</b> Note, the note
+</p></blockquote>
+
+<blockquote>
+</blockquote>
+
+<blockquote>
+</blockquote>
+
+<blockquote>
+</blockquote>
+
+<blockquote>
+</blockquote>
+
+<blockquote>
+<p>A small quot&mdash;ation
+</p></blockquote>
+
+<blockquote>
+<p><b>Note:</b> A small Note
+</p></blockquote>
+
+<blockquote>
+<p><b>something, other thing:</b> something, other thing
+</p></blockquote>
+
+<ul>
+<li> i&ndash;temize
+</li></ul>
+
+<ul class="no-bullet">
+<li>+ i&ndash;tem +
+</li></ul>
+
+<ul>
+<li> b&ndash;ullet
+</li></ul>
+
+<ul class="no-bullet">
+<li>- minu&ndash;s
+</li></ul>
+
+<ul class="no-bullet">
+<li> e&ndash;mph item
+</li></ul>
+
+<ul class="no-bullet">
+<li><em>after emph</em> e&ndash;mph item
+</li></ul>
+
+<ul class="no-bullet">
+<li>&bull; a&ndash;n itemize line <span id="index-copying-index-entry-within-itemize"></span>
+i&ndash;tem 1
+</li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
+</li></ul>
+
+<ol>
+<li> e&ndash;numerate
+</li></ol>
+
+<table>
+<thead><tr><th width="40%">mu&ndash;ltitable headitem</th><th width="60%">another tab</th></tr></thead>
+<tr><td width="40%">mu&ndash;ltitable item</td><td width="60%">multitable tab</td></tr>
+<tr><td width="40%">mu&ndash;ltitable item 2</td><td width="60%">multitable tab 2
+<span id="index-copying-index-entry-within-multitable"></span></td></tr>
+<tr><td width="40%">lone mu&ndash;ltitable item</td></tr>
+</table>
+
+<table>
+<tr><td>truc</td><td>bidule</td></tr>
+</table>
+
+<div class="example">
+<pre class="example">e--xample some
+ text
+</pre></div>
+
+<div class="example">
+<pre class="example">s--mallexample
+</pre></div>
+
+<div class="display">
+<pre class="display">d&ndash;isplay
+</pre></div>
+
+<div class="display">
+<pre class="display">s&ndash;malldisplay
+</pre></div>
+
+<div class="lisp">
+<pre class="lisp">l--isp
+</pre></div>
+
+<div class="lisp">
+<pre class="lisp">s--malllisp
+</pre></div>
+
+<div class="format">
+<pre class="format">f&ndash;ormat
+</pre></div>
+
+<div class="format">
+<pre class="format">s&ndash;mallformat
+</pre></div>
+
+<dl>
+<dt id="index-copying-d_002d_002deffn_005fname">c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;effn
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-de_002d_002dffn_005fname">cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args <br> even more so</em></dt>
+<dd><p>def&ndash;fn
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-i">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dd><span id="index-copying-index-entry-within-deffn"></span>
+</dd><dt id="index-copying-truc">cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-copying-log-trap">Command: <strong>log trap</strong> <em></em></dt>
+<dt id="index-copying-log-trap1">Command: <strong>log trap1</strong> <em></em></dt>
+<dt id="index-copying-log-trap2">Command: <strong>log trap2</strong> <em></em></dt>
+<dt id="index-copying-id-ule">cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
+<dt id="index-copying-id-i-ule">cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
+<dt><b>id &lsquo;<samp>i</samp>&rsquo; ule</b>: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt>aaa: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt id="index-copying-machin">: <strong>machin</strong></dt>
+<dt id="index-copying-bidule-machin">: <strong>bidule machin</strong></dt>
+<dt id="index-copying-machin-1">truc: <strong>machin</strong></dt>
+<dt>truc: <strong></strong></dt>
+<dt id="index-copying-followed">truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt>truc: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt id="index-copying-a">truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
+<dt id="index-copying-deffnx">truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
+</dl>
+
+<dl>
+<dt id="index-copying-deffn">empty: <strong>deffn</strong></dt>
+</dl>
+
+<dl>
+<dt id="index-copying-deffn-1">empty: <strong>deffn</strong> <em>with deffnx</em></dt>
+<dt id="index-copying-deffnx-1">empty: <strong>deffnx</strong></dt>
+</dl>
+
+<dl>
+<dt id="index-copying-i-1">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dt id="index-copying-truc-1">cmde: <strong>truc</strong> <em></em></dt>
+<dd><p>text in def item for second def item
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defvr_005fname">c--ategory: <strong>d--efvr_name</strong></dt>
+<dd><p>d&ndash;efvr
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002deftypefn_005fname">c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;eftypefn
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass">c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;eftypeop
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002deftypevr_005fname">c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
+<dd><p>d&ndash;eftypevr
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defcv_005fname">c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
+<dd><p>d&ndash;efcv
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass">c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efop
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002deftp_005fname">c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
+<dd><p>d&ndash;eftp
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defun_005fname">Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efun
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defmac_005fname">Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efmac
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defspec_005fname">Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efspec
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defvar_005fname">Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
+<dd><p>d&ndash;efvar
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defopt_005fname">User Option: <strong>d--efopt_name</strong></dt>
+<dd><p>d&ndash;efopt
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002deftypefun_005fname">Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;eftypefun
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002deftypevar_005fname">Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
+<dd><p>d&ndash;eftypevar
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass">Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
+<dd><p>d&ndash;efivar
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass">Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
+<dd><p>d&ndash;eftypeivar
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass">Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efmethod
+</p></dd></dl>
+
+<dl>
+<dt id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass">Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;eftypemethod
+</p></dd></dl>
+
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}</code> See <a href="../file n---ame@/c_002d_002d_002dhapter_0040.html#c_002d_002d_002dhapter_0040">t&mdash;itle@</a> in <cite>ma&mdash;nual@</cite>.
+<code>@ref{chapter, cross ref name, title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+</p>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
+</p>
+<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
+<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
+</p>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
+<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
+<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
+<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
+<code>@ref{chapter,cross ref name,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{chapter,,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
+<code>@ref{chapter,,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{chapter,,,file name,manual}</code> <a href="../file name/chapter.html#chapter">chapter</a> in <cite>manual</cite>
+</p>
+
+<p><code>@ref{(pman)anode,cross ref name}</code> <a href="../pman/anode.html#anode">(pman)cross ref name</a>
+<code>@ref{(pman)anode,,title}</code> <a href="../pman/anode.html#anode">(pman)title</a>
+<code>@ref{(pman)anode,,,file name}</code> <a href="../file name/anode.html#anode">(file name)anode</a>
+<code>@ref{(pman)anode,,,,manual}</code> <a href="../pman/anode.html#anode">anode</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title,}</code> <a href="../pman/anode.html#anode">(pman)title</a>
+<code>@ref{(pman)anode,cross ref name,,file name}</code> <a href="../file name/anode.html#anode">(file name)cross ref name</a>
+<code>@ref{(pman)anode,cross ref name,,,manual}</code> <a href="../pman/anode.html#anode">cross ref name</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title,file name}</code> <a href="../file name/anode.html#anode">(file name)title</a>
+<code>@ref{(pman)anode,cross ref name,title,,manual}</code> <a href="../pman/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title, file name, manual}</code> <a href="../file name/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,title,file name}</code> <a href="../file name/anode.html#anode">(file name)title</a>
+<code>@ref{(pman)anode,,title,,manual}</code> <a href="../pman/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,title, file name, manual}</code> <a href="../file name/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,,file name,manual}</code> <a href="../file name/anode.html#anode">anode</a> in <cite>manual</cite>
+</p>
+
+<p><code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+<code>@inforef{chapter}</code> See &lsquo;chapter&rsquo;
+<code>@inforef{chapter, cross ref name}</code> See &lsquo;cross ref name&rsquo;
+<code>@inforef{chapter,,file name}</code> See <a href="../file name/chapter.html#chapter">(file name)chapter</a>
+<code>@inforef{node, cross ref name, file name}</code> See <a href="../file name/node.html#node">(file name)cross ref name</a>
+<code>@inforef{node}</code> See &lsquo;node&rsquo;
+<code>@inforef{node, cross ref name}</code> See &lsquo;cross ref name&rsquo;
+<code>@inforef{node,,file name}</code> See <a href="../file name/node.html#node">(file name)node</a>
+<code>@inforef{chapter, cross ref name, file name, spurious arg}</code> See <a href="../file name, spurious arg/chapter.html#chapter">(file name, spurious arg)cross ref name</a>
+</p>
+<p><code>@inforef{s--ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}</code>
+See <a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
+ref</a>
+</p>
+
+<dl compact="compact">
+<dt>a</dt>
+<dd><p>l&ndash;ine
+</p></dd>
+</dl>
+
+<dl compact="compact">
+<dt>a
+<span id="index-copying-a-2"></span>
+</dt>
+<dt>b
+<span id="index-copying-b-1"></span>
+</dt>
+<dd><p>l&ndash;ine
+</p></dd>
+</dl>
+
+<dl compact="compact">
+<dt>a
+<span id="index-copying-a-1"></span>
+</dt>
+<dd><span id="index-copying-index-entry-between-item-and-itemx"></span>
+</dd>
+<dt>b
+<span id="index-copying-b"></span>
+</dt>
+<dd><p>l&ndash;ine
+</p></dd>
+</dl>
+
+<table class="cartouche" border="1"><tr><td>
+<p>c&ndash;artouche
+</p></td></tr></table>
+
+<p>g&ndash;roupe
+</p>
+<p align="left">f&ndash;lushleft
+</p>
+<p align="right">f&ndash;lushright
+</p>
+<div align="center">ce&ndash;ntered line
+</div>
+<pre class="verbatim">\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ &lt;&gt;.
+
+@bye
+</pre>
+<pre class="verbatim">in verbatim ''
+</pre>
+
+html ''
+
+
+ <center class="math-display" >
+<img
+src="sing_tex4ht_tex0x.png" alt="&#x2202;t&#x03B7;(t) = g(&#x03B7;(t),&#x03C6;(t)) " class="math-display" ></center> &#8221;
+
+
+<span id="majorheading"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading"></span><h2 class="heading">heading</h2>
+
+<span id="subheading"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading"></span><h4 class="subsubheading">subsubheading</h4>
+
+
+<p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an accronym , ...">&ndash;a</acronym> (an accronym , <small class="enddots">...</small>)
+<code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b>Autonome</b>)
+<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
+</p>
+<p><code>@math{--a@minus{} {\frac{1}{2}}}</code>
+</p>
+<p><code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img src="f-ile.jpg" alt="altjk _&quot; %@">
+<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&quot; %@ in b &quot;">
+<code>@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img src="filejk _&quot; %@.jpg" alt="altjk _&quot; %@">
+</p>
+
+
+
+<p>Somehow invalid use of @,:<br>
+@, ,
+<br>
+@,@&quot;u ,&uuml;
+</p>
+<p>Invalid use of @&rsquo;:<br>
+@&rsquo; '
+<br>
+@&rsquo;@&quot;u '&uuml;
+</p>
+<p>@dotless{truc} truc
+@dotless{ij} ij
+<code>@dotless{--a}</code> &ndash;a
+<code>@dotless{a}</code> a
+</p>
+<p>@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg &#xz;
+@U{abc}, with &lt;4 hex digits &#xabc;
+@U{FFFFFFFFFFFFFF}, value much too large &#xFFFFFFFFFFFFFF;
+@U{110000}, value just beyond Unicode &#x110000;
+</p>
+<p>@TeX, but without brace TeX<code>@#</code> #
+</p>
+<p><code>@w{--a}</code> &ndash;a<!-- /@w -->
+</p>
+<p><code>@image{,1--xt}</code>
+<code>@image{,,2--xt}</code>
+<code>@image{,,,3--xt}</code>
+</p>
+
+<ul class="no-bullet">
+<li> after emph e&ndash;mph item
+</li></ul>
+
+<ul class="no-bullet">
+<li>&bull; a&ndash;n itemize line i&ndash;tem 1
+</li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
+</li></ul>
+
+<dl>
+<dt>fun: <strong></strong></dt>
+<dt id="index-copying-machin-2">truc: <strong>machin</strong> <em>bidule chose and</em></dt>
+<dt id="index-copying-machin-3">truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
+<dt id="index-copying-machin-4">truc: <strong>machin</strong> <em>bidule chose and </em></dt>
+<dt id="index-copying-machin-5">truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
+<dt id="index-copying-followed-1">truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dd><p>Various deff lines
+</p></dd><dt id="index-copying-after">truc: <strong>after</strong> <em>a deff item</em></dt>
+</dl>
+
+<p><code>@ref{node}</code> &lsquo;node&rsquo;
+</p>
+<p><code>@ref{,cross ref name}</code> &lsquo;cross ref name&rsquo;
+<code>@ref{,,title}</code> &lsquo;title&rsquo;
+<code>@ref{,,,file name}</code> <a href="../file name/index.html">(file name)</a>
+<code>@ref{,,,,manual}</code> <cite>manual</cite>
+<code>@ref{node,cross ref name}</code> &lsquo;cross ref name&rsquo;
+<code>@ref{node,,title}</code> &lsquo;title&rsquo;
+<code>@ref{node,,,file name}</code> <a href="../file name/node.html#node">(file name)node</a>
+<code>@ref{node,,,,manual}</code> &lsquo;node&rsquo; in <cite>manual</cite>
+<code>@ref{node,cross ref name,title,}</code> &lsquo;title&rsquo;
+<code>@ref{node,cross ref name,,file name}</code> <a href="../file name/node.html#node">(file name)cross ref name</a>
+<code>@ref{node,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
+<code>@ref{node,cross ref name,title,file name}</code> <a href="../file name/node.html#node">(file name)title</a>
+<code>@ref{node,cross ref name,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{node,cross ref name,title, file name, manual}</code> <a href="../file name/node.html#node">title</a> in <cite>manual</cite>
+<code>@ref{node,,title,file name}</code> <a href="../file name/node.html#node">(file name)title</a>
+<code>@ref{node,,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{node,,title, file name, manual}</code> <a href="../file name/node.html#node">title</a> in <cite>manual</cite>
+<code>@ref{node,,,file name,manual}</code> <a href="../file name/node.html#node">node</a> in <cite>manual</cite>
+<code>@ref{,cross ref name,title,}</code> &lsquo;title&rsquo;
+<code>@ref{,cross ref name,,file name}</code> <a href="../file name/index.html">(file name)cross ref name</a>
+<code>@ref{,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
+<code>@ref{,cross ref name,title,file name}</code> <a href="../file name/index.html">(file name)title</a>
+<code>@ref{,cross ref name,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{,cross ref name,title, file name, manual}</code> <a href="../file name/index.html">title</a> in <cite>manual</cite>
+<code>@ref{,,title,file name}</code> <a href="../file name/index.html">(file name)title</a>
+<code>@ref{,,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{,,title, file name, manual}</code> <a href="../file name/index.html">title</a> in <cite>manual</cite>
+<code>@ref{,,,file name,manual}</code> <cite><a href="../file name/index.html">manual</a></cite>
+</p>
+<p><code>@inforef{,cross ref name }</code> See &lsquo;cross ref name&rsquo;
+<code>@inforef{,,file name}</code> See <a href="../file name/index.html">(file name)</a>
+<code>@inforef{,cross ref name, file name}</code> See <a href="../file name/index.html">(file name)cross ref name</a>
+<code>@inforef{}</code>
+</p>
+
+
+<p>Normal text
+</p>
+<p>&lt;
+&gt;
+&quot;
+&amp;
+&rsquo;
+&lsquo;
+</p>
+<p>&ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo;<br>
+code: <code>``simple-double--three---four----''</code> <br>
+asis: &ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo; <br>
+strong: <strong>&ldquo;simple-double&ndash;three&mdash;four&mdash;-&rdquo;</strong> <br>
+kbd: <kbd>``simple-double--three---four----''</kbd> <br>
+</p>
+<p>&lsquo;<!-- /@w -->&lsquo;simple-double-<!-- /@w -->-three&mdash;four&mdash;-&rsquo;<!-- /@w -->&rsquo;<br>
+</p>
+<span id="index-_002d_002doption"></span>
+<span id="index-_0060_0060"></span>
+<span id="index-_0060_0060-2"></span>
+<span id="index-_002d_002dfoption"></span>
+
+<p>@&quot;u &uuml;
+@&quot;{U} &Uuml;
+@~n &ntilde;
+@^a &acirc;
+@&rsquo;e &eacute;
+@=o &#333;
+@&lsquo;i &igrave;
+@&rsquo;{e} &eacute;
+@&rsquo;{@dotless{i}} &iacute;
+@dotless{i} i
+@dotless{j} j
+@&lsquo;{@=E} &#274;`
+@l{} &#322;
+@,{@&rsquo;C} &#262;,
+@,c &ccedil;
+@,c@&quot;u &ccedil;&uuml; <br>
+</p>
+<p>@U{0075} &#x0075;
+</p>
+<p>@* <br>
+@ followed by a space
+&nbsp;
+@ followed by a tab
+&nbsp;
+@ followed by a new line
+&nbsp;<code>@-</code>
+<code>@|</code>
+<code>@:</code>
+<code>@!</code> !
+<code>@?</code> ?
+<code>@.</code> .
+<code>@@</code> @
+<code>@}</code> }
+<code>@{</code> {
+<code>@/</code>
+</p>
+<p>foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+</p>
+<p>@TeX TeX
+@LaTeX LaTeX
+@bullet &bull;
+@copyright &copy;
+@dots &hellip;
+@enddots <small class="enddots">...</small>
+@equiv &equiv;
+@error error&rarr;
+@expansion &rarr;
+@minus -
+@point &lowast;
+@print -|
+@result &rArr;
+@today a sunny day
+@aa &aring;
+@AA &Aring;
+@ae &aelig;
+@oe &oelig;
+@AE &AElig;
+@OE &OElig;
+@o &oslash;
+@O &Oslash;
+@ss &szlig;
+@l &#322;
+@L &#321;
+@DH &ETH;
+@TH &THORN;
+@dh &eth;
+@th &thorn;
+@exclamdown &iexcl;
+@questiondown &iquest;
+@pounds &pound;
+@registeredsymbol &reg;
+@ordf &ordf;
+@ordm &ordm;
+@comma ,
+@quotedblleft &ldquo;
+@quotedblright &rdquo;
+@quoteleft &lsquo;
+@quoteright &rsquo;
+@quotedblbase &bdquo;
+@quotesinglbase &sbquo;
+@guillemetleft &laquo;
+@guillemetright &raquo;
+@guillemotleft &laquo;
+@guillemotright &raquo;
+@guilsinglleft &lsaquo;
+@guilsinglright &rsaquo;
+@textdegree &deg;
+@euro &euro;
+@arrow &rarr;
+@leq &le;
+@geq &ge;
+</p>
+<p><code>@acronym{--a,an accronym}</code> <acronym title="an accronym">&ndash;a</acronym> (an accronym)
+<code>@acronym{--a}</code> <acronym title="an accronym">&ndash;a</acronym>
+<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr title="&Eacute;tude Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude Autonome)
+<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="&Eacute;tude Autonome">&Eacute;&ndash;. ,A.</abbr>
+<code>@asis{--a}</code> &ndash;a
+<code>@b{--a}</code> <b>&ndash;a</b>
+<code>@cite{--a}</code> <cite>&ndash;a</cite>
+<code>@code{--a}</code> <code>--a</code>
+<code>@command{--a}</code> <code>--a</code>
+<code>@dfn{--a}</code> <em>&ndash;a</em>
+<code>@dmn{--a}</code> &ndash;a
+<code>@email{--a,--b}</code> <a href="mailto:--a">&ndash;b</a>
+<code>@email{,--b}</code> &ndash;b
+<code>@email{--a}</code> <a href="mailto:--a">--a</a>
+<code>@emph{--a}</code> <em>&ndash;a</em>
+<code>@env{--a}</code> <code>--a</code>
+<code>@file{--a}</code> <samp>--a</samp>
+<code>@i{--a}</code> <i>&ndash;a</i>
+<code>@kbd{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> <tt class="key">--a</tt>
+<code>@math{--a {\frac{1}{2}} @minus{}}</code>
+<code>@option{--a}</code> <samp>--a</samp>
+<code>@r{--a}</code> <span class="roman">&ndash;a</span>
+<code>@samp{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
+<code>@sc{--a}</code> <small>&ndash;A</small>
+<code>@strong{--a}</code> <strong>&ndash;a</strong>
+<code>@t{--a}</code> <tt>--a</tt>
+<code>@sansserif{--a}</code> <span class="sansserif">&ndash;a</span>
+<code>@slanted{--a}</code> <i>&ndash;a</i>
+<code>@titlefont{--a}</code> </p><h1 class="titlefont">&ndash;a</h1>
+<p><code>@indicateurl{--a}</code> &lsquo;<code>--a</code>&rsquo;
+<code>@uref{--a,--b}</code> <a href="--a">&ndash;b</a>
+<code>@uref{--a}</code> <a href="--a">--a</a>
+<code>@uref{,--b}</code> &ndash;b
+<code>@uref{--a,--b,--c}</code> <a href="--a">&ndash;c</a>
+<code>@uref{,--b,--c}</code> &ndash;c
+<code>@uref{--a,,--c}</code> <a href="--a">&ndash;c</a>
+<code>@uref{,,--c}</code> &ndash;c
+<code>@url{--a,--b}</code> <a href="--a">&ndash;b</a>
+<code>@url{--a,}</code> <a href="--a">--a</a>
+<code>@url{,--b}</code> &ndash;b
+<code>@var{--a}</code> <var>&ndash;a</var>
+<code>@verb{:--a:}</code> <tt>--a</tt>
+<code>@verb{:a &lt; &amp; @ % &quot; -- b:}</code> <tt>a &lt; &amp; @ % &quot; -- b</tt>
+<code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}</code> a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a&nbsp;a<!-- /@w -->
+<code>@H{a}</code> a''
+<code>@H{--a}</code> &ndash;a''
+<code>@dotaccent{a}</code> &#551;
+<code>@dotaccent{--a}</code> &ndash;a.
+<code>@ringaccent{a}</code> &aring;
+<code>@ringaccent{--a}</code> &ndash;a*
+<code>@tieaccent{a}</code> a[
+<code>@tieaccent{--a}</code> &ndash;a[
+<code>@u{a}</code> &#259;
+<code>@u{--a}</code> &ndash;a(
+<code>@ubaraccent{a}</code> a_
+<code>@ubaraccent{--a}</code> &ndash;a_
+<code>@udotaccent{a}</code> &#7841;
+<code>@udotaccent{--a}</code> .&ndash;a
+<code>@v{a}</code> &#462;
+<code>@v{--a}</code> &ndash;a&lt;
+<code>@,{c}</code> &ccedil;
+<code>@,{--c}</code> &ndash;c,
+<code>@ogonek{a}</code> &#261;
+<code>@ogonek{--a}</code> &ndash;a;
+<code>@footnote{in footnote}</code> <a id="DOCF5" href="sing_fot.htm#FOOT5"><sup>3</sup></a>
+<code>@footnote{in footnote2}</code> <a id="DOCF6" href="sing_fot.htm#FOOT6"><sup>4</sup></a>
+</p>
+<p><code>@image{f--ile}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile">
+<code>@image{f--ile,,,alt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.e--xt" alt="f--ile">
+<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.e--xt" alt="alt">
+<code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a&ndash;lt">
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}</code> <img src="f--ile@..file ext e--xt}" alt="alt">
+</p>
+<br>
+<br>
+
+<p><code>@clicksequence{click @click{} A}</code> click &rarr; A
+After clickstyle &rArr;
+<code>@clicksequence{click @click{} A}</code> click &rArr; A
+</p>
+<blockquote>
+<p>A quot&mdash;ation
+</p></blockquote>
+
+<blockquote>
+<p><b>Note:</b> A Note
+</p></blockquote>
+
+<blockquote>
+<p><b>note:</b> A note
+</p></blockquote>
+
+<blockquote>
+<p><b>Caution:</b> Caution
+</p></blockquote>
+
+<blockquote>
+<p><b>Important:</b> Important
+</p></blockquote>
+
+<blockquote>
+<p><b>Tip:</b> a Tip
+</p></blockquote>
+
+<blockquote>
+<p><b>Warning:</b> a Warning.
+</p></blockquote>
+
+<blockquote>
+<p><b>something &eacute; TeX:</b> The something &eacute; TeX is here.
+</p></blockquote>
+
+<blockquote>
+<p><b>@ at the end of line &nbsp;:</b> A @ at the end of the @quotation line.
+</p></blockquote>
+
+<blockquote>
+<p><b>something, other thing:</b> something, other thing
+</p></blockquote>
+
+<blockquote>
+<p><b>Note, the note:</b> Note, the note
+</p></blockquote>
+
+<blockquote>
+</blockquote>
+
+<blockquote>
+</blockquote>
+
+<blockquote>
+</blockquote>
+
+<blockquote>
+</blockquote>
+
+<blockquote>
+<p>A small quot&mdash;ation
+</p></blockquote>
+
+<blockquote>
+<p><b>Note:</b> A small Note
+</p></blockquote>
+
+<blockquote>
+<p><b>something, other thing:</b> something, other thing
+</p></blockquote>
+
+<ul>
+<li> i&ndash;temize
+</li></ul>
+
+<ul class="no-bullet">
+<li>+ i&ndash;tem +
+</li></ul>
+
+<ul>
+<li> b&ndash;ullet
+</li></ul>
+
+<ul class="no-bullet">
+<li>- minu&ndash;s
+</li></ul>
+
+<ul class="no-bullet">
+<li> e&ndash;mph item
+</li></ul>
+
+<ul class="no-bullet">
+<li><em>after emph</em> e&ndash;mph item
+</li></ul>
+
+<ul class="no-bullet">
+<li>&bull; a&ndash;n itemize line <span id="index-index-entry-within-itemize"></span>
+i&ndash;tem 1
+</li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
+</li></ul>
+
+<ol>
+<li> e&ndash;numerate
+</li></ol>
+
+<table>
+<thead><tr><th width="40%">mu&ndash;ltitable headitem</th><th width="60%">another tab</th></tr></thead>
+<tr><td width="40%">mu&ndash;ltitable item</td><td width="60%">multitable tab</td></tr>
+<tr><td width="40%">mu&ndash;ltitable item 2</td><td width="60%">multitable tab 2
+<span id="index-index-entry-within-multitable"></span></td></tr>
+<tr><td width="40%">lone mu&ndash;ltitable item</td></tr>
+</table>
+
+<table>
+<tr><td>truc</td><td>bidule</td></tr>
+</table>
+
+<div class="example">
+<pre class="example">e--xample some
+ text
+</pre></div>
+
+<div class="example">
+<pre class="example">s--mallexample
+</pre></div>
+
+<div class="display">
+<pre class="display">d&ndash;isplay
+</pre></div>
+
+<div class="display">
+<pre class="display">s&ndash;malldisplay
+</pre></div>
+
+<div class="lisp">
+<pre class="lisp">l--isp
+</pre></div>
+
+<div class="lisp">
+<pre class="lisp">s--malllisp
+</pre></div>
+
+<div class="format">
+<pre class="format">f&ndash;ormat
+</pre></div>
+
+<div class="format">
+<pre class="format">s&ndash;mallformat
+</pre></div>
+
+<dl>
+<dt id="index-d_002d_002deffn_005fname">c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;effn
+</p></dd></dl>
+
+<dl>
+<dt id="index-de_002d_002dffn_005fname">cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args <br> even more so</em></dt>
+<dd><p>def&ndash;fn
+</p></dd></dl>
+
+<dl>
+<dt id="index-i">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dd><span id="index-index-entry-within-deffn"></span>
+</dd><dt id="index-truc">cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-log-trap">Command: <strong>log trap</strong> <em></em></dt>
+<dt id="index-log-trap1">Command: <strong>log trap1</strong> <em></em></dt>
+<dt id="index-log-trap2">Command: <strong>log trap2</strong> <em></em></dt>
+<dt id="index-id-ule">cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
+<dt id="index-id-i-ule">cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
+<dt><b>id &lsquo;<samp>i</samp>&rsquo; ule</b>: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt>aaa: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt id="index-machin">: <strong>machin</strong></dt>
+<dt id="index-bidule-machin">: <strong>bidule machin</strong></dt>
+<dt id="index-machin-1">truc: <strong>machin</strong></dt>
+<dt>truc: <strong></strong></dt>
+<dt id="index-followed">truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt>truc: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt id="index-a-1">truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
+<dt id="index-deffnx">truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
+</dl>
+
+<dl>
+<dt id="index-deffn">empty: <strong>deffn</strong></dt>
+</dl>
+
+<dl>
+<dt id="index-deffn-1">empty: <strong>deffn</strong> <em>with deffnx</em></dt>
+<dt id="index-deffnx-1">empty: <strong>deffnx</strong></dt>
+</dl>
+
+<dl>
+<dt id="index-i-1">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dt id="index-truc-1">cmde: <strong>truc</strong> <em></em></dt>
+<dd><p>text in def item for second def item
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defvr_005fname">c--ategory: <strong>d--efvr_name</strong></dt>
+<dd><p>d&ndash;efvr
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002deftypefn_005fname">c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;eftypefn
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass">c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;eftypeop
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002deftypevr_005fname">c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
+<dd><p>d&ndash;eftypevr
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defcv_005fname">c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
+<dd><p>d&ndash;efcv
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defop_005fname-on-c_002d_002dlass">c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efop
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002deftp_005fname">c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
+<dd><p>d&ndash;eftp
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defun_005fname">Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efun
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defmac_005fname">Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efmac
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defspec_005fname">Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efspec
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defvar_005fname">Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
+<dd><p>d&ndash;efvar
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defopt_005fname">User Option: <strong>d--efopt_name</strong></dt>
+<dd><p>d&ndash;efopt
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002deftypefun_005fname">Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;eftypefun
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002deftypevar_005fname">Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
+<dd><p>d&ndash;eftypevar
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defivar_005fname-of-c_002d_002dlass">Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
+<dd><p>d&ndash;efivar
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass">Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
+<dd><p>d&ndash;eftypeivar
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass">Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;efmethod
+</p></dd></dl>
+
+<dl>
+<dt id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass">Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
+<dd><p>d&ndash;eftypemethod
+</p></dd></dl>
+
+<p><code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}</code> See <a href="../file n---ame@/c_002d_002d_002dhapter_0040.html#c_002d_002d_002dhapter_0040">t&mdash;itle@</a> in <cite>ma&mdash;nual@</cite>.
+<code>@ref{chapter, cross ref name, title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+</p>
+<p><code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
+</p>
+<p><code>@ref{s--ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
+<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
+</p>
+<p><code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
+<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
+<code>@ref{chapter,,,,manual}</code> &lsquo;chapter&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
+<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+<code>@ref{chapter,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
+<code>@ref{chapter,cross ref name,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{chapter,,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
+<code>@ref{chapter,,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{chapter,,,file name,manual}</code> <a href="../file name/chapter.html#chapter">chapter</a> in <cite>manual</cite>
+</p>
+
+<p><code>@ref{(pman)anode,cross ref name}</code> <a href="../pman/anode.html#anode">(pman)cross ref name</a>
+<code>@ref{(pman)anode,,title}</code> <a href="../pman/anode.html#anode">(pman)title</a>
+<code>@ref{(pman)anode,,,file name}</code> <a href="../file name/anode.html#anode">(file name)anode</a>
+<code>@ref{(pman)anode,,,,manual}</code> <a href="../pman/anode.html#anode">anode</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title,}</code> <a href="../pman/anode.html#anode">(pman)title</a>
+<code>@ref{(pman)anode,cross ref name,,file name}</code> <a href="../file name/anode.html#anode">(file name)cross ref name</a>
+<code>@ref{(pman)anode,cross ref name,,,manual}</code> <a href="../pman/anode.html#anode">cross ref name</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title,file name}</code> <a href="../file name/anode.html#anode">(file name)title</a>
+<code>@ref{(pman)anode,cross ref name,title,,manual}</code> <a href="../pman/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title, file name, manual}</code> <a href="../file name/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,title,file name}</code> <a href="../file name/anode.html#anode">(file name)title</a>
+<code>@ref{(pman)anode,,title,,manual}</code> <a href="../pman/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,title, file name, manual}</code> <a href="../file name/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,,file name,manual}</code> <a href="../file name/anode.html#anode">anode</a> in <cite>manual</cite>
+</p>
+
+<p><code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+<code>@inforef{chapter}</code> See &lsquo;chapter&rsquo;
+<code>@inforef{chapter, cross ref name}</code> See &lsquo;cross ref name&rsquo;
+<code>@inforef{chapter,,file name}</code> See <a href="../file name/chapter.html#chapter">(file name)chapter</a>
+<code>@inforef{node, cross ref name, file name}</code> See <a href="../file name/node.html#node">(file name)cross ref name</a>
+<code>@inforef{node}</code> See &lsquo;node&rsquo;
+<code>@inforef{node, cross ref name}</code> See &lsquo;cross ref name&rsquo;
+<code>@inforef{node,,file name}</code> See <a href="../file name/node.html#node">(file name)node</a>
+<code>@inforef{chapter, cross ref name, file name, spurious arg}</code> See <a href="../file name, spurious arg/chapter.html#chapter">(file name, spurious arg)cross ref name</a>
+</p>
+<p><code>@inforef{s--ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}</code>
+See <a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
+ref</a>
+</p>
+
+<dl compact="compact">
+<dt>a</dt>
+<dd><p>l&ndash;ine
+</p></dd>
+</dl>
+
+<dl compact="compact">
+<dt>a
+<span id="index-a-6"></span>
+</dt>
+<dt>b
+<span id="index-b-2"></span>
+</dt>
+<dd><p>l&ndash;ine
+</p></dd>
+</dl>
+
+<dl compact="compact">
+<dt>a
+<span id="index-a-2"></span>
+</dt>
+<dd><span id="index-index-entry-between-item-and-itemx"></span>
+</dd>
+<dt>b
+<span id="index-b"></span>
+</dt>
+<dd><p>l&ndash;ine
+</p></dd>
+</dl>
+
+<table class="cartouche" border="1"><tr><td>
+<p>c&ndash;artouche
+</p></td></tr></table>
+
+<p>g&ndash;roupe
+</p>
+<p align="left">f&ndash;lushleft
+</p>
+<p align="right">f&ndash;lushright
+</p>
+<div align="center">ce&ndash;ntered line
+</div>
+<pre class="verbatim">\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ &lt;&gt;.
+
+@bye
+</pre>
+<pre class="verbatim">in verbatim ''
+</pre>
+
+html ''
+
+
+ <center class="math-display" >
+<img
+src="sing_tex4ht_tex2x.png" alt="&#x2202;t&#x03B7;(t) = g(&#x03B7;(t),&#x03C6;(t)) " class="math-display" ></center> &#8221;
+
+
+<span id="majorheading-1"></span><h1 class="majorheading">majorheading</h1>
+
+<span id="chapheading-1"></span><h1 class="chapheading">chapheading</h1>
+
+<span id="heading-1"></span><h2 class="heading">heading</h2>
+
+<span id="subheading-1"></span><h3 class="subheading">subheading</h3>
+
+<span id="subsubheading-1"></span><h4 class="subsubheading">subsubheading</h4>
+
+
+<p><code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an accronym , ...">&ndash;a</acronym> (an accronym , <small class="enddots">...</small>)
+<code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr> (&Eacute;tude&ndash;, <b>Autonome</b>)
+<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="&Eacute;tude&ndash;, Autonome">&Eacute;&ndash;. ,A.</abbr>
+</p>
+<p><code>@math{--a@minus{} {\frac{1}{2}}}</code>
+</p>
+<p><code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img src="f-ile.jpg" alt="altjk _&quot; %@">
+<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&quot; %@ in b &quot;">
+<code>@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img src="filejk _&quot; %@.jpg" alt="altjk _&quot; %@">
+</p>
+
+
+
+<p>Somehow invalid use of @,:<br>
+@, ,
+<br>
+@,@&quot;u ,&uuml;
+</p>
+<p>Invalid use of @&rsquo;:<br>
+@&rsquo; '
+<br>
+@&rsquo;@&quot;u '&uuml;
+</p>
+<p>@dotless{truc} truc
+@dotless{ij} ij
+<code>@dotless{--a}</code> &ndash;a
+<code>@dotless{a}</code> a
+</p>
+<p>@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg &#xz;
+@U{abc}, with &lt;4 hex digits &#xabc;
+@U{FFFFFFFFFFFFFF}, value much too large &#xFFFFFFFFFFFFFF;
+@U{110000}, value just beyond Unicode &#x110000;
+</p>
+<p>@TeX, but without brace TeX<code>@#</code> #
+</p>
+<p><code>@w{--a}</code> &ndash;a<!-- /@w -->
+</p>
+<p><code>@image{,1--xt}</code>
+<code>@image{,,2--xt}</code>
+<code>@image{,,,3--xt}</code>
+</p>
+
+<ul class="no-bullet">
+<li> after emph e&ndash;mph item
+</li></ul>
+
+<ul class="no-bullet">
+<li>&bull; a&ndash;n itemize line i&ndash;tem 1
+</li><li>&bull; a&ndash;n itemize line i&ndash;tem 2
+</li></ul>
+
+<dl>
+<dt>fun: <strong></strong></dt>
+<dt id="index-machin-2">truc: <strong>machin</strong> <em>bidule chose and</em></dt>
+<dt id="index-machin-3">truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
+<dt id="index-machin-4">truc: <strong>machin</strong> <em>bidule chose and </em></dt>
+<dt id="index-machin-5">truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
+<dt id="index-followed-1">truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dd><p>Various deff lines
+</p></dd><dt id="index-after">truc: <strong>after</strong> <em>a deff item</em></dt>
+</dl>
+
+<p><code>@ref{node}</code> &lsquo;node&rsquo;
+</p>
+<p><code>@ref{,cross ref name}</code> &lsquo;cross ref name&rsquo;
+<code>@ref{,,title}</code> &lsquo;title&rsquo;
+<code>@ref{,,,file name}</code> <a href="../file name/index.html">(file name)</a>
+<code>@ref{,,,,manual}</code> <cite>manual</cite>
+<code>@ref{node,cross ref name}</code> &lsquo;cross ref name&rsquo;
+<code>@ref{node,,title}</code> &lsquo;title&rsquo;
+<code>@ref{node,,,file name}</code> <a href="../file name/node.html#node">(file name)node</a>
+<code>@ref{node,,,,manual}</code> &lsquo;node&rsquo; in <cite>manual</cite>
+<code>@ref{node,cross ref name,title,}</code> &lsquo;title&rsquo;
+<code>@ref{node,cross ref name,,file name}</code> <a href="../file name/node.html#node">(file name)cross ref name</a>
+<code>@ref{node,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
+<code>@ref{node,cross ref name,title,file name}</code> <a href="../file name/node.html#node">(file name)title</a>
+<code>@ref{node,cross ref name,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{node,cross ref name,title, file name, manual}</code> <a href="../file name/node.html#node">title</a> in <cite>manual</cite>
+<code>@ref{node,,title,file name}</code> <a href="../file name/node.html#node">(file name)title</a>
+<code>@ref{node,,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{chapter,,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{node,,title, file name, manual}</code> <a href="../file name/node.html#node">title</a> in <cite>manual</cite>
+<code>@ref{node,,,file name,manual}</code> <a href="../file name/node.html#node">node</a> in <cite>manual</cite>
+<code>@ref{,cross ref name,title,}</code> &lsquo;title&rsquo;
+<code>@ref{,cross ref name,,file name}</code> <a href="../file name/index.html">(file name)cross ref name</a>
+<code>@ref{,cross ref name,,,manual}</code> &lsquo;cross ref name&rsquo; in <cite>manual</cite>
+<code>@ref{,cross ref name,title,file name}</code> <a href="../file name/index.html">(file name)title</a>
+<code>@ref{,cross ref name,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{,cross ref name,title, file name, manual}</code> <a href="../file name/index.html">title</a> in <cite>manual</cite>
+<code>@ref{,,title,file name}</code> <a href="../file name/index.html">(file name)title</a>
+<code>@ref{,,title,,manual}</code> &lsquo;title&rsquo; in <cite>manual</cite>
+<code>@ref{,,title, file name, manual}</code> <a href="../file name/index.html">title</a> in <cite>manual</cite>
+<code>@ref{,,,file name,manual}</code> <cite><a href="../file name/index.html">manual</a></cite>
+</p>
+<p><code>@inforef{,cross ref name }</code> See &lsquo;cross ref name&rsquo;
+<code>@inforef{,,file name}</code> See <a href="../file name/index.html">(file name)</a>
+<code>@inforef{,cross ref name, file name}</code> See <a href="../file name/index.html">(file name)cross ref name</a>
+<code>@inforef{}</code>
+</p>
+
+
+<p>In example.
+</p><div class="example">
+<pre class="example">
+
+&lt;
+&gt;
+&quot;
+&amp;
+'
+`
+
+``simple-double--three---four----''
+
+code: <code>``simple-double--three---four----''</code>
+
+asis: ``simple-double--three---four----''
+
+strong: <strong>``simple-double--three---four----''</strong>
+
+kbd: <kbd>``simple-double--three---four----''</kbd>
+
+
+`<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
+
+
+<span id="index-_002d_002doption-1"></span><span id="index-_0060_0060-1"></span><span id="index-_0060_0060-3"></span><span id="index-_002d_002dfoption-1"></span>
+@&quot;u &uuml;
+@&quot;{U} &Uuml;
+@~n &ntilde;
+@^a &acirc;
+@'e &eacute;
+@=o &#333;
+@`i &igrave;
+@'{e} &eacute;
+@'{@dotless{i}} &iacute;
+@dotless{i} i
+@dotless{j} j
+@`{@=E} &#274;`
+@l{} &#322;
+@,{@'C} &#262;,
+@,c &ccedil;
+@,c@&quot;u &ccedil;&uuml;
+
+
+@U{0075} &#x0075;
+
+@*
+
+@ followed by a space
+&nbsp;
+@ followed by a tab
+&nbsp;
+@ followed by a new line
+&nbsp;<code>@-</code>
+<code>@|</code>
+<code>@:</code>
+<code>@!</code> !
+<code>@?</code> ?
+<code>@.</code> .
+<code>@@</code> @
+<code>@}</code> }
+<code>@{</code> {
+<code>@/</code>
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet &bull;
+@copyright &copy;
+@dots &hellip;
+@enddots ...
+@equiv &equiv;
+@error error&rarr;
+@expansion &rarr;
+@minus -
+@point &lowast;
+@print -|
+@result &rArr;
+@today a sunny day
+@aa &aring;
+@AA &Aring;
+@ae &aelig;
+@oe &oelig;
+@AE &AElig;
+@OE &OElig;
+@o &oslash;
+@O &Oslash;
+@ss &szlig;
+@l &#322;
+@L &#321;
+@DH &ETH;
+@TH &THORN;
+@dh &eth;
+@th &thorn;
+@exclamdown &iexcl;
+@questiondown &iquest;
+@pounds &pound;
+@registeredsymbol &reg;
+@ordf &ordf;
+@ordm &ordm;
+@comma ,
+@quotedblleft &ldquo;
+@quotedblright &rdquo;
+@quoteleft &lsquo;
+@quoteright &rsquo;
+@quotedblbase &bdquo;
+@quotesinglbase &sbquo;
+@guillemetleft &laquo;
+@guillemetright &raquo;
+@guillemotleft &laquo;
+@guillemotright &raquo;
+@guilsinglleft &lsaquo;
+@guilsinglright &rsaquo;
+@textdegree &deg;
+@euro &euro;
+@arrow &rarr;
+@leq &le;
+@geq &ge;
+
+<code>@acronym{--a,an accronym}</code> <acronym title="an accronym">--a</acronym> (an accronym)
+<code>@acronym{--a}</code> <acronym title="an accronym">--a</acronym>
+<code>@abbr{@'E--. @comma{}A., @'Etude Autonome }</code> <abbr title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude Autonome)
+<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="&Eacute;tude Autonome">&Eacute;--. ,A.</abbr>
+<code>@asis{--a}</code> --a
+<code>@b{--a}</code> <b>&ndash;a</b>
+<code>@cite{--a}</code> <cite>--a</cite>
+<code>@code{--a}</code> <code>--a</code>
+<code>@command{--a}</code> <code>--a</code>
+<code>@dfn{--a}</code> <em>--a</em>
+<code>@dmn{--a}</code> --a
+<code>@email{--a,--b}</code> <a href="mailto:--a">--b</a>
+<code>@email{,--b}</code> --b
+<code>@email{--a}</code> <a href="mailto:--a">--a</a>
+<code>@emph{--a}</code> <em>--a</em>
+<code>@env{--a}</code> <code>--a</code>
+<code>@file{--a}</code> <samp>--a</samp>
+<code>@i{--a}</code> <i>&ndash;a</i>
+<code>@kbd{--a}</code> <kbd>--a</kbd>
+<code>@key{--a}</code> <span class="key">--a</span>
+<code>@math{--a {\frac{1}{2}} @minus{}}</code>
+<code>@option{--a}</code> <samp>--a</samp>
+<code>@r{--a}</code> <span class="roman">&ndash;a</span>
+<code>@samp{--a}</code> &lsquo;<samp>--a</samp>&rsquo;
+<code>@sc{--a}</code> --A
+<code>@strong{--a}</code> <strong>--a</strong>
+<code>@t{--a}</code> <tt>--a</tt>
+<code>@sansserif{--a}</code> <span class="sansserif">&ndash;a</span>
+<code>@slanted{--a}</code> <i>&ndash;a</i>
+<code>@titlefont{--a}</code> </pre><h1 class="titlefont">--a</h1><pre class="example">
+
+<code>@indicateurl{--a}</code> &lsquo;<code>--a</code>&rsquo;
+<code>@uref{--a,--b}</code> <a href="--a">--b</a>
+<code>@uref{--a}</code> <a href="--a">--a</a>
+<code>@uref{,--b}</code> --b
+<code>@uref{--a,--b,--c}</code> <a href="--a">--c</a>
+<code>@uref{,--b,--c}</code> --c
+<code>@uref{--a,,--c}</code> <a href="--a">--c</a>
+<code>@uref{,,--c}</code> --c
+<code>@url{--a,--b}</code> <a href="--a">--b</a>
+<code>@url{--a,}</code> <a href="--a">--a</a>
+<code>@url{,--b}</code> --b
+<code>@var{--a}</code> <var>--a</var>
+<code>@verb{:--a:}</code> <tt>--a</tt>
+<code>@verb{:a &lt; &amp; @ % &quot; -- b:}</code> <tt>a &lt; &amp; @ % &quot; -- b</tt>
+<code>@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a}</code> a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a<!-- /@w -->
+<code>@H{a}</code> a''
+<code>@H{--a}</code> --a''
+<code>@dotaccent{a}</code> &#551;
+<code>@dotaccent{--a}</code> --a.
+<code>@ringaccent{a}</code> &aring;
+<code>@ringaccent{--a}</code> --a*
+<code>@tieaccent{a}</code> a[
+<code>@tieaccent{--a}</code> --a[
+<code>@u{a}</code> &#259;
+<code>@u{--a}</code> --a(
+<code>@ubaraccent{a}</code> a_
+<code>@ubaraccent{--a}</code> --a_
+<code>@udotaccent{a}</code> &#7841;
+<code>@udotaccent{--a}</code> .--a
+<code>@v{a}</code> &#462;
+<code>@v{--a}</code> --a&lt;
+<code>@,{c}</code> &ccedil;
+<code>@,{--c}</code> --c,
+<code>@ogonek{a}</code> &#261;
+<code>@ogonek{--a}</code> --a;
+<code>@footnote{in footnote}</code> <a id="DOCF7" href="sing_fot.htm#FOOT7">(5)</a>
+<code>@footnote{in footnote2}</code> <a id="DOCF8" href="sing_fot.htm#FOOT8">(6)</a>
+
+<code>@image{f--ile}</code> [ f--ile ]
+<code>@image{f--ile,l--i}</code> [ f--ile ]
+<code>@image{f--ile,,l--e}</code> [ f--ile ]
+<code>@image{f--ile,,,alt}</code> [ alt ]
+<code>@image{f--ile,,,,e-d-xt}</code> [ f--ile ]
+<code>@image{f--ile,aze,az,alt,e--xt}</code> [ alt ]
+<code>@image{f-ile,aze,,a--lt}</code> [ a--lt ]
+<code>@image{@file{f--ile}@@@.,aze,az,alt,@file{file ext} e--xt@}</code> [ alt ]
+
+
+
+
+<code>@clicksequence{click @click{} A}</code> click &rarr; A
+After clickstyle &rArr;
+<code>@clicksequence{click @click{} A}</code> click &rArr; A
+
+</pre><blockquote>
+<pre class="example">A quot---ation
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>Note:</b> A Note
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>note:</b> A note
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>Caution:</b> Caution
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>Important:</b> Important
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>Tip:</b> a Tip
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>Warning:</b> a Warning.
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>something &eacute; TeX:</b> The something &eacute; TeX is here.
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>@ at the end of line &nbsp;:</b> A @ at the end of the @quotation line.
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>something, other thing:</b> something, other thing
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>Note, the note:</b> Note, the note
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+</blockquote>
+<pre class="example">
+
+</pre><blockquote>
+</blockquote>
+<pre class="example">
+
+</pre><blockquote>
+</blockquote>
+<pre class="example">
+
+</pre><blockquote>
+</blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example">A small quot---ation
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>Note:</b> A small Note
+</pre></blockquote>
+<pre class="example">
+
+</pre><blockquote>
+<pre class="example"><b>something, other thing:</b> something, other thing
+</pre></blockquote>
+<pre class="example">
+
+</pre><ul>
+<li> <pre class="example">i--temize
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li>+ <pre class="example">i--tem +
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul>
+<li> <pre class="example">b--ullet
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li>- <pre class="example">minu--s
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li> <pre class="example">e--mph item
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li><em>after emph</em> <pre class="example">e--mph item
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li>&bull; a&ndash;n itemize line <pre class="example"><span id="index-index-entry-within-itemize-1"></span>i--tem 1
+</pre></li><li>&bull; a&ndash;n itemize line <pre class="example">i--tem 2
+</pre></li></ul>
+<pre class="example">
+
+</pre><ol>
+<li> <pre class="example">e--numerate
+</pre></li></ol>
+<pre class="example">
+
+</pre><table>
+<thead><tr><th width="40%"><pre class="example">mu--ltitable headitem</pre></th><th width="60%"><pre class="example">another tab</pre></th></tr></thead>
+<tr><td width="40%"><pre class="example">mu--ltitable item</pre></td><td width="60%"><pre class="example">multitable tab</pre></td></tr>
+<tr><td width="40%"><pre class="example">mu--ltitable item 2</pre></td><td width="60%"><pre class="example">multitable tab 2
+<span id="index-index-entry-within-multitable-1"></span></pre></td></tr>
+<tr><td width="40%"><pre class="example">lone mu--ltitable item</pre></td></tr>
+</table>
+<pre class="example">
+
+</pre><table>
+<tr><td><pre class="example">truc</pre></td><td><pre class="example">bidule</pre></td></tr>
+</table>
+<pre class="example">
+
+</pre><div class="example">
+<pre class="example">e--xample some
+ text
+</pre></div>
+<pre class="example">
+
+</pre><div class="example">
+<pre class="example">s--mallexample
+</pre></div>
+<pre class="example">
+
+</pre><div class="display">
+<pre class="example">d--isplay
+</pre></div>
+<pre class="example">
+
+</pre><div class="display">
+<pre class="example">s--malldisplay
+</pre></div>
+<pre class="example">
+
+</pre><div class="lisp">
+<pre class="lisp">l--isp
+</pre></div>
+<pre class="example">
+
+</pre><div class="lisp">
+<pre class="lisp">s--malllisp
+</pre></div>
+<pre class="example">
+
+</pre><div class="format">
+<pre class="example">f--ormat
+</pre></div>
+<pre class="example">
+
+</pre><div class="format">
+<pre class="example">s--mallformat
+</pre></div>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deffn_005fname-1">c--ategory: <strong>d--effn_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--effn
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-de_002d_002dffn_005fname-1">cate--gory: <strong>de--ffn_name</strong> <em>ar--guments more args
+ even more so</em></dt>
+<dd><pre class="example">def--fn
+</pre></dd></dl>
+<pre class="example">
+</pre><dl>
+<dt id="index-i-2">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dd><pre class="example"><span id="index-index-entry-within-deffn-1"></span></pre></dd><dt id="index-truc-2">cmde: <strong>truc</strong> <em></em></dt>
+<dt id="index-log-trap-1">Command: <strong>log trap</strong> <em></em></dt>
+<dt id="index-log-trap1-1">Command: <strong>log trap1</strong> <em></em></dt>
+<dt id="index-log-trap2-1">Command: <strong>log trap2</strong> <em></em></dt>
+<dt id="index-id-ule-1">cmde: <strong><b>id ule</b></strong> <em>truc</em></dt>
+<dt id="index-id-i-ule-1">cmde2: <strong><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
+<dt><b>id &lsquo;<samp>i</samp>&rsquo; ule</b>: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt>aaa: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt id="index-machin-6">: <strong>machin</strong></dt>
+<dt id="index-bidule-machin-1">: <strong>bidule machin</strong></dt>
+<dt id="index-machin-7">truc: <strong>machin</strong></dt>
+<dt>truc: <strong></strong></dt>
+<dt id="index-followed-2">truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dt>truc: <strong></strong></dt>
+<dt>: <strong></strong></dt>
+<dt id="index-a-3">truc: <strong>a</strong> <em>b c d e <b>f g</b> h i</em></dt>
+<dt id="index-deffnx-2">truc: <strong>deffnx</strong> <em>before end deffn</em></dt>
+</dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-deffn-2">empty: <strong>deffn</strong></dt>
+</dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-deffn-3">empty: <strong>deffn</strong> <em>with deffnx</em></dt>
+<dt id="index-deffnx-3">empty: <strong>deffnx</strong></dt>
+</dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-i-3">fset: <strong><var>i</var></strong> <em>a g</em></dt>
+<dt id="index-truc-3">cmde: <strong>truc</strong> <em></em></dt>
+<dd><pre class="example">text in def item for second def item
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defvr_005fname-1">c--ategory: <strong>d--efvr_name</strong></dt>
+<dd><pre class="example">d--efvr
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deftypefn_005fname-1">c--ategory: <em>t--ype</em> <strong>d--eftypefn_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--eftypefn
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1">c--ategory on c--lass: <em>t--ype</em> <strong>d--eftypeop_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--eftypeop
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deftypevr_005fname-1">c--ategory: <em>t--ype</em> <strong>d--eftypevr_name</strong></dt>
+<dd><pre class="example">d--eftypevr
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defcv_005fname-1">c--ategory of c--lass: <strong>d--efcv_name</strong></dt>
+<dd><pre class="example">d--efcv
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defop_005fname-on-c_002d_002dlass-1">c--ategory on c--lass: <strong>d--efop_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--efop
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deftp_005fname-1">c--ategory: <strong>d--eftp_name</strong> <em>a--ttributes...</em></dt>
+<dd><pre class="example">d--eftp
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defun_005fname-1">Function: <strong>d--efun_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--efun
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defmac_005fname-1">Macro: <strong>d--efmac_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--efmac
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defspec_005fname-1">Special Form: <strong>d--efspec_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--efspec
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defvar_005fname-1">Variable: <strong>d--efvar_name</strong> <em>argvar argvar1</em></dt>
+<dd><pre class="example">d--efvar
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defopt_005fname-1">User Option: <strong>d--efopt_name</strong></dt>
+<dd><pre class="example">d--efopt
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deftypefun_005fname-1">Function: <em>t--ype</em> <strong>d--eftypefun_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--eftypefun
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deftypevar_005fname-1">Variable: <em>t--ype</em> <strong>d--eftypevar_name</strong></dt>
+<dd><pre class="example">d--eftypevar
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1">Instance Variable of c--lass: <strong>d--efivar_name</strong></dt>
+<dd><pre class="example">d--efivar
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1">Instance Variable of c--lass: <em>t--ype</em> <strong>d--eftypeivar_name</strong></dt>
+<dd><pre class="example">d--eftypeivar
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1">Method on c--lass: <strong>d--efmethod_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--efmethod
+</pre></dd></dl>
+<pre class="example">
+
+</pre><dl>
+<dt id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1">Method on c--lass: <em>t--ype</em> <strong>d--eftypemethod_name</strong> <em>a--rguments...</em></dt>
+<dd><pre class="example">d--eftypemethod
+</pre></dd></dl>
+<pre class="example">
+
+<code>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, ma---nual@@}</code> See <a href="../file n---ame@/c_002d_002d_002dhapter_0040.html#c_002d_002d_002dhapter_0040">t---itle@</a> in <cite>ma---nual@</cite>.
+<code>@ref{chapter, cross ref name, title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@pxref{chapter, cross ref name, title, file name, manual}</code> see <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+
+<code>@ref{chapter}</code> <a href="chapter.html">chapter</a>
+<code>@xref{chapter}</code> See section <a href="chapter.html">chapter</a>.
+<code>@pxref{chapter}</code> see section <a href="chapter.html">chapter</a>
+<code>@ref{s--ect@comma{}ion}</code> <a href="s_002d_002dect_002cion.html">s--ect,ion</a>
+
+<code>@ref{s--ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }</code>
+<a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">a comma, in title</a> in <cite>a , in manual name</cite>
+
+<code>@ref{chapter,cross ref name}</code> <a href="chapter.html">cross ref name</a>
+<code>@ref{chapter,,title}</code> <a href="chapter.html">title</a>
+<code>@ref{chapter,,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)chapter</a>
+<code>@ref{chapter,,,,manual}</code> `chapter' in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title,}</code> <a href="chapter.html">title</a>
+<code>@ref{chapter,cross ref name,,file name}</code> <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+<code>@ref{chapter,cross ref name,,,manual}</code> `cross ref name' in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
+<code>@ref{chapter,cross ref name,title,,manual}</code> `title' in <cite>manual</cite>
+<code>@ref{chapter,cross ref name,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{chapter,,title,file name}</code> <a href="../file name/chapter.html#chapter">(file name)title</a>
+<code>@ref{chapter,,title,,manual}</code> `title' in <cite>manual</cite>
+<code>@ref{chapter,,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{chapter,,,file name,manual}</code> <a href="../file name/chapter.html#chapter">chapter</a> in <cite>manual</cite>
+
+
+<code>@ref{(pman)anode,cross ref name}</code> <a href="../pman/anode.html#anode">(pman)cross ref name</a>
+<code>@ref{(pman)anode,,title}</code> <a href="../pman/anode.html#anode">(pman)title</a>
+<code>@ref{(pman)anode,,,file name}</code> <a href="../file name/anode.html#anode">(file name)anode</a>
+<code>@ref{(pman)anode,,,,manual}</code> <a href="../pman/anode.html#anode">anode</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title,}</code> <a href="../pman/anode.html#anode">(pman)title</a>
+<code>@ref{(pman)anode,cross ref name,,file name}</code> <a href="../file name/anode.html#anode">(file name)cross ref name</a>
+<code>@ref{(pman)anode,cross ref name,,,manual}</code> <a href="../pman/anode.html#anode">cross ref name</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title,file name}</code> <a href="../file name/anode.html#anode">(file name)title</a>
+<code>@ref{(pman)anode,cross ref name,title,,manual}</code> <a href="../pman/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,cross ref name,title, file name, manual}</code> <a href="../file name/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,title,file name}</code> <a href="../file name/anode.html#anode">(file name)title</a>
+<code>@ref{(pman)anode,,title,,manual}</code> <a href="../pman/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,title, file name, manual}</code> <a href="../file name/anode.html#anode">title</a> in <cite>manual</cite>
+<code>@ref{(pman)anode,,,file name,manual}</code> <a href="../file name/anode.html#anode">anode</a> in <cite>manual</cite>
+
+
+<code>@inforef{chapter, cross ref name, file name}</code> See <a href="../file name/chapter.html#chapter">(file name)cross ref name</a>
+<code>@inforef{chapter}</code> See `chapter'
+<code>@inforef{chapter, cross ref name}</code> See `cross ref name'
+<code>@inforef{chapter,,file name}</code> See <a href="../file name/chapter.html#chapter">(file name)chapter</a>
+<code>@inforef{node, cross ref name, file name}</code> See <a href="../file name/node.html#node">(file name)cross ref name</a>
+<code>@inforef{node}</code> See `node'
+<code>@inforef{node, cross ref name}</code> See `cross ref name'
+<code>@inforef{node,,file name}</code> See <a href="../file name/node.html#node">(file name)node</a>
+<code>@inforef{chapter, cross ref name, file name, spurious arg}</code> See <a href="../file name, spurious arg/chapter.html#chapter">(file name, spurious arg)cross ref name</a>
+
+<code>@inforef{s--ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}</code>
+See <a href="../a comma, in file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
+ref</a>
+
+
+</pre><dl compact="compact">
+<dt><tt>a</tt></dt>
+<dd><pre class="example">l--ine
+</pre></dd>
+</dl>
+<pre class="example">
+
+</pre><dl compact="compact">
+<dt><tt>a</tt>
+<span id="index-a-7"></span>
+</dt>
+<dt><tt>b</tt>
+<span id="index-b-3"></span>
+</dt>
+<dd><pre class="example">l--ine
+</pre></dd>
+</dl>
+<pre class="example">
+
+</pre><dl compact="compact">
+<dt><tt>a</tt>
+<span id="index-a-4"></span>
+</dt>
+<dd><pre class="example"><span id="index-index-entry-between-item-and-itemx-1"></span></pre></dd>
+<dt><tt>b</tt>
+<span id="index-b-1"></span>
+</dt>
+<dd><pre class="example">l--ine
+</pre></dd>
+</dl>
+<pre class="example">
+
+</pre><table class="cartouche" border="1"><tr><td>
+<pre class="example">c--artouche
+</pre></td></tr></table>
+<pre class="example">
+
+</pre><pre class="example">g--roupe
+</pre><pre class="example">
+
+</pre><pre class="example">f--lushleft
+</pre><pre class="example">
+
+</pre><pre class="example">f--lushright
+</pre><pre class="example">
+
+</pre><div align="center">ce--ntered line
+</div><pre class="example">
+
+</pre><pre class="verbatim">\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ &lt;&gt;.
+
+@bye
+</pre><pre class="example">
+
+</pre><pre class="verbatim">in verbatim ''
+</pre><pre class="example">
+
+
+html ''
+
+
+ <center class="math-display" >
+<img
+src="sing_tex4ht_tex3x.png" alt="&#x2202; &#x03B7;(t) = g(&#x03B7;(t),&#x03C6;(t))
+ t " class="math-display" ></center> &#8221;
+
+
+
+</pre><span id="majorheading-2"></span><strong>majorheading</strong>
+<pre class="example">
+
+</pre><span id="chapheading-2"></span><strong>chapheading</strong>
+<pre class="example">
+
+</pre><span id="heading-2"></span><strong>heading</strong>
+<pre class="example">
+
+</pre><span id="subheading-2"></span><strong>subheading</strong>
+<pre class="example">
+
+</pre><span id="subsubheading-2"></span><strong>subsubheading</strong>
+<pre class="example">
+
+
+<code>@acronym{--a,an accronym @comma{} @enddots{}}</code> <acronym title="an accronym , ...">--a</acronym> (an accronym , ...)
+<code>@abbr{@'E--. @comma{}A., @'Etude--@comma{} @b{Autonome} }</code> <abbr title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr> (&Eacute;tude--, <b>Autonome</b>)
+<code>@abbr{@'E--. @comma{}A.}</code> <abbr title="&Eacute;tude&ndash;, Autonome">&Eacute;--. ,A.</abbr>
+
+<code>@math{--a@minus{} {\frac{1}{2}}}</code>
+
+<code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> [ alt<tt>jk _&quot; %@</tt> ]
+<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> [ <tt>jk _&quot; %@</tt> <b>in b &quot;</b> ]
+<code>@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> [ alt<tt>jk _&quot; %@</tt> ]
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@&quot;u ,&uuml;
+
+Invalid use of @':
+
+@' '
+
+
+@'@&quot;u '&uuml;
+
+@dotless{truc} truc
+@dotless{ij} ij
+<code>@dotless{--a}</code> --a
+<code>@dotless{a}</code> a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg &#xz;
+@U{abc}, with &lt;4 hex digits &#xabc;
+@U{FFFFFFFFFFFFFF}, value much too large &#xFFFFFFFFFFFFFF;
+@U{110000}, value just beyond Unicode &#x110000;
+
+@TeX, but without brace TeX<code>@#</code> #
+
+<code>@w{--a}</code> --a<!-- /@w -->
+
+<code>@image{,1--xt}</code>
+<code>@image{,,2--xt}</code>
+<code>@image{,,,3--xt}</code>
+
+
+</pre><ul class="no-bullet">
+<li> after emph <pre class="example">e--mph item
+</pre></li></ul>
+<pre class="example">
+
+</pre><ul class="no-bullet">
+<li>&bull; a&ndash;n itemize line <pre class="example">i--tem 1
+</pre></li><li>&bull; a&ndash;n itemize line <pre class="example">i--tem 2
+</pre></li></ul>
+<pre class="example">
+
+</pre><dl>
+<dt>fun: <strong></strong></dt>
+<dt id="index-machin-8">truc: <strong>machin</strong> <em>bidule chose and</em></dt>
+<dt id="index-machin-9">truc: <strong>machin</strong> <em>bidule chose and after</em></dt>
+<dt id="index-machin-10">truc: <strong>machin</strong> <em>bidule chose and </em></dt>
+<dt id="index-machin-11">truc: <strong>machin</strong> <em>bidule chose and and after</em></dt>
+<dt id="index-followed-3">truc: <strong>followed</strong> <em>by a comment</em></dt>
+<dd><pre class="example">Various deff lines
+</pre></dd><dt id="index-after-1">truc: <strong>after</strong> <em>a deff item</em></dt>
+</dl>
+<pre class="example">
+
+<code>@ref{node}</code> `node'
+
+<code>@ref{,cross ref name}</code> `cross ref name'
+<code>@ref{,,title}</code> `title'
+<code>@ref{,,,file name}</code> <a href="../file name/index.html">(file name)</a>
+<code>@ref{,,,,manual}</code> <cite>manual</cite>
+<code>@ref{node,cross ref name}</code> `cross ref name'
+<code>@ref{node,,title}</code> `title'
+<code>@ref{node,,,file name}</code> <a href="../file name/node.html#node">(file name)node</a>
+<code>@ref{node,,,,manual}</code> `node' in <cite>manual</cite>
+<code>@ref{node,cross ref name,title,}</code> `title'
+<code>@ref{node,cross ref name,,file name}</code> <a href="../file name/node.html#node">(file name)cross ref name</a>
+<code>@ref{node,cross ref name,,,manual}</code> `cross ref name' in <cite>manual</cite>
+<code>@ref{node,cross ref name,title,file name}</code> <a href="../file name/node.html#node">(file name)title</a>
+<code>@ref{node,cross ref name,title,,manual}</code> `title' in <cite>manual</cite>
+<code>@ref{node,cross ref name,title, file name, manual}</code> <a href="../file name/node.html#node">title</a> in <cite>manual</cite>
+<code>@ref{node,,title,file name}</code> <a href="../file name/node.html#node">(file name)title</a>
+<code>@ref{node,,title,,manual}</code> `title' in <cite>manual</cite>
+<code>@ref{chapter,,title, file name, manual}</code> <a href="../file name/chapter.html#chapter">title</a> in <cite>manual</cite>
+<code>@ref{node,,title, file name, manual}</code> <a href="../file name/node.html#node">title</a> in <cite>manual</cite>
+<code>@ref{node,,,file name,manual}</code> <a href="../file name/node.html#node">node</a> in <cite>manual</cite>
+<code>@ref{,cross ref name,title,}</code> `title'
+<code>@ref{,cross ref name,,file name}</code> <a href="../file name/index.html">(file name)cross ref name</a>
+<code>@ref{,cross ref name,,,manual}</code> `cross ref name' in <cite>manual</cite>
+<code>@ref{,cross ref name,title,file name}</code> <a href="../file name/index.html">(file name)title</a>
+<code>@ref{,cross ref name,title,,manual}</code> `title' in <cite>manual</cite>
+<code>@ref{,cross ref name,title, file name, manual}</code> <a href="../file name/index.html">title</a> in <cite>manual</cite>
+<code>@ref{,,title,file name}</code> <a href="../file name/index.html">(file name)title</a>
+<code>@ref{,,title,,manual}</code> `title' in <cite>manual</cite>
+<code>@ref{,,title, file name, manual}</code> <a href="../file name/index.html">title</a> in <cite>manual</cite>
+<code>@ref{,,,file name,manual}</code> <cite><a href="../file name/index.html">manual</a></cite>
+
+<code>@inforef{,cross ref name }</code> See `cross ref name'
+<code>@inforef{,,file name}</code> See <a href="../file name/index.html">(file name)</a>
+<code>@inforef{,cross ref name, file name}</code> See <a href="../file name/index.html">(file name)cross ref name</a>
+<code>@inforef{}</code>
+
+
+</pre></div>
+
+<span id="index-t_002d_002druc"></span>
+<span id="index-T_002d_002druc"></span>
+<span id="index-_002e"></span>
+<span id="index-_003f"></span>
+<span id="index-a"></span>
+<span id="index-t_002d_002druc-1"></span>
+<span id="index-T_002d_002druc-1"></span>
+<span id="index-_002e-1"></span>
+<span id="index-_003f-1"></span>
+<span id="index-a-5"></span>
+
+
+<p>cp
+</p><table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top-section_cp_symbol-1"><b>&quot;</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_symbol-2"><b>-</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_symbol-3"><b>.</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_symbol-4"><b>?</b></a>
+ &nbsp;
+<br>
+<a class="summary-letter" href="#Top-section_cp_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_letter-I"><b>I</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_letter-T"><b>T</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-cp" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_cp_symbol-1">&quot;</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_0060_0060">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_0060_0060-1">&ldquo;</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_cp_symbol-2">-</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_002d_002doption">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_002d_002doption-1">&ndash;option</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_cp_symbol-3">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_002e">.</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_cp_symbol-4">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_003f">?</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_cp_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a">a</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_cp_letter-I">I</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-index-entry-between-item-and-itemx">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-index-entry-between-item-and-itemx-1">index entry between item and itemx</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-index-entry-within-deffn">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-index-entry-within-deffn-1">index entry within deffn</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-index-entry-within-itemize">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-index-entry-within-itemize-1">index entry within itemize</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-index-entry-within-multitable">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-index-entry-within-multitable-1">index entry within multitable</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_cp_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-t_002d_002druc">t&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-T_002d_002druc">T&ndash;ruc</a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top-section_cp_symbol-1"><b>&quot;</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_symbol-2"><b>-</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_symbol-3"><b>.</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_symbol-4"><b>?</b></a>
+ &nbsp;
+<br>
+<a class="summary-letter" href="#Top-section_cp_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_letter-I"><b>I</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_cp_letter-T"><b>T</b></a>
+ &nbsp;
+</td></tr></table>
+
+<p>fn
+</p><table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top-section_fn_symbol-1"><b>-</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_symbol-2"><b>.</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_symbol-3"><b>?</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_symbol-4"><b>`</b></a>
+ &nbsp;
+<br>
+<a class="summary-letter" href="#Top-section_fn_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-B"><b>B</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-D"><b>D</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-F"><b>F</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-I"><b>I</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-L"><b>L</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-M"><b>M</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-T"><b>T</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-fn" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_symbol-1">-</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_002d_002dfoption"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_002d_002dfoption-1"><code>--foption</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_symbol-2">.</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_002e-1"><code>.</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_symbol-3">?</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_003f-1"><code>?</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_symbol-4">`</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-_0060_0060-1"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_0060_0060-2"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_0060_0060-3"><code>``</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-a"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-1"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-3"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-4"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-5"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-after"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-after-1"><code>after</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_letter-B">B</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-b"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-bidule-machin"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-bidule-machin-1"><code>bidule machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_letter-D">D</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deffn_005fname"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deffn_005fname-1"><code>d--effn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defmac_005fname"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defmac_005fname-1"><code>d--efmac_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><code>d--efmethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defop_005fname-on-c_002d_002dlass"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><code>d--efop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defspec_005fname"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defspec_005fname-1"><code>d--efspec_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypefn_005fname"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypefn_005fname-1"><code>d--eftypefn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypefun_005fname"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypefun_005fname-1"><code>d--eftypefun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><code>d--eftypemethod_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><code>d--eftypeop_name on c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defun_005fname"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defun_005fname-1"><code>d--efun_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-de_002d_002dffn_005fname"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-de_002d_002dffn_005fname-1"><code>de--ffn_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-deffn"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-deffn-1"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-deffn-2"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-deffn-3"><code>deffn</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-deffnx"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-deffnx-1"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-deffnx-2"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-deffnx-3"><code>deffnx</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_letter-F">F</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-followed"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-followed-1"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-followed-2"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-followed-3"><code>followed</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_letter-I">I</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-i"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-i-1"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-i-2"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-i-3"><code><var>i</var></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-id-i-ule"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-id-i-ule-1"><code><b>id &lsquo;<samp>i</samp>&rsquo; ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-id-ule"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-id-ule-1"><code><b>id ule</b></code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_letter-L">L</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-log-trap"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-log-trap-1"><code>log trap</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-log-trap1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-log-trap1-1"><code>log trap1</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-log-trap2"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-log-trap2-1"><code>log trap2</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_letter-M">M</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-1"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-2"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-3"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-4"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-5"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-6"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-7"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-8"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-9"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-10"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-machin-11"><code>machin</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_fn_letter-T">T</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-t_002d_002druc-1"><code>t--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-T_002d_002druc-1"><code>T--ruc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-truc"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-truc-1"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-truc-2"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-truc-3"><code>truc</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top-section_fn_symbol-1"><b>-</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_symbol-2"><b>.</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_symbol-3"><b>?</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_symbol-4"><b>`</b></a>
+ &nbsp;
+<br>
+<a class="summary-letter" href="#Top-section_fn_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-B"><b>B</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-D"><b>D</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-F"><b>F</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-I"><b>I</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-L"><b>L</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-M"><b>M</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_fn_letter-T"><b>T</b></a>
+ &nbsp;
+</td></tr></table>
+
+<p>vr
+</p><table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top-section_vr_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_vr_letter-B"><b>B</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_vr_letter-D"><b>D</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-vr" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_vr_letter-A">A</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-a-2"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-6"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-7"><code>a</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_vr_letter-B">B</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-b-1"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-b-2"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-b-3"><code>b</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_vr_letter-D">D</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defcv_005fname"><code>d--efcv_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defcv_005fname"><code>d--efcv_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defcv_005fname"><code>d--efcv_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defcv_005fname-1"><code>d--efcv_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><code>d--efivar_name of c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defivar_005fname-of-c_002d_002dlass"><code>d--efivar_name of c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defivar_005fname-of-c_002d_002dlass"><code>d--efivar_name of c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defivar_005fname-of-c_002d_002dlass-1"><code>d--efivar_name of c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defopt_005fname"><code>d--efopt_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defopt_005fname"><code>d--efopt_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defopt_005fname"><code>d--efopt_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defopt_005fname-1"><code>d--efopt_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><code>d--eftypeivar_name of c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><code>d--eftypeivar_name of c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><code>d--eftypeivar_name of c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1"><code>d--eftypeivar_name of c--lass</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftypevar_005fname"><code>d--eftypevar_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftypevar_005fname"><code>d--eftypevar_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypevar_005fname"><code>d--eftypevar_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypevar_005fname-1"><code>d--eftypevar_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftypevr_005fname"><code>d--eftypevr_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftypevr_005fname"><code>d--eftypevr_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypevr_005fname"><code>d--eftypevr_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftypevr_005fname-1"><code>d--eftypevr_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defvar_005fname"><code>d--efvar_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defvar_005fname"><code>d--efvar_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defvar_005fname"><code>d--efvar_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defvar_005fname-1"><code>d--efvar_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defvr_005fname"><code>d--efvr_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002defvr_005fname-1"><code>d--efvr_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top-section_vr_letter-A"><b>A</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_vr_letter-B"><b>B</b></a>
+ &nbsp;
+<a class="summary-letter" href="#Top-section_vr_letter-D"><b>D</b></a>
+ &nbsp;
+</td></tr></table>
+
+<p>ky
+</p>
+<p>pg
+</p>
+<p>tp
+</p><table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top-section_tp_letter-D"><b>D</b></a>
+ &nbsp;
+</td></tr></table>
+<table class="index-tp" border="0">
+<tr><td></td><th align="left">Index Entry</th><td>&nbsp;</td><th align="left"> Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th id="Top-section_tp_letter-D">D</th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-copying-d_002d_002deftp_005fname"><code>d--eftp_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-titlepage-d_002d_002deftp_005fname"><code>d--eftp_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftp_005fname"><code>d--eftp_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d_002d_002deftp_005fname-1"><code>d--eftp_name</code></a></td><td>&nbsp;</td><td valign="top"><a href="#Top">Top section</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: &nbsp; </th><td><a class="summary-letter" href="#Top-section_tp_letter-D"><b>D</b></a>
+ &nbsp;
+</td></tr></table>
+
+
+
+<blockquote>
+<a href="sing_toc.htm#SEC_Contents">Table of Contents</a>
+<br>
+<a href="sing_abt.htm#SEC_About">About this document</a></blockquote></td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="#Top" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="#Top" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/index.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/index.html
new file mode 100644
index 0000000000..3a68943794
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/index.html
@@ -0,0 +1,643 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<!-- This file redirects to the location of a node or anchor -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Top (title &ndash;a)</title>
+
+<meta name="description" content="Top (title &ndash;a)">
+<meta name="keywords" content="Top (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+<meta http-equiv="Refresh" content="0; url=index.htm#Top">
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+
+<p>The node you are looking for is at <a href="index.htm#Top">Top</a>.</p>
+</body>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/s_002d_002dect_002cion.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/s_002d_002dect_002cion.html
new file mode 100644
index 0000000000..2e883aaa48
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/s_002d_002dect_002cion.html
@@ -0,0 +1,721 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1.1 A section (title &ndash;a)</title>
+
+<meta name="description" content="1.1 A section (title &ndash;a)">
+<meta name="keywords" content="1.1 A section (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="s_002d_002dect_002cion"></span><table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1 chapter" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="subsection.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1 subsection" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1 chapter" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<span id="A-section"></span><h2 class="section">1.1 A section</h2>
+
+<blockquote><table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="subsection.html">1.1.1 subsection</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
+
+</pre></th></tr><tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">In detailmenu
+
+</pre></th></tr><tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table></blockquote>
+
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="chapter.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_abt.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_abt.htm
new file mode 100644
index 0000000000..be2c90bb8a
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_abt.htm
@@ -0,0 +1,798 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>About This Document (title &ndash;a)</title>
+
+<meta name="description" content="About This Document (title &ndash;a)">
+<meta name="keywords" content="About This Document (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="SEC_About"></span>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<h1 class="about-heading">About This Document</h1>
+
+<p>
+This document is the user manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE.
+<br>
+
+For questions and comments about Singular, send email to <a href="mailto:singular@mathematik.uni-kl.de">singular@mathematik.uni-kl.de</a>.
+
+<p></p>
+This document was generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>
+and <a href="http://www-dsed.llnl.gov/files/programs/unix/latex2html/manual/">LaTeX2<tt>HTML</tt></a>
+and is best viewed with a 16 or 18 point screen font.
+<p></p>
+</p>
+<p>
+ The buttons in the navigation panels have the following meaning:
+</p>
+<table border="1">
+ <tr>
+ <th> Button </th>
+ <th> Name </th>
+ <th> Go to </th>
+ <th> From 1.2.3 go to</th>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_left.png" border="0" alt="Back" align="middle"></td>
+ <td align="center">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_right.png" border="0" alt="Forward" align="middle"></td>
+ <td align="center">Forward</td>
+ <td>Next section in reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack" align="middle"></td>
+ <td align="center">FastBack</td>
+ <td>Beginning of this chapter or previous chapter</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward" align="middle"></td>
+ <td align="center">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_up.png" border="0" alt="Up" align="middle"></td>
+ <td align="center">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_top.png" border="0" alt="Top" align="middle"></td>
+ <td align="center">Top</td>
+ <td>Cover (top) of document</td>
+ <td> &nbsp; </td>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents" align="middle"></td>
+ <td align="center">Contents</td>
+ <td>Table of contents</td>
+ <td> &nbsp; </td>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_index.png" border="0" alt="Index" align="middle"></td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> &nbsp; </td>
+ </tr>
+ <tr>
+ <td align="center"><img src="../singular_images/a_help.png" border="0" alt="About" align="middle"></td>
+ <td align="center">About</td>
+ <td>About (help)</td>
+ <td> &nbsp; </td>
+ </tr>
+</table>
+
+<p>
+ where the <strong> Example </strong> assumes that the current position is at <strong> Subsubsection One-Two-Three </strong> of a document of the following structure:
+</p>
+
+<ul>
+ <li> 1. Section One
+ <ul>
+ <li>1.1 Subsection One-One
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Subsection One-Two
+ <ul>
+ <li>1.2.1 Subsubsection One-Two-One</li>
+ <li>1.2.2 Subsubsection One-Two-Two</li>
+ <li>1.2.3 Subsubsection One-Two-Three &nbsp; &nbsp;
+ <strong>&lt;== Current Position </strong></li>
+ <li>1.2.4 Subsubsection One-Two-Four</li>
+ </ul>
+ </li>
+ <li>1.3 Subsection One-Three
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Subsection One-Four</li>
+ </ul>
+ </li>
+</ul>
+
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_fot.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_fot.htm
new file mode 100644
index 0000000000..d14694eb2a
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_fot.htm
@@ -0,0 +1,703 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Footnotes (title &ndash;a)</title>
+
+<meta name="description" content="Footnotes (title &ndash;a)">
+<meta name="keywords" content="Footnotes (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="SEC_Foot"></span>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<h1 class="footnotes-heading">Footnotes</h1>
+
+<h5><a id="FOOT1" href="index.htm#DOCF1">(1)</a></h3>
+<p>in footnote</p>
+<h5><a id="FOOT2" href="index.htm#DOCF2">(2)</a></h3>
+<p>in footnote2</p>
+<h5><a id="FOOT5" href="index.htm#DOCF5">(3)</a></h3>
+<p>in footnote</p>
+<h5><a id="FOOT6" href="index.htm#DOCF6">(4)</a></h3>
+<p>in footnote2</p>
+<h5><a id="FOOT7" href="index.htm#DOCF7">(5)</a></h3>
+<p>in footnote</p>
+<h5><a id="FOOT8" href="index.htm#DOCF8">(6)</a></h3>
+<p>in footnote2</p>
+<h5><a id="FOOT9" href="chapter.html#DOCF9">(7)</a></h3>
+<p>in footnote</p>
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_ovr.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_ovr.htm
new file mode 100644
index 0000000000..60b512ec9c
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_ovr.htm
@@ -0,0 +1,695 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Short Table of Contents (title &ndash;a)</title>
+
+<meta name="description" content="Short Table of Contents (title &ndash;a)">
+<meta name="keywords" content="Short Table of Contents (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="SEC_Overview"></span>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<h1 class="shortcontents-heading">Short Table of Contents</h1>
+
+<div class="shortcontents">
+<ul class="no-bullet">
+<li><a id="stoc-chapter-1" href="chapter.html">1 chapter</a></li>
+<li><a id="stoc-chapter-2" href="chapter2.html">chapter 2</a></li>
+</ul>
+</div>
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_math.log b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_math.log
new file mode 100644
index 0000000000..0ba336f5de
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_math.log
@@ -0,0 +1,183 @@
+This is TeX, Version 3.14159265 (TeX Live 2019/dev/Debian) (preloaded format=tex 2019.3.19) 14 JUN 2019 08:33
+**\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\
+csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode
+\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\e
+xpandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svr
+m\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=1
+3 }\expandafter\rm\fi}\HCode .a.b.c.\input sing_tex4ht_math.texi
+(./sing_tex4ht_math.texi (/usr/share/texmf/tex/texinfo/texinfo.tex
+Loading texinfo [version 2018-01-09.11]:
+\outerhsize=\dimen16
+\outervsize=\dimen17
+\cornerlong=\dimen18
+\cornerthick=\dimen19
+\topandbottommargin=\dimen20
+\bindingoffset=\dimen21
+\normaloffset=\dimen22
+\txipagewidth=\dimen23
+\txipageheight=\dimen24
+\headlinebox=\box16
+\footlinebox=\box17
+\margin=\insert252
+\EMsimple=\toks12
+\groupbox=\box18
+\groupinvalidhelp=\toks13
+\mil=\dimen25
+\exdentamount=\skip18
+\inmarginspacing=\skip19
+\centerpenalty=\count26
+ pdf,
+\tempnum=\count27
+\lnkcount=\count28
+\filename=\toks14
+\filenamelength=\count29
+\pgn=\count30
+\toksA=\toks15
+\toksB=\toks16
+\toksC=\toks17
+\toksD=\toks18
+\boxA=\box19
+\boxB=\box20
+\countA=\count31
+\nopdfimagehelp=\toks19
+ fonts,
+\textleading=\dimen26
+\sffam=\fam8
+ markup,
+\fontdepth=\count32
+ glyphs,
+\errorbox=\box21
+
+page headings,
+\titlepagetopglue=\skip20
+\titlepagebottomglue=\skip21
+\evenheadline=\toks20
+\oddheadline=\toks21
+\evenfootline=\toks22
+\oddfootline=\toks23
+ tables,
+\tableindent=\dimen27
+\itemindent=\dimen28
+\itemmargin=\dimen29
+\itemmax=\dimen30
+\itemno=\count33
+\multitableparskip=\skip22
+\multitableparindent=\skip23
+\multitablecolspace=\dimen31
+\multitablelinespace=\skip24
+\colcount=\count34
+\everytab=\toks24
+ conditionals,
+\doignorecount=\count35
+ indexing,
+\dummybox=\box22
+\whatsitskip=\skip25
+\whatsitpenalty=\count36
+\entryrightmargin=\dimen32
+\thinshrinkable=\skip26
+\entrybox=\box23
+\delayedbox=\box24
+\interbox=\box25
+\secondaryindent=\skip27
+\partialpage=\box26
+\doublecolumnhsize=\dimen33
+\savedtopmark=\toks25
+\savedfirstmark=\toks26
+\balancedcolumns=\box27
+ sectioning,
+\unnumberedno=\count37
+\chapno=\count38
+\secno=\count39
+\subsecno=\count40
+\subsubsecno=\count41
+\appendixno=\count42
+\absseclevel=\count43
+\secbase=\count44
+\chapheadingskip=\skip28
+\secheadingskip=\skip29
+\subsecheadingskip=\skip30
+ toc,
+\tocfile=\write0
+\contentsrightmargin=\skip31
+\savepageno=\count45
+\lastnegativepageno=\count46
+\tocindent=\dimen34
+ environments,
+\lispnarrowing=\skip32
+\envskipamount=\skip33
+\circthick=\dimen35
+\cartouter=\dimen36
+\cartinner=\dimen37
+\normbskip=\skip34
+\normpskip=\skip35
+\normlskip=\skip36
+\lskip=\skip37
+\rskip=\skip38
+\nonfillparindent=\dimen38
+\tabw=\dimen39
+\verbbox=\box28
+
+defuns,
+\defbodyindent=\skip39
+\defargsindent=\skip40
+\deflastargmargin=\skip41
+\defunpenalty=\count47
+\parencount=\count48
+\brackcount=\count49
+ macros,
+\macscribble=\write1
+\savedcatcodeone=\count50
+\savedcatcodetwo=\count51
+\paramno=\count52
+\macname=\toks27
+ cross references,
+\auxfile=\write2
+\savesfregister=\count53
+\toprefbox=\box29
+\printedrefnamebox=\box30
+\infofilenamebox=\box31
+\printedmanualbox=\box32
+ insertions,
+\footnoteno=\count54
+\SAVEfootins=\box33
+\SAVEmargin=\box34
+
+(/usr/share/texlive/texmf-dist/tex/generic/epsf/epsf.tex
+This is `epsf.tex' v2.7.4 <14 February 2011>
+\epsffilein=\read0
+\epsfframemargin=\dimen40
+\epsfframethickness=\dimen41
+\epsfrsize=\dimen42
+\epsftmp=\dimen43
+\epsftsize=\dimen44
+\epsfxsize=\dimen45
+\epsfysize=\dimen46
+\pspoints=\dimen47
+)
+\noepsfhelp=\toks28
+ localization,
+\nolanghelp=\toks29
+\countUTFx=\count55
+\countUTFy=\count56
+\countUTFz=\count57
+ formatting,
+\defaultparindent=\dimen48
+ and turning on texinfo input format.)
+! Undefined control sequence.
+<argument> --a {@frac
+ {1}{2}} @minus {}
+@finishmath #1->#1
+ $@endgroup
+l.8 @math{--a {\frac{1}{2}} @minus{}}
+
+?
+! Emergency stop.
+<argument> --a {@frac
+ {1}{2}} @minus {}
+@finishmath #1->#1
+ $@endgroup
+l.8 @math{--a {\frac{1}{2}} @minus{}}
+
+End of file on the terminal!
+
+No pages of output.
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_math.texi b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_math.texi
new file mode 100644
index 0000000000..bca80ac2f4
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_math.texi
@@ -0,0 +1,77 @@
+\input texinfo
+@setfilename sing_tex4ht_math.info
+@c Automatically generated
+@verbatim
+
+<!-- tex4ht_begin sing_tex4ht_math math 1 -->
+@end verbatim
+@math{--a {\frac{1}{2}} @minus{}}
+@verbatim
+<!-- tex4ht_end sing_tex4ht_math math 1 -->
+
+@end verbatim
+@verbatim
+
+<!-- tex4ht_begin sing_tex4ht_math math 2 -->
+@end verbatim
+@math{--a@minus{} {\frac{1}{2}}}
+@verbatim
+<!-- tex4ht_end sing_tex4ht_math math 2 -->
+
+@end verbatim
+@verbatim
+
+<!-- tex4ht_begin sing_tex4ht_math math 3 -->
+@end verbatim
+@math{--a {\frac{1}{2}} @minus{}}
+@verbatim
+<!-- tex4ht_end sing_tex4ht_math math 3 -->
+
+@end verbatim
+@verbatim
+
+<!-- tex4ht_begin sing_tex4ht_math math 4 -->
+@end verbatim
+@math{--a@minus{} {\frac{1}{2}}}
+@verbatim
+<!-- tex4ht_end sing_tex4ht_math math 4 -->
+
+@end verbatim
+@verbatim
+
+<!-- tex4ht_begin sing_tex4ht_math math 5 -->
+@end verbatim
+@math{--a {\frac{1}{2}} @minus{}}
+@verbatim
+<!-- tex4ht_end sing_tex4ht_math math 5 -->
+
+@end verbatim
+@verbatim
+
+<!-- tex4ht_begin sing_tex4ht_math math 6 -->
+@end verbatim
+@math{--a@minus{} {\frac{1}{2}}}
+@verbatim
+<!-- tex4ht_end sing_tex4ht_math math 6 -->
+
+@end verbatim
+@verbatim
+
+<!-- tex4ht_begin sing_tex4ht_math math 7 -->
+@end verbatim
+@math{--a {\frac{1}{2}} @minus{}}
+@verbatim
+<!-- tex4ht_end sing_tex4ht_math math 7 -->
+
+@end verbatim
+@verbatim
+
+<!-- tex4ht_begin sing_tex4ht_math math 8 -->
+@end verbatim
+@math{--a@minus{} {\frac{1}{2}}}
+@verbatim
+<!-- tex4ht_end sing_tex4ht_math math 8 -->
+
+@end verbatim
+
+@bye
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.4ct b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.4ct
new file mode 100644
index 0000000000..9998f6203d
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.4ct
@@ -0,0 +1,2 @@
+\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
+\par
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.4tc b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.4tc
new file mode 100644
index 0000000000..4021816773
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.4tc
@@ -0,0 +1 @@
+\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.css b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.css
new file mode 100644
index 0000000000..f6100844bc
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.css
@@ -0,0 +1,42 @@
+
+/* start css.sty */
+.cmmi-10{font-style: italic;}
+.cmmi-7{font-size:70%;font-style: italic;}
+p.noindent { text-indent: 0em }
+td p.noindent { text-indent: 0em; margin-top:0em; }
+p.nopar { text-indent: 0em; }
+p.indent{ text-indent: 1.5em }
+@media print {div.crosslinks {visibility:hidden;}}
+a img { border-top: 0; border-left: 0; border-right: 0; }
+center { margin-top:1em; margin-bottom:1em; }
+td center { margin-top:0em; margin-bottom:0em; }
+.Canvas { position:relative; }
+img.math{vertical-align:middle;}
+.obeylines-h,.obeylines-v {white-space: nowrap; }
+div.obeylines-v p { margin-top:0; margin-bottom:0; }
+.overline{ text-decoration:overline; }
+.overline img{ border-top: 1px solid black; }
+td.displaylines {text-align:center; white-space:nowrap;}
+.centerline {text-align:center;}
+.rightline {text-align:right;}
+span.TEX {letter-spacing: -0.125em; }
+span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
+a span.TEX span.E {text-decoration: none; }
+.underline{ text-decoration:underline; }
+.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
+div.proclaim { margin-top: 1em; margin-bottom: 1em; }
+p.item {text-indent:-2em; margin-left:2em;}
+p.itemitem {text-indent:-2em; margin-left:4em;}
+span.item, span.itemitem {width:2em; margin-right:0.4em;}
+td.eqalign3 { text-align:right; margin-left:10em;}
+.eqalign td { white-space: nowrap; }
+div.eqalign {text-align:center;}
+td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
+.leqalignno td, .eqalignno td { white-space: nowrap; }
+.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; }
+table.leqalignno, table.eqalignno {width:100%;}
+img.cdots{vertical-align:middle;}
+div.pmatrix {text-align:center;}
+table.pmatrix {width:100%;}
+/* end css.sty */
+
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.dvi b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.dvi
new file mode 100644
index 0000000000..9c3e16b752
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.dvi
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.html
new file mode 100644
index 0000000000..1c8ed77450
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<html >
+<head>
+
+ <title>sing_tex4ht_tex.html</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta name="generator" content="TeX4ht (http://www.tug.org/tex4ht/)">
+<meta name="originator" content="TeX4ht (http://www.tug.org/tex4ht/)">
+<!-- html -->
+<meta name="src" content="sing_tex4ht_tex.tex">
+<link rel="stylesheet" type="text/css" href="sing_tex4ht_tex.css">
+</head><body
+>
+<!--l. 3--><p class="indent" >
+
+<!-- tex4ht_begin sing_tex4ht_tex tex 1 -->
+
+ <center class="math-display" >
+<img
+src="sing_tex4ht_tex0x.png" alt="&#x2202;t&#x03B7;(t) = g(&#x03B7;(t),&#x03C6;(t)) " class="math-display" ></center> &#8221;
+<!-- tex4ht_end sing_tex4ht_tex tex 1 -->
+
+
+
+
+<!-- tex4ht_begin sing_tex4ht_tex tex 2 -->
+
+ <center class="math-display" >
+<img
+src="sing_tex4ht_tex1x.png" alt="&#x2202;t&#x03B7;(t) = g(&#x03B7;(t),&#x03C6;(t)) " class="math-display" ></center> &#8221;
+<!-- tex4ht_end sing_tex4ht_tex tex 2 -->
+
+
+
+
+<!-- tex4ht_begin sing_tex4ht_tex tex 3 -->
+
+ <center class="math-display" >
+<img
+src="sing_tex4ht_tex2x.png" alt="&#x2202;t&#x03B7;(t) = g(&#x03B7;(t),&#x03C6;(t)) " class="math-display" ></center> &#8221;
+<!-- tex4ht_end sing_tex4ht_tex tex 3 -->
+
+
+
+
+<!-- tex4ht_begin sing_tex4ht_tex tex 4 -->
+
+ <center class="math-display" >
+<img
+src="sing_tex4ht_tex3x.png" alt="&#x2202; &#x03B7;(t) = g(&#x03B7;(t),&#x03C6;(t))
+ t " class="math-display" ></center> &#8221;
+
+<!-- tex4ht_end sing_tex4ht_tex tex 4 -->
+
+
+
+
+</body></html>
+
+
+
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.idv b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.idv
new file mode 100644
index 0000000000..0b5cfe71b2
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.idv
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.lg b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.lg
new file mode 100644
index 0000000000..f822a7fc4f
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.lg
@@ -0,0 +1,55 @@
+htfcss: cmmi font-style: italic;
+htfcss: cmmib font-style: italic; font-weight: bold;
+File: sing_tex4ht_tex.html
+File: sing_tex4ht_tex.css
+File: sing_tex4ht_tex.tmp
+Css: p.noindent { text-indent: 0em }
+Css: td p.noindent { text-indent: 0em; margin-top:0em; }
+Css: p.nopar { text-indent: 0em; }
+Css: p.indent{ text-indent: 1.5em }
+Css: @media print {div.crosslinks {visibility:hidden;}}
+Css: a img { border-top: 0; border-left: 0; border-right: 0; }
+Font_Css("4"): .small-caps{font-variant: small-caps; }
+Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
+Font_Css("12"): .htf-calligraphy {font-family:cursive}
+Font_Css("14"): .htf-italic {font-style: italic;}
+Font_Css("16"): .htf-bold {font-weight: bold;}
+Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: bold; }
+Css: center { margin-top:1em; margin-bottom:1em; }
+Css: td center { margin-top:0em; margin-bottom:0em; }
+Css: .Canvas { position:relative; }
+Css: img.math{vertical-align:middle;}
+Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
+Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
+Css: .overline{ text-decoration:overline; }
+Css: .overline img{ border-top: 1px solid black; }
+Css: td.displaylines {text-align:center; white-space:nowrap;}
+Css: .centerline {text-align:center;}
+Css: .rightline {text-align:right;}
+Css: span.TEX {letter-spacing: -0.125em; }
+Css: span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
+Css: a span.TEX span.E {text-decoration: none; }
+Css: .underline{ text-decoration:underline; }
+Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
+Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
+Css: p.item {text-indent:-2em; margin-left:2em;}
+Css: p.itemitem {text-indent:-2em; margin-left:4em;}
+Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
+Css: td.eqalign3 { text-align:right; margin-left:10em;}
+Css: .eqalign td { white-space: nowrap; }
+Css: div.eqalign {text-align:center;}
+Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
+Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
+Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; }
+Css: table.leqalignno, table.eqalignno {width:100%;}
+Css: img.cdots{vertical-align:middle;}
+Css: div.pmatrix {text-align:center;}
+Css: table.pmatrix {width:100%;}
+--- needs --- sing_tex4ht_tex.idv[1] ==> sing_tex4ht_tex0x.png ---
+--- needs --- sing_tex4ht_tex.idv[2] ==> sing_tex4ht_tex1x.png ---
+--- needs --- sing_tex4ht_tex.idv[3] ==> sing_tex4ht_tex2x.png ---
+--- needs --- sing_tex4ht_tex.idv[4] ==> sing_tex4ht_tex3x.png ---
+--- characters ---
+Font("cmr","10","10","100")
+Font("cmmi","10","10","100")
+Font("cmmi","7","7","100")
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.log b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.log
new file mode 100644
index 0000000000..f6762d3028
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.log
@@ -0,0 +1,187 @@
+This is TeX, Version 3.14159265 (TeX Live 2019/dev/Debian) (preloaded format=tex 2019.3.19) 14 JUN 2019 08:33
+**\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\
+csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode
+\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\e
+xpandafter\Link\fi}\HCode .a.b.c.\input sing_tex4ht_tex.tex
+(./sing_tex4ht_tex.tex
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+version 2018-06-12-16:01
+\tmp:toks=\toks12
+
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
+version 2018-12-30-09:29
+--------------------------------------
+--- Note --- for additional information, use the command line option `info'
+--------------------------------------
+
+::::::::::::::::::::::::::::::::::::::::::
+ TeX4ht info is available in the log file
+::::::::::::::::::::::::::::::::::::::::::
+) (/usr/share/texlive/texmf-dist/tex/generic/tex4ht/tex4ht.sty
+version 2018-06-12-16:01
+
+--- needs --- tex4ht sing_tex4ht_tex ---
+\tmp:cnt=\count26
+\openout15 = `sing_tex4ht_tex.tmp'.
+
+(./sing_tex4ht_tex.tmp)
+\tmp:dim=\skip18
+--------------------------------------
+--- Note --- for XML code, use the command line option `xml' or `xhtml'
+--------------------------------------
+ (./sing_tex4ht_tex.xref)
+\:refout=\write0
+
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht
+version 2019-01-30-15:45
+--------------------------------------
+--- Note --- to remove the <?xml version=...?> processing instruction use the c
+ommand line option `no-VERSION'
+--------------------------------------
+--------------------------------------
+--- Note --- to remove the DOCTYPE declaration use the command line option `no-
+DOCTYPE'
+--------------------------------------
+)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht
+version 2018-12-05-18:11
+)
+--------------------------------------
+--- Note --- for marking of the base font, use the command line option `fonts+'
+
+--------------------------------------
+--------------------------------------
+--- Note --- for non active _, use the command line option `no_'
+--------------------------------------
+--------------------------------------
+--- Note --- for _ of catcode 13, use the command line option `_13'
+--------------------------------------
+--------------------------------------
+--- Note --- for non active ^, use the command line option `no^'
+--------------------------------------
+--------------------------------------
+--- Note --- for ^ of catcode 13, use the command line option `^13'
+--------------------------------------
+
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht
+version 2019-01-30-15:45
+--------------------------------------
+--- Note --- for alternative charset, use the command line option `charset=...'
+
+--------------------------------------
+--------------------------------------
+--- Note --- to ignore CSS font decoration, use the `NoFonts' command line opti
+on
+--------------------------------------
+--------------------------------------
+--- Note --- for jpg bitmaps of pictures, use the `jpg' command line option. (C
+haracter bitmaps are controled only by `g' records of tex4ht.env and `-g' switc
+hes of tex4ht.c)
+--------------------------------------
+--------------------------------------
+--- Note --- for gif bitmaps of pictures, use the `gif' command line option. (C
+haracter bitmaps are controled only by `g' records of tex4ht.env and `-g' switc
+hes of tex4ht.c)
+--------------------------------------
+--------------------------------------
+--- Note --- for content and toc in 2 frames, use the command line option `fram
+es'
+--------------------------------------
+--------------------------------------
+--- Note --- for content, toc, and footnotes in 3 frames, use the command line
+option `frames-fn'
+--------------------------------------
+--------------------------------------
+--- Note --- for file extension name xht, use the command line option `xht'
+--------------------------------------
+TeX4ht package options: html
+--------------------------------------
+--- Note --- To print a timestamp, use the command line option timestamp
+--------------------------------------
+--------------------------------------
+--- Note --- to ignore CSS code, use the command line option `-css
+--------------------------------------
+--------------------------------------
+--- Note --- for inline CSS code, use the command line option `css-in'
+--------------------------------------
+--------------------------------------
+--- Note --- for pop ups on mouse over, use the command line option `mouseover'
+
+--------------------------------------
+--------------------------------------
+--- Note --- for addressing images in a subdirectory, use the command line opti
+on `imgdir:.../'
+--------------------------------------
+)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht
+version 2018-12-05-18:11
+)
+\:tokwrite=\toks13
+\:tokpage=\toks14
+--------------------------------------
+--- Note --- for back links to toc, use the command line option `sections+'
+--------------------------------------
+--------------------------------------
+--- Note --- for linear crosslinks of pages, use the command line option `next'
+
+--------------------------------------
+\openout15 = `sing_tex4ht_tex.4ct'.
+
+\:tocout=\write1
+
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/plain.4ht
+version 2018-11-06-15:55
+--------------------------------------
+--- Note --- for reduced implementation, use the command line option `plain-'
+--------------------------------------
+
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht
+version 2019-01-30-15:45
+--------------------------------------
+--- Note --- for inline footnotes, use the command line option `fn-in'
+--------------------------------------
+--------------------------------------
+--- Note --- for automatic sectioning pagination, use the command line option `
+1'
+--------------------------------------
+)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht
+version 2018-12-05-18:11
+--------------------------------------
+--- Note --- for pictorial $...$ environments, use the command line option `pic
+-m' (not recommended!!)
+--------------------------------------
+--------------------------------------
+--- Note --- for pictorial $...$ and $$...$$ environments with latex alt, use t
+he command line option `pic-m+' (not safe!!)
+--------------------------------------
+))
+--- file sing_tex4ht_tex.css ---
+ [1
+\openout0 = `sing_tex4ht_tex.xref'.
+
+\openout1 = `sing_tex4ht_tex.4tc'.
+
+]
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4.4ht
+version 2019-01-30-15:45
+)
+(/usr/share/texlive/texmf-dist/tex/generic/tex4ht/html4-math.4ht
+version 2018-12-05-18:11
+)))
+l. 4 Writing sing_tex4ht_tex.idv[1] (sing_tex4ht_tex0x.png)
+l. 7 Writing sing_tex4ht_tex.idv[2] (sing_tex4ht_tex1x.png)
+l. 10 Writing sing_tex4ht_tex.idv[3] (sing_tex4ht_tex2x.png)
+l. 13 Writing sing_tex4ht_tex.idv[4] (sing_tex4ht_tex3x.png)
+ [1]
+[2] )
+Here is how much of TeX's memory you used:
+ 2021 strings out of 497973
+ 19340 string characters out of 6220704
+ 138169 words of memory out of 5000000
+ 2904 multiletter control sequences out of 15000+600000
+ 14794 words of font info for 50 fonts, out of 8000000 for 9000
+ 14 hyphenation exceptions out of 8191
+ 25i,2n,21p,592b,527s stack positions out of 5000i,500n,10000p,200000b,80000s
+
+Output written on sing_tex4ht_tex.dvi (3 pages, 6880 bytes).
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.tex
new file mode 100644
index 0000000000..889cf52954
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.tex
@@ -0,0 +1,16 @@
+% Automatically generated
+\csname tex4ht\endcsname
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin sing_tex4ht_tex tex 1 -->\Hnewline}
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+\HCode{\Hnewline <!-- tex4ht_end sing_tex4ht_tex tex 1 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin sing_tex4ht_tex tex 2 -->\Hnewline}
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+\HCode{\Hnewline <!-- tex4ht_end sing_tex4ht_tex tex 2 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin sing_tex4ht_tex tex 3 -->\Hnewline}
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+\HCode{\Hnewline <!-- tex4ht_end sing_tex4ht_tex tex 3 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin sing_tex4ht_tex tex 4 -->\Hnewline}
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+\HCode{\Hnewline <!-- tex4ht_end sing_tex4ht_tex tex 4 -->\Hnewline \Hnewline}
+
+\bye
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.tmp b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.tmp
new file mode 100644
index 0000000000..41b58e2cf4
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.tmp
@@ -0,0 +1,2 @@
+
+/* css.sty */ \ No newline at end of file
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.xref b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.xref
new file mode 100644
index 0000000000..055c5d7340
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex.xref
@@ -0,0 +1 @@
+\:CrossWord{)F1F-}{sing_tex4ht_tex.html}{1}%
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex0x.png b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex0x.png
new file mode 100644
index 0000000000..082c9dbaf6
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex0x.png
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex1x.png b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex1x.png
new file mode 100644
index 0000000000..082c9dbaf6
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex1x.png
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex2x.png b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex2x.png
new file mode 100644
index 0000000000..082c9dbaf6
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex2x.png
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex3x.png b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex3x.png
new file mode 100644
index 0000000000..082c9dbaf6
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_tex4ht_tex3x.png
Binary files differ
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_toc.htm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_toc.htm
new file mode 100644
index 0000000000..fa04a28293
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/sing_toc.htm
@@ -0,0 +1,706 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Table of Contents (title &ndash;a)</title>
+
+<meta name="description" content="Table of Contents (title &ndash;a)">
+<meta name="keywords" content="Table of Contents (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="SEC_Contents"></span>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<h1 class="contents-heading">Table of Contents</h1>
+
+<div class="contents">
+
+<ul class="no-bullet">
+ <li><a id="toc-chapter-1" href="chapter.html">1 chapter</a>
+ <ul class="no-bullet">
+ <li><a id="toc-A-section" href="s_002d_002dect_002cion.html">1.1 A section</a>
+ <ul class="no-bullet">
+ <li><a id="toc-subsection-1" href="subsection.html">1.1.1 subsection</a>
+ <ul class="no-bullet">
+ <li><a id="toc-subsubsection-_0060_0060simple_002ddouble_002d_002d-1" href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></li>
+ <li><a id="toc-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027" href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></li>
+ </ul></li>
+ </ul></li>
+ </ul></li>
+ <li><a id="toc-chapter-2" href="chapter2.html">chapter 2</a></li>
+</ul>
+</div>
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsection.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsection.html
new file mode 100644
index 0000000000..2401ff65c8
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsection.html
@@ -0,0 +1,716 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1.1.1 subsection (title &ndash;a)</title>
+
+<meta name="description" content="1.1.1 subsection (title &ndash;a)">
+<meta name="keywords" content="1.1.1 subsection (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="subsection"></span><table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1 A section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1 A section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<span id="subsection-1"></span><h3 class="subsection">1.1.1 subsection</h3>
+
+<blockquote><table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html">1.1.1.2 three&mdash;four&mdash;-&rdquo;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table></blockquote>
+
+<span id="anchor"></span>
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="s_002d_002dect_002cion.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1 A section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsubsection-_0060_0060simple_002ddouble_002d_002d.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
new file mode 100644
index 0000000000..22cbb3e2a8
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -0,0 +1,708 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1.1.1.1 subsubsection &ldquo;simple-double&ndash; (title &ndash;a)</title>
+
+<meta name="description" content="1.1.1.1 subsubsection &ldquo;simple-double&ndash; (title &ndash;a)">
+<meta name="keywords" content="1.1.1.1 subsubsection &ldquo;simple-double&ndash; (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d"></span><table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="subsection.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1 subsection" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="subsection.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<span id="subsubsection-_0060_0060simple_002ddouble_002d_002d-1"></span><h4 class="subsubsection">1.1.1.1 subsubsection &ldquo;simple-double&ndash;</h4>
+
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="subsection.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: 1.1.1.2 three&mdash;four&mdash;-&rdquo;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
new file mode 100644
index 0000000000..10efb2650f
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/formatting_singular_tex4ht/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -0,0 +1,708 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- In copying
+
+<
+>
+"
+&
+'
+`
+
+"simple-double-three-four-"
+
+code: ``simple-double-three-four-''
+
+asis: "simple-double-three-four-"
+
+strong: "simple-double-three-four-"
+
+kbd: ``simple-double-three-four-''
+
+
+``simple-double-three-four-''
+
+
+
+@"u u"
+@"{U} U"
+@~n n~
+@^a a^
+@'e e'
+@=o o=
+@`i i`
+@'{e} e'
+@'{@dotless{i}} i'
+@dotless{i} i
+@dotless{j} j
+@`{@=E} E=`
+@l{} /l
+@,{@'C} C',
+@,c c,
+@,c@"u c,u"
+
+
+@U{0075} 0075
+
+@*
+
+@ followed by a space
+
+@ followed by a tab
+
+@ followed by a new line
+ @-
+@|
+@:
+@! !
+@? ?
+@. .
+@@ @
+@} }
+@{ {
+@/
+
+foo vs. bar.
+colon :And something else.
+semi colon ;.
+And ? ?.
+Now ! !@
+but , ,
+
+@TeX TeX
+@LaTeX LaTeX
+@bullet *
+@copyright (C)
+@dots ...
+@enddots ...
+@equiv ==
+@error error->
+@expansion ==>
+@minus -
+@point -!-
+@print -|
+@result =>
+@today a sunny day
+@aa aa
+@AA AA
+@ae ae
+@oe oe
+@AE AE
+@OE OE
+@o /o
+@O /O
+@ss ss
+@l /l
+@L /L
+@DH D
+@TH TH
+@dh d
+@th th
+@exclamdown !
+@questiondown ?
+@pounds #
+@registeredsymbol (R)
+@ordf a
+@ordm o
+@comma ,
+@quotedblleft ``
+@quotedblright ''
+@quoteleft `
+@quoteright '
+@quotedblbase ,,
+@quotesinglbase ,
+@guillemetleft <<
+@guillemetright >>
+@guillemotleft <<
+@guillemotright >>
+@guilsinglleft <
+@guilsinglright >
+@textdegree o
+@euro Euro
+@arrow ->
+@leq <=
+@geq >=
+
+@acronym{-a,an accronym} -a (an accronym)
+@acronym{-a} -a
+@abbr{@'E-. @comma{}A., @'Etude Autonome } E'-. ,A. (E'tude Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+@asis{-a} -a
+@b{-a} -a
+@cite{-a} -a
+@code{-a} -a
+@command{-a} -a
+@dfn{-a} -a
+@dmn{-a} -a
+@email{-a,-b} -b
+@email{,-b} -b
+@email{-a} -a
+@emph{-a} -a
+@env{-a} -a
+@file{-a} -a
+@i{-a} -a
+@kbd{-a} -a
+@key{-a} -a
+@math{-a {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
+@option{-a} -a
+@r{-a} -a
+@samp{-a} -a
+@sc{-a} -A
+@strong{-a} -a
+@t{-a} -a
+@sansserif{-a} -a
+@slanted{-a} -a
+@titlefont{-a} -a
+@indicateurl{-a} -a
+@uref{-a,-b} -a (-b)
+@uref{-a} -a
+@uref{,-b} (-b)
+@uref{-a,-b,-c} -c
+@uref{,-b,-c} -c
+@uref{-a,,-c} -c
+@uref{,,-c} -c
+@url{-a,-b} -a (-b)
+@url{-a,} -a
+@url{,-b} (-b)
+@var{-a} -a
+@verb{:-a:} -a
+@verb{:a < & @ % " - b:} a < & @ % " - b
+@w{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a} a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+@H{a} a''
+@H{-a} -a''
+@dotaccent{a} a.
+@dotaccent{-a} -a.
+@ringaccent{a} a*
+@ringaccent{-a} -a*
+@tieaccent{a} a[
+@tieaccent{-a} -a[
+@u{a} a(
+@u{-a} -a(
+@ubaraccent{a} a_
+@ubaraccent{-a} -a_
+@udotaccent{a} .a
+@udotaccent{-a} .-a
+@v{a} a<
+@v{-a} -a<
+@,{c} c,
+@,{-c} -c,
+@ogonek{a} a;
+@ogonek{-a} -a;
+@footnote{in footnote}
+@footnote{in footnote2}
+
+@image{f-ile} f-ile
+@image{f-ile,l-i} f-ile
+@image{f-ile,,l-e} f-ile
+@image{f-ile,,,alt} f-ile
+@image{f-ile,,,,e-d-xt} f-ile
+@image{f-ile,aze,az,alt,e-xt} f-ile
+@image{f-ile,aze,,a-lt} f-ile
+@image{@file{f-ile}@@@.,aze,az,alt,@file{file ext} e-xt@} f-ile@.
+
+
+
+
+@clicksequence{click @click{} A} click -> A
+After clickstyle =>
+@clicksequence{click @click{} A} click => A
+
+A quot-ation
+
+Note
+A Note
+
+note
+A note
+
+Caution
+Caution
+
+Important
+Important
+
+Tip
+a Tip
+
+Warning
+a Warning.
+
+something e' TeX
+The something e' TeX is here.
+
+@ at the end of line
+A @ at the end of the @quotation line.
+
+something, other thing
+something, other thing
+
+Note, the note
+Note, the note
+
+
+Empty
+
+
+
+A small quot-ation
+
+Note
+A small Note
+
+something, other thing
+something, other thing
+
+i-temize
+
+i-tem +
+
+b-ullet
+
+minu-s
+
+e-mph item
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+1. e-numerate
+
+mu-ltitable headitem another tab
+mu-ltitable item multitable tab
+mu-ltitable item 2 multitable tab 2
+lone mu-ltitable item
+
+truc bidule
+
+e-xample some
+ text
+
+s-mallexample
+
+d-isplay
+
+s-malldisplay
+
+l-isp
+
+s-malllisp
+
+f-ormat
+
+s-mallformat
+
+c-ategory: d-effn_name a-rguments...
+d-effn
+
+cate-gory: de-ffn_name ar-guments more args
+ even more so
+def-fn
+
+fset: i a g
+cmde: truc
+Command: log trap
+Command: log trap1
+Command: log trap2
+cmde: id ule truc
+cmde2: id i ule truc
+id i ule:
+aaa:
+:
+:
+: machin
+: bidule machin
+truc: machin
+truc:
+truc: followed by a comment
+truc:
+:
+truc: a b c d e f g h i
+truc: deffnx before end deffn
+
+empty: deffn
+
+empty: deffn with deffnx
+empty: deffnx
+
+fset: i a g
+cmde: truc
+text in def item for second def item
+
+c-ategory: d-efvr_name
+d-efvr
+
+c-ategory: t-ype d-eftypefn_name a-rguments...
+d-eftypefn
+
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
+d-eftypeop
+
+c-ategory: t-ype d-eftypevr_name
+d-eftypevr
+
+c-ategory of c-lass: d-efcv_name
+d-efcv
+
+c-ategory on c-lass: d-efop_name a-rguments...
+d-efop
+
+c-ategory: d-eftp_name a-ttributes...
+d-eftp
+
+Function: d-efun_name a-rguments...
+d-efun
+
+Macro: d-efmac_name a-rguments...
+d-efmac
+
+Special Form: d-efspec_name a-rguments...
+d-efspec
+
+Variable: d-efvar_name argvar argvar1
+d-efvar
+
+User Option: d-efopt_name
+d-efopt
+
+Function: t-ype d-eftypefun_name a-rguments...
+d-eftypefun
+
+Variable: t-ype d-eftypevar_name
+d-eftypevar
+
+Instance Variable of c-lass: d-efivar_name
+d-efivar
+
+Instance Variable of c-lass: t-ype d-eftypeivar_name
+d-eftypeivar
+
+Method on c-lass: d-efmethod_name a-rguments...
+d-efmethod
+
+Method on c-lass: t-ype d-eftypemethod_name a-rguments...
+d-eftypemethod
+
+@xref{c-hapter@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} c-hapter@.
+@ref{chapter, cross ref name, title, file name, manual} chapter
+@pxref{chapter, cross ref name, title, file name, manual} chapter
+@inforef{chapter, cross ref name, file name} chapter
+
+@ref{chapter} chapter
+@xref{chapter} chapter.
+@pxref{chapter} chapter
+@ref{s-ect@comma{}ion} s-ect,ion
+
+@ref{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in title, a comma@comma{} in file, a @comma{} in manual name }
+s-ect,ion
+
+@ref{chapter,cross ref name} chapter
+@ref{chapter,,title} chapter
+@ref{chapter,,,file name} chapter
+@ref{chapter,,,,manual} chapter
+@ref{chapter,cross ref name,title,} chapter
+@ref{chapter,cross ref name,,file name} chapter
+@ref{chapter,cross ref name,,,manual} chapter
+@ref{chapter,cross ref name,title,file name} chapter
+@ref{chapter,cross ref name,title,,manual} chapter
+@ref{chapter,cross ref name,title, file name, manual} chapter
+@ref{chapter,,title,file name} chapter
+@ref{chapter,,title,,manual} chapter
+@ref{chapter,,title, file name, manual} chapter
+@ref{chapter,,,file name,manual} chapter
+
+
+@ref{(pman)anode,cross ref name} (pman)anode
+@ref{(pman)anode,,title} (pman)anode
+@ref{(pman)anode,,,file name} (pman)anode
+@ref{(pman)anode,,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,} (pman)anode
+@ref{(pman)anode,cross ref name,,file name} (pman)anode
+@ref{(pman)anode,cross ref name,,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title,file name} (pman)anode
+@ref{(pman)anode,cross ref name,title,,manual} (pman)anode
+@ref{(pman)anode,cross ref name,title, file name, manual} (pman)anode
+@ref{(pman)anode,,title,file name} (pman)anode
+@ref{(pman)anode,,title,,manual} (pman)anode
+@ref{(pman)anode,,title, file name, manual} (pman)anode
+@ref{(pman)anode,,,file name,manual} (pman)anode
+
+
+@inforef{chapter, cross ref name, file name} chapter
+@inforef{chapter} chapter
+@inforef{chapter, cross ref name} chapter
+@inforef{chapter,,file name} chapter
+@inforef{node, cross ref name, file name} node
+@inforef{node} node
+@inforef{node, cross ref name} node
+@inforef{node,,file name} node
+@inforef{chapter, cross ref name, file name, spurious arg} chapter
+
+@inforef{s-ect@comma{}ion, a @comma{} in cross
+ref, a comma@comma{} in file}
+s-ect,ion
+
+
+a
+l-ine
+
+a
+b
+l-ine
+
+a
+b
+l-ine
+
+c-artouche
+
+g-roupe
+
+f-lushleft
+
+f-lushright
+
+ce-ntered line
+
+\input texinfo @c -*-texinfo-*-
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @ <>.
+
+@bye
+
+in verbatim ''
+
+
+html ''
+
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+
+
+majorheading
+************
+
+chapheading
+***********
+
+heading
+=======
+
+subheading
+-
+
+subsubheading
+.............
+
+
+@acronym{-a,an accronym @comma{} @enddots{}} -a (an accronym , ...)
+@abbr{@'E-. @comma{}A., @'Etude-@comma{} @b{Autonome} } E'-. ,A. (E'tude-, Autonome)
+@abbr{@'E-. @comma{}A.} E'-. ,A.
+
+@math{-a@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
+
+@image{f-ile,,,alt@verb{:jk _" %}} f-ile
+@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
+@image{file@verb{:jk _" %@:},,,alt@verb{:jk _" %@:}} filejk _" %@
+
+
+
+
+Somehow invalid use of @,:
+
+@, ,
+
+
+@,@"u ,u"
+
+Invalid use of @':
+
+@' '
+
+
+@'@"u 'u"
+
+@dotless{truc} truc
+@dotless{ij} ij
+@dotless{-a} -a
+@dotless{a} a
+
+@U, without braces @U{}, with empty arg
+@U{z}, with non-hex arg z
+@U{abc}, with <4 hex digits abc
+@U{FFFFFFFFFFFFFF}, value much too large FFFFFFFFFFFFFF
+@U{110000}, value just beyond Unicode 110000
+
+@TeX, but without brace TeX@# #
+
+@w{-a} -a
+
+@image{,1-xt}
+@image{,,2-xt}
+@image{,,,3-xt}
+
+
+e-mph item
+
+i-tem 1
+i-tem 2
+
+fun:
+truc: machin bidule chose and
+truc: machin bidule chose and after
+truc: machin bidule chose and
+truc: machin bidule chose and and after
+truc: followed by a comment
+Various deff lines
+truc: after a deff item
+
+@ref{node} node
+
+@ref{,cross ref name}
+@ref{,,title}
+@ref{,,,file name}
+@ref{,,,,manual}
+@ref{node,cross ref name} node
+@ref{node,,title} node
+@ref{node,,,file name} node
+@ref{node,,,,manual} node
+@ref{node,cross ref name,title,} node
+@ref{node,cross ref name,,file name} node
+@ref{node,cross ref name,,,manual} node
+@ref{node,cross ref name,title,file name} node
+@ref{node,cross ref name,title,,manual} node
+@ref{node,cross ref name,title, file name, manual} node
+@ref{node,,title,file name} node
+@ref{node,,title,,manual} node
+@ref{chapter,,title, file name, manual} chapter
+@ref{node,,title, file name, manual} node
+@ref{node,,,file name,manual} node
+@ref{,cross ref name,title,}
+@ref{,cross ref name,,file name}
+@ref{,cross ref name,,,manual}
+@ref{,cross ref name,title,file name}
+@ref{,cross ref name,title,,manual}
+@ref{,cross ref name,title, file name, manual}
+@ref{,,title,file name}
+@ref{,,title,,manual}
+@ref{,,title, file name, manual}
+@ref{,,,file name,manual}
+
+@inforef{,cross ref name }
+@inforef{,,file name}
+@inforef{,cross ref name, file name}
+@inforef{}
+
+ -->
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>1.1.1.2 three&mdash;four&mdash;-&rdquo; (title &ndash;a)</title>
+
+<meta name="description" content="1.1.1.2 three&mdash;four&mdash;-&rdquo; (title &ndash;a)">
+<meta name="keywords" content="1.1.1.2 three&mdash;four&mdash;-&rdquo; (title &ndash;a)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<style type="text/css">
+<!--
+@import "sing_tex4ht_math.css";
+@import "sing_tex4ht_tex.css";
+
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" background="../singular_images/Mybg.png">
+
+<span id="subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr valign="top" align="left">
+<td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter2.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: chapter 2" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="subsection.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+</tr>
+<tr valign="top" align="left">
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr>
+</table>
+</td>
+<td align="left">
+<span id="three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027"></span><h4 class="subsubsection">1.1.1.2 three&mdash;four&mdash;-&rdquo;</h4>
+
+</td>
+</tr>
+</table>
+<hr>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left"> <a href="index.htm"><img
+ src="../singular_images/singular-icon-transparent.png" width="50"
+ border="0" alt="Top"></a>
+</td>
+<td valign="middle" align="left"><a href="subsubsection-_0060_0060simple_002ddouble_002d_002d.html" title="Previous section in reading order"><img src="../singular_images/a_left.png" border="0" alt="Back: 1.1.1.1 subsubsection &ldquo;simple-double&ndash;" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next section in reading order"><img src="../singular_images/a_right.png" border="0" alt="Forward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter.html" title="Beginning of this chapter or previous chapter"><img src="../singular_images/a_leftdouble.png" border="0" alt="FastBack: 1 chapter" align="middle"></a></td>
+<td valign="middle" align="left"><a href="chapter2.html" title="Next chapter"><img src="../singular_images/a_rightdouble.png" border="0" alt="FastForward: chapter 2" align="middle"></a></td>
+<td valign="middle" align="left"><a href="subsection.html" title="Up section"><img src="../singular_images/a_up.png" border="0" alt="Up: 1.1.1 subsection" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Cover (top) of document"><img src="../singular_images/a_top.png" border="0" alt="Top: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_toc.htm#SEC_Contents" title="Table of contents"><img src="../singular_images/a_tableofcon.png" border="0" alt="Contents: Table of Contents" align="middle"></a></td>
+<td valign="middle" align="left"><a href="index.htm" title="Index"><img src="../singular_images/a_index.png" border="0" alt="Index: Top section" align="middle"></a></td>
+<td valign="middle" align="left"><a href="sing_abt.htm#SEC_About" title="About (help)"><img src="../singular_images/a_help.png" border="0" alt="About: About This Document" align="middle"></a></td>
+</tr></table>
+
+<font size="-1">
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; User manual for <a href="http://www.singular.uni-kl.de/"><i>Singular</i></a> version NO VERSION, NO VERSION DATE,
+generated by <a href="http://www.gnu.org/software/texinfo/"><i>texinfo</i></a>.
+</font>
+
+
+</body>
+</html>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed-l2h_cache.pm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed-l2h_cache.pm
new file mode 100644
index 0000000000..d236ea74a6
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed-l2h_cache.pm
@@ -0,0 +1,13 @@
+
+$l2h_cache_key = q/$3\delta + 2
+$/;
+$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG STYLE="height: 2.03ex; vertical-align: -0.31ex; " SRC="math_not_closed_2.svg"
+ ALT="$3\delta + 2
+$"></SPAN>|;
+
+$l2h_cache_key = q/$\delta + 2
+$/;
+$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG STYLE="height: 2.03ex; vertical-align: -0.31ex; " SRC="math_not_closed_1.svg"
+ ALT="$\delta + 2
+$"></SPAN>|;
+1; \ No newline at end of file
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.2 b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.2
index 18477ad28c..9040b4474d 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.2
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.2
@@ -1,5 +1,6 @@
-math_not_closed.texi:7: @chapter seen before @math closing brace
math_not_closed.texi:8: warning: @chapter should not appear in @math
-math_not_closed.texi:10: @bye seen before @math closing brace
+math_not_closed.texi:7: @chapter seen before @math closing brace
math_not_closed.texi:11: warning: @bye should not appear in @math
+math_not_closed.texi:10: @bye seen before @math closing brace
+texexpand
math_not_closed.texi: warning: must specify a title with a title command or @top
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
index 238bb113d6..7ef1da543d 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Untitled Document</title>
<meta name="description" content="Untitled Document">
@@ -9,32 +10,21 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -42,14 +32,16 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-
-<a name="Top"></a>
+<body lang="en">
-<a name="Chapter"></a>
-<h1 class="chapter">1 Chapter</h1>
+<span id="Top"></span>
+<p><SPAN CLASS="MATH"><IMG STYLE="height: 2.03ex; vertical-align: -0.31ex; " SRC="math_not_closed_1.svg"
+ ALT="$\delta + 2
+$"></SPAN></p><span id="Chapter"></span><h1 class="chapter">1 Chapter</h1>
-<hr>
+<p><SPAN CLASS="MATH"><IMG STYLE="height: 2.03ex; vertical-align: -0.31ex; " SRC="math_not_closed_2.svg"
+ ALT="$3\delta + 2
+$"></SPAN></p><hr>
<p><font size="-1">
This document was generated on <em>a sunny day</em> using <a href="http://www.gnu.org/software/texinfo/"><em>texi2any</em></a>.
</font></p>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.html
new file mode 100644
index 0000000000..78afcf3355
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+
+<!--Converted with LaTeX2HTML
+<HTML lang="EN">
+<HEAD>
+<TITLE>math_not_closed_l2h</TITLE>
+<META NAME="description" CONTENT="math_not_closed_l2h">
+<META NAME="keywords" CONTENT="math_not_closed_l2h">
+<META NAME="resource-type" CONTENT="document">
+<META NAME="distribution" CONTENT="global">
+
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
+<META NAME="Generator" CONTENT="LaTeX2HTML">
+
+<LINK REL="STYLESHEET" HREF="math_not_closed_l2h.css">
+
+</HEAD>
+
+<BODY >
+
+<!-- l2h_begin math_not_closed_l2h 1 -->
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.03ex; vertical-align: -0.31ex; " SRC="math_not_closed_l2h_img1.svg"
+ ALT="$\delta + 2
+$"></SPAN>
+
+<!-- l2h_end math_not_closed_l2h 1 -->
+
+<!-- l2h_begin math_not_closed_l2h 2 -->
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.03ex; vertical-align: -0.31ex; " SRC="math_not_closed_l2h_img2.svg"
+ ALT="$3\delta + 2
+$"></SPAN>
+
+<!-- l2h_end math_not_closed_l2h 2 -->
+<BR>
+<HR>
+</BODY>
+</HTML>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.tex
index a6ede390cd..b038ffce4e 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.tex
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h.tex
@@ -3,4 +3,24 @@
\documentclass{article}
\usepackage{html}
\begin{document}
+\begin{rawhtml}
+
+<!-- l2h_begin math_not_closed_l2h 1 -->
+\end{rawhtml}
+$\delta + 2
+$
+\begin{rawhtml}
+<!-- l2h_end math_not_closed_l2h 1 -->
+
+\end{rawhtml}
+\begin{rawhtml}
+
+<!-- l2h_begin math_not_closed_l2h 2 -->
+\end{rawhtml}
+$3\delta + 2
+$
+\begin{rawhtml}
+<!-- l2h_end math_not_closed_l2h 2 -->
+
+\end{rawhtml}
\end{document}
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h_images.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h_images.tex
new file mode 100644
index 0000000000..ac8ae1b2f2
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h_images.tex
@@ -0,0 +1,134 @@
+\batchmode
+
+\documentclass{article}
+\RequirePackage{ifthen}
+
+
+\usepackage{html}
+
+
+\usepackage{xcolor}
+
+\usepackage[]{inputenc}
+
+
+
+\makeatletter
+
+\makeatletter
+\count@=\the\catcode`\_ \catcode`\_=8
+\newenvironment{tex2html_wrap}{}{}%
+\catcode`\<=12\catcode`\_=\count@
+\newcommand{\providedcommand}[1]{\expandafter\providecommand\csname #1\endcsname}%
+\newcommand{\renewedcommand}[1]{\expandafter\providecommand\csname #1\endcsname{}%
+ \expandafter\renewcommand\csname #1\endcsname}%
+\newcommand{\newedenvironment}[1]{\newenvironment{#1}{}{}\renewenvironment{#1}}%
+\let\newedcommand\renewedcommand
+\let\renewedenvironment\newedenvironment
+\makeatother
+\let\mathon=$
+\let\mathoff=$
+\ifx\AtBeginDocument\undefined \newcommand{\AtBeginDocument}[1]{}\fi
+\newbox\sizebox
+\setlength{\hoffset}{0pt}\setlength{\voffset}{0pt}
+\addtolength{\textheight}{\footskip}\setlength{\footskip}{0pt}
+\addtolength{\textheight}{\topmargin}\setlength{\topmargin}{0pt}
+\addtolength{\textheight}{\headheight}\setlength{\headheight}{0pt}
+\addtolength{\textheight}{\headsep}\setlength{\headsep}{0pt}
+\setlength{\textwidth}{451pt}
+\setlength{\textheight}{554pt}
+\newwrite\lthtmlwrite
+\makeatletter
+\let\realnormalsize=\normalsize
+\global\topskip=2sp
+\def\preveqno{}\let\real@float=\@float \let\realend@float=\end@float
+\def\@float{\let\@savefreelist\@freelist\real@float}
+\def\liih@math{\ifmmode$\else\bad@math\fi}
+\def\end@float{\realend@float\global\let\@freelist\@savefreelist}
+\let\real@dbflt=\@dbflt \let\end@dblfloat=\end@float
+\let\@largefloatcheck=\relax
+\let\if@boxedmulticols=\iftrue
+\def\@dbflt{\let\@savefreelist\@freelist\real@dbflt}
+\def\adjustnormalsize{\def\normalsize{\mathsurround=0pt \realnormalsize
+ \parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
+ \def\phantompar{\csname par\endcsname}\normalsize}%
+\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
+\usepackage[tightpage,active]{preview}
+\newbox\lthtmlPageBox
+\newdimen\lthtmlCropMarkHeight
+\newdimen\lthtmlCropMarkDepth
+\long\def\lthtmlTightVBox#1#2{%
+ \setbox\lthtmlPageBox\vbox{\hbox{\catcode`\_=8 #2}}%
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}}%
+\long\def\lthtmlTightFBox#1#2{%
+ \adjustnormalsize\setbox\lthtmlPageBox=\vbox\bgroup %
+ \let\ifinner=\iffalse \let\)\liih@math %
+ {\catcode`\_=8 #2}%
+ \@next\next\@currlist{}{\def\next{\voidb@x}}%
+ \expandafter\box\next\egroup %
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}%
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayB#1#2\lthtmldisplayZ{\\edef\preveqno{(\theequation)}%
+ \lthtmlTightVBox{#1}{\let\@eqnnum\relax#2}}
+ \long\def\lthtmlfigureA#1#2\lthtmlfigureZ{\let\@savefreelist\@freelist
+ \lthtmlTightFBox{#1}{#2}\global\let\@freelist\@savefreelist}
+ \long\def\lthtmlpictureA#1#2\lthtmlpictureZ{\let\@savefreelist\@freelist
+ \lthtmlTightVBox{#1}{#2}\global\let\@freelist\@savefreelist}
+\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
+ \ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
+ \else\expandafter\vss\fi}%
+\providecommand{\selectlanguage}[1]{}%
+\makeatletter \tracingstats = 1
+
+
+\begin{document}
+\pagestyle{empty}\thispagestyle{empty}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength hsize=\the\hsize}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength vsize=\the\vsize}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength hoffset=\the\hoffset}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength voffset=\the\voffset}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength topmargin=\the\topmargin}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength topskip=\the\topskip}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength headheight=\the\headheight}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength headsep=\the\headsep}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength parskip=\the\parskip}\lthtmltypeout{}%
+\lthtmltypeout{latex2htmlLength oddsidemargin=\the\oddsidemargin}\lthtmltypeout{}%
+\makeatletter
+\if@twoside\lthtmltypeout{latex2htmlLength evensidemargin=\the\evensidemargin}%
+\else\lthtmltypeout{latex2htmlLength evensidemargin=\the\oddsidemargin}\fi%
+\lthtmltypeout{}%
+\makeatother
+\setcounter{page}{1}
+\onecolumn
+
+% !!! IMAGES START HERE !!!
+
+{\newpage\clearpage
+\lthtmlinlinemathA{tex2html_wrap_inline5}%
+$\delta + 2
+$%
+\lthtmlindisplaymathZ
+\lthtmlcheckvsize\clearpage}
+
+{\newpage\clearpage
+\lthtmlinlinemathA{tex2html_wrap_inline7}%
+$3\delta + 2
+$%
+\lthtmlindisplaymathZ
+\lthtmlcheckvsize\clearpage}
+
+
+\end{document}
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h_labels.pl b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h_labels.pl
new file mode 100644
index 0000000000..ecc7b241c4
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/math_not_closed/math_not_closed_l2h_labels.pl
@@ -0,0 +1,13 @@
+# LaTeX2HTML
+# Associate labels original text with physical files.
+
+
+1;
+
+
+# LaTeX2HTML
+# labels from external_latex_labels array.
+
+
+1;
+
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/simplest_httex/simplest.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
index b4140d80e4..db24cdfe89 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/simplest_httex/simplest.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Untitled Document</title>
<meta name="description" content="Untitled Document">
@@ -9,32 +10,21 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -42,10 +32,9 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-
-<a name="Top"></a>
+<body lang="en">
+<span id="Top"></span>
<p>This is a very simple texi manual &nbsp; &lt;&gt;.
</p>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm
index 04477f9fe3..b39fef8eba 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex-l2h_cache.pm
@@ -6,7 +6,7 @@ $$ \chi^2 = \sum_{i=1}^N
$l2h_cache{$l2h_cache_key} = q|
<P>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\chi^2 = \sum_{i=1}^N
@@ -15,9 +15,8 @@ $l2h_cache{$l2h_cache_key} = q|
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="50" BORDER="0"
- SRC="tex_1.png"
+<IMG STYLE=""
+ SRC="tex_1.svg"
ALT="\begin{displaymath}\chi^2 = \sum_{i=1}^N
\left(y_i - (a + b x_i)
\over \sigma_i\right)^2 \end{displaymath}">
@@ -31,36 +30,28 @@ $l2h_cache{$l2h_cache_key} = q|
<P>
tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>|;
-$l2h_cache_key = q/$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$/;
-$l2h_cache{$l2h_cache_key} = q|<!-- MATH
- $\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
- -->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_5.png"
- ALT="$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>|;
-
$l2h_cache_key = q/$@code{math code} a < b$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$@code{math code} a < b$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="20" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_4.svg"
ALT="$@code{math code} a &lt; b$"></SPAN>|;
+$l2h_cache_key = q/$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$/;
+$l2h_cache{$l2h_cache_key} = q|<!-- MATH
+ $\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
+ -->
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_5.svg"
+ ALT="$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>|;
+
$l2h_cache_key = q/$a @\ b$/;
-$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="10" ALIGN="BOTTOM" BORDER="0"
- SRC="tex_3.png"
+$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_3.svg"
ALT="$a @\ b$"></SPAN>|;
$l2h_cache_key = q/${x^i}\over{\tan y}$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
${x^i}\over{\tan y}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_2.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>|;
1; \ No newline at end of file
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.2 b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.2
index 9e9195604d..b51ab7bc1d 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.2
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.2
@@ -1,4 +1,4 @@
-tex.texi:7: warning: @tex should only appear at a line beginning
+tex.texi:7: warning: @tex should only appear at the beginning of a line
tex.texi:14: superfluous argument to @end tex: bidule
tex.texi:42: warning: @\ should only appear in math context
texexpand
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.html
index 672992459a..46e34c0390 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Tests</title>
<meta name="description" content="Tests">
@@ -9,32 +10,21 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -42,15 +32,13 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-<a name="Top"></a>
-<a name="Tests"></a>
-<h1 class="top">Tests</h1>
+<body lang="en">
+<span id="Top"></span><span id="Tests"></span><h1 class="top">Tests</h1>
<p>Now tex on the same line
<P>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\chi^2 = \sum_{i=1}^N
@@ -59,9 +47,8 @@ ul.no-bullet {list-style: none}
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="50" BORDER="0"
- SRC="tex_1.png"
+<IMG STYLE=""
+ SRC="tex_1.svg"
ALT="\begin{displaymath}\chi^2 = \sum_{i=1}^N
\left(y_i - (a + b x_i)
\over \sigma_i\right)^2 \end{displaymath}">
@@ -81,15 +68,11 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
Here some <!-- MATH
${x^i}\over{\tan y}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_2.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>.
</p>
<p>Maths with protected \:
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="10" ALIGN="BOTTOM" BORDER="0"
- SRC="tex_3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_3.svg"
ALT="$a @\ b$"></SPAN>.
</p>
<p>Maths with code @-command:
@@ -97,9 +80,7 @@ Here some <!-- MATH
<p><!-- MATH
$@code{math code} a < b$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="20" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_4.svg"
ALT="$@code{math code} a &lt; b$"></SPAN>
</p>
<p>Maths with code @-command and braces:
@@ -107,10 +88,8 @@ Here some <!-- MATH
<p><!-- MATH
$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_5.png"
- ALT="$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_5.svg"
+ ALT="$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
</p>
<p>@\ outside of math
</p>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.html
index 2a4bdf200a..628f10514a 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>tex_l2h</TITLE>
<META NAME="description" CONTENT="tex_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="tex_l2h.css">
@@ -26,7 +23,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<P>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\chi^2 = \sum_{i=1}^N
@@ -35,9 +32,8 @@ original version by: Nikos Drakos, CBLU, University of Leeds
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="50" BORDER="0"
- SRC="tex_l2h_img1.png"
+<IMG STYLE=""
+ SRC="tex_l2h_img1.svg"
ALT="\begin{displaymath}\chi^2 = \sum_{i=1}^N
\left(y_i - (a + b x_i)
\over \sigma_i\right)^2 \end{displaymath}">
@@ -57,17 +53,13 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
<!-- MATH
${x^i}\over{\tan y}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_l2h_img2.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 3.73ex; vertical-align: -1.23ex; " SRC="tex_l2h_img2.svg"
ALT="${x^i}\over{\tan y}$"></SPAN>
<!-- l2h_end tex_l2h 3 -->
<!-- l2h_begin tex_l2h 4 -->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="10" ALIGN="BOTTOM" BORDER="0"
- SRC="tex_l2h_img3.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.84ex; vertical-align: -0.12ex; " SRC="tex_l2h_img3.svg"
ALT="$a @\ b$"></SPAN>
<!-- l2h_end tex_l2h 4 -->
@@ -76,9 +68,7 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
<!-- MATH
$@code{math code} a < b$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="20" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_l2h_img4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 1.93ex; vertical-align: -0.21ex; " SRC="tex_l2h_img4.svg"
ALT="$@code{math code} a &lt; b$"></SPAN>
<!-- l2h_end tex_l2h 5 -->
@@ -87,10 +77,8 @@ tex <SPAN CLASS="logo-TeX">T<SMALL>E</SMALL>X</SPAN>
<!-- MATH
$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_l2h_img5.png"
- ALT="$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.88ex; vertical-align: -1.03ex; " SRC="tex_l2h_img5.svg"
+ ALT="$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$"></SPAN>
<!-- l2h_end tex_l2h 6 -->
<BR>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
index 7694f49724..1265c39a54 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h.tex
@@ -56,7 +56,7 @@ $@code{math code} a < b$
<!-- l2h_begin tex_l2h 6 -->
\end{rawhtml}
-$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
+$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$
\begin{rawhtml}
<!-- l2h_end tex_l2h 6 -->
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex
index d97654c3a3..b8153604bc 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex/tex_l2h_images.tex
@@ -7,10 +7,7 @@
\usepackage{html}
-\usepackage[dvips]{color}
-
-
-\pagecolor[gray]{.7}
+\usepackage{xcolor}
\usepackage[]{inputenc}
@@ -56,56 +53,40 @@
\parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
\def\phantompar{\csname par\endcsname}\normalsize}%
\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
-\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }%
-\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }%
-\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup %
- \let\ifinner=\iffalse \let\)\liih@math }%
-\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
- \expandafter\box\next\egroup}%
-\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
-\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
- \ifdim\dimen0>.95\vsize
- \lthtmltypeout{%
-*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
- \ht\sizebox.95\vsize \dp\sizebox\z@ \fi
- \lthtmltypeout{l2hSize %
-:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
-\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
- \lthtmlmathtype{#1}\lthtmlvboxmathA}%
-\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}%
-\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup
- \let\@savefreelist\@freelist \lthtmlhboxmathB}%
-\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}%
-\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox
- \global\let\@freelist\@savefreelist}%
-\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}%
-\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}%
-\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}%
- \lthtmldisplayA{#1}\let\@eqnnum\relax}%
-\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}%
-\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB}
-\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA
- \vrule height1.5ex width0pt }%
-\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}%
-\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}%
-\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline}
-\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath}
-\newcommand\lthtmlindisplaymathZ{\egroup %
- \centerinlinemath\lthtmllogmath\lthtmlsetmath}
-\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{%
- \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{%
- \kern.1em\kern0.75 pt\hbox{\hglue.17em\copy\sizebox\hglue0.75 pt}}\kern.3pt%
- \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.75 pt%
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\centerinlinemath{%
- \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi
- \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1
- \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax}
-
+\usepackage[tightpage,active]{preview}
+\newbox\lthtmlPageBox
+\newdimen\lthtmlCropMarkHeight
+\newdimen\lthtmlCropMarkDepth
+\long\def\lthtmlTightVBox#1#2{%
+ \setbox\lthtmlPageBox\vbox{\hbox{\catcode`\_=8 #2}}%
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}}%
+\long\def\lthtmlTightFBox#1#2{%
+ \adjustnormalsize\setbox\lthtmlPageBox=\vbox\bgroup %
+ \let\ifinner=\iffalse \let\)\liih@math %
+ {\catcode`\_=8 #2}%
+ \@next\next\@currlist{}{\def\next{\voidb@x}}%
+ \expandafter\box\next\egroup %
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}%
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayB#1#2\lthtmldisplayZ{\\edef\preveqno{(\theequation)}%
+ \lthtmlTightVBox{#1}{\let\@eqnnum\relax#2}}
+ \long\def\lthtmlfigureA#1#2\lthtmlfigureZ{\let\@savefreelist\@freelist
+ \lthtmlTightFBox{#1}{#2}\global\let\@freelist\@savefreelist}
+ \long\def\lthtmlpictureA#1#2\lthtmlpictureZ{\let\@savefreelist\@freelist
+ \lthtmlTightVBox{#1}{#2}\global\let\@freelist\@savefreelist}
\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
\ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
\else\expandafter\vss\fi}%
@@ -146,25 +127,25 @@
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline17}%
${x^i}\over{\tan y}$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline19}%
$a @\ b$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline21}%
$@code{math code} a < b$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline23}%
-$ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$%
-\lthtmlinlinemathZ
+$\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}$%
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
index 699526ae40..0a48976cf6 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_httex/tex_accents.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Untitled Document</title>
<meta name="description" content="Untitled Document">
@@ -9,34 +10,23 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
@import "tex_accents_tex4ht_tex.css";
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -44,7 +34,7 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<body lang="en">
Tét
<hr>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
index f843cccdee..cea5d46c47 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Untitled Document</title>
<meta name="description" content="Untitled Document">
@@ -9,32 +10,21 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -42,7 +32,7 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<body lang="en">
T&#233;t
<hr>
<p><font size="-1">
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html
index 8b84bc9906..d2dfaef113 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_accents_l2h/tex_accents_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>tex_accents_l2h</TITLE>
<META NAME="description" CONTENT="tex_accents_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="tex_accents_l2h.css">
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
index 65ba4a92c9..52aa88deb2 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
@@ -6,6 +6,7 @@ $$
Some (I-D) \varphi(t) math. -->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>The title</title>
<meta name="description" content="The title">
@@ -13,35 +14,24 @@ Some (I-D) \varphi(t) math. -->
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
@import "tex_complex_tex4ht_math.css";
@import "tex_complex_tex4ht_tex.css";
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -49,31 +39,27 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<body lang="en">
<h1>The title</h1>
<center class="math-display" >
<img
-src="tex_complex_tex4ht_tex0x.png" alt="&part;&eta;g(&eta;(t),&phi;(t)); " class="math-display" ></center>
+src="tex_complex_tex4ht_tex0x.png" alt="&#x2202;&#x03B7;g(&#x03B7;(t),&#x03C6;(t)); " class="math-display" ></center>
-<p>Some (I &minus; D)&phi;(t) math.
-</p>
-<hr>
+<p>Some (I - D)&#x03C6;(t) math.
+</p><hr>
-<a name="Top"></a>
-<a name="The-title"></a>
-<h1 class="top">The title</h1>
+<span id="Top"></span><span id="The-title"></span><h1 class="top">The title</h1>
<center class="math-display" >
<img
-src="tex_complex_tex4ht_tex0x.png" alt="&part;&eta;g(&eta;(t),&phi;(t)); " class="math-display" ></center>
+src="tex_complex_tex4ht_tex0x.png" alt="&#x2202;&#x03B7;g(&#x03B7;(t),&#x03C6;(t)); " class="math-display" ></center>
-<p>Some (I &minus; D)&phi;(t) math.
+<p>Some (I - D)&#x03C6;(t) math.
</p>
-
<p>Tex:
<center class="math-display" >
@@ -81,22 +67,22 @@ src="tex_complex_tex4ht_tex0x.png" alt="&part;&eta;g(&eta;(t),&phi;(t)); " clas
src="tex_complex_tex4ht_tex1x.png" alt=" &#8224;
UwV " class="math-display" ></center>
</p>
-<p>and math &#x03D5;wV t.
+<p>and math &#x03D5;wV t.
</p>
-<p>Now there is a footnote<a name="DOCF1" href="#FOOT1"><sup>1</sup></a>
+<p>Now there is a footnote<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
</p>
<div class="footnote">
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<center class="math-display" >
<img
-src="tex_complex_tex4ht_tex2x.png" alt="&omega; = h(&eta;,&phi; ) " class="math-display" ></center>
+src="tex_complex_tex4ht_tex2x.png" alt="&#x03C9; = h(&#x03B7;,&#x03C6; ) " class="math-display" ></center>
-<p>and math h &#x02D9;&psi;&#x03D5;.
+<p>and math h &#x02D9;&#x03C8;&#x03D5;.
</p>
</div>
<hr>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.aux b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.aux
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.aux
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.cp b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.cp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.cp
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.fn b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.fn
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.fn
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html
index e98a5e4ba0..4b0e74093a 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html
@@ -1,11 +1,11 @@
&#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 1 --&#x003E;
- (I &minus; D)&phi;(t)
- &#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 1 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 2 --&#x003E;
- &#x03D5;wV t
- &#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 2 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 3 --&#x003E;
- h &#x02D9;&psi;&#x03D5;
- &#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 3 --&#x003E;
+ (I - D)&#x03C6;(t)
+&#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 1 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 2 --&#x003E;
+ &#x03D5;wV t
+&#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 2 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_complex_tex4ht_math math 3 --&#x003E;
+ h &#x02D9;&#x03C8;&#x03D5;
+&#x003C;!-- tex4ht_end tex_complex_tex4ht_math math 3 --&#x003E;
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.ky b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.ky
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.ky
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.pg b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.pg
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.pg
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tp b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tp
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.vr b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.vr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.vr
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm
index 215d262575..2c75767813 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm
@@ -3,16 +3,15 @@ $l2h_cache_key = q/$$
U w V^\dagger
$$/;
$l2h_cache{$l2h_cache_key} = q|<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
U w V^\dagger
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_2.png"
+<IMG STYLE=""
+ SRC="tex_complex_2.svg"
ALT="\begin{displaymath}
U w V^\dagger
\end{displaymath}">
@@ -24,16 +23,15 @@ $l2h_cache_key = q/$$
\omega = h ( \eta , \varphi)
$$/;
$l2h_cache{$l2h_cache_key} = q|<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_3.png"
+<IMG STYLE=""
+ SRC="tex_complex_3.svg"
ALT="\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}">
@@ -44,16 +42,15 @@ $l2h_cache{$l2h_cache_key} = q|<BR><P></P>
$l2h_cache_key = q/$$\partial_{\eta} g(\eta(t),\varphi(t));
$$/;
$l2h_cache{$l2h_cache_key} = q|<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_1.png"
+<IMG STYLE=""
+ SRC="tex_complex_1.svg"
ALT="\begin{displaymath}\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}">
</DIV>
@@ -64,23 +61,17 @@ $l2h_cache_key = q/$(I-D) \varphi(t)$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$(I-D) \varphi(t)$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
ALT="$(I-D) \varphi(t)$"></SPAN>|;
$l2h_cache_key = q/$\phi w V^t$/;
-$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_5.png"
+$l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_5.svg"
ALT="$\phi w V^t$"></SPAN>|;
$l2h_cache_key = q/$h \dot \psi^\phi$/;
$l2h_cache{$l2h_cache_key} = q|<!-- MATH
$h \dot \psi^\phi$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_6.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.84ex; vertical-align: -0.57ex; " SRC="tex_complex_6.svg"
ALT="$h \dot \psi^\phi$"></SPAN>|;
1; \ No newline at end of file
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
index f81645a84a..3d5c4125a2 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
@@ -6,6 +6,7 @@ $$
Some (I-D) \varphi(t) math. -->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>The title</title>
<meta name="description" content="The title">
@@ -13,32 +14,21 @@ Some (I-D) \varphi(t) math. -->
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -46,20 +36,19 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<body lang="en">
<h1>The title</h1>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_1.png"
+<IMG STYLE=""
+ SRC="tex_complex_1.svg"
ALT="\begin{displaymath}\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}">
</DIV>
@@ -69,29 +58,23 @@ ul.no-bullet {list-style: none}
<p>Some <!-- MATH
$(I-D) \varphi(t)$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
ALT="$(I-D) \varphi(t)$"></SPAN> math.
-</p>
-<hr>
+</p><hr>
-<a name="Top"></a>
-<a name="The-title"></a>
-<h1 class="top">The title</h1>
+<span id="Top"></span><span id="The-title"></span><h1 class="top">The title</h1>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_1.png"
+<IMG STYLE=""
+ SRC="tex_complex_1.svg"
ALT="\begin{displaymath}\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}">
</DIV>
@@ -101,24 +84,20 @@ ul.no-bullet {list-style: none}
<p>Some <!-- MATH
$(I-D) \varphi(t)$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
ALT="$(I-D) \varphi(t)$"></SPAN> math.
</p>
-
<p>Tex:
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
U w V^\dagger
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_2.png"
+<IMG STYLE=""
+ SRC="tex_complex_2.svg"
ALT="\begin{displaymath}
U w V^\dagger
\end{displaymath}">
@@ -126,29 +105,26 @@ U w V^\dagger
<BR CLEAR="ALL">
<P></P>
</p>
-<p>and math <SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_5.png"
+<p>and math <SPAN CLASS="MATH"><IMG STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_5.svg"
ALT="$\phi w V^t$"></SPAN>.
</p>
-<p>Now there is a footnote<a name="DOCF1" href="#FOOT1"><sup>1</sup></a>
+<p>Now there is a footnote<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
</p>
<div class="footnote">
<hr>
<h3 class="footnotes-heading">Footnotes</h3>
-<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<h5><a id="FOOT1" href="#DOCF1">(1)</a></h3>
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_3.png"
+<IMG STYLE=""
+ SRC="tex_complex_3.svg"
ALT="\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}">
@@ -159,9 +135,7 @@ U w V^\dagger
<p>and math <!-- MATH
$h \dot \psi^\phi$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_6.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.84ex; vertical-align: -0.57ex; " SRC="tex_complex_6.svg"
ALT="$h \dot \psi^\phi$"></SPAN>.
</p>
</div>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html
index 75eeb9311c..b279e9616b 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>tex_complex_l2h</TITLE>
<META NAME="description" CONTENT="tex_complex_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="tex_complex_l2h.css">
@@ -24,16 +21,15 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<!-- l2h_begin tex_complex_l2h 1 -->
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_l2h_img1.png"
+<IMG STYLE=""
+ SRC="tex_complex_l2h_img1.svg"
ALT="\begin{displaymath}\partial_{\eta} g(\eta(t),\varphi(t));
\end{displaymath}">
</DIV>
@@ -44,16 +40,15 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<!-- l2h_begin tex_complex_l2h 2 -->
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
U w V^\dagger
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_l2h_img2.png"
+<IMG STYLE=""
+ SRC="tex_complex_l2h_img2.svg"
ALT="\begin{displaymath}
U w V^\dagger
\end{displaymath}">
@@ -65,16 +60,15 @@ U w V^\dagger
<!-- l2h_begin tex_complex_l2h 3 -->
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_complex_l2h_img3.png"
+<IMG STYLE=""
+ SRC="tex_complex_l2h_img3.svg"
ALT="\begin{displaymath}
\omega = h ( \eta , \varphi)
\end{displaymath}">
@@ -88,17 +82,13 @@ U w V^\dagger
<!-- MATH
$(I-D) \varphi(t)$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_l2h_img4.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_l2h_img4.svg"
ALT="$(I-D) \varphi(t)$"></SPAN>
<!-- l2h_end tex_complex_l2h 4 -->
<!-- l2h_begin tex_complex_l2h 5 -->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_l2h_img5.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_l2h_img5.svg"
ALT="$\phi w V^t$"></SPAN>
<!-- l2h_end tex_complex_l2h 5 -->
@@ -107,9 +97,7 @@ U w V^\dagger
<!-- MATH
$h \dot \psi^\phi$
-->
-<SPAN CLASS="MATH"><IMG
- WIDTH="100" HEIGHT="30" ALIGN="MIDDLE" BORDER="0"
- SRC="tex_complex_l2h_img6.png"
+<SPAN CLASS="MATH"><IMG STYLE="height: 2.84ex; vertical-align: -0.57ex; " SRC="tex_complex_l2h_img6.svg"
ALT="$h \dot \psi^\phi$"></SPAN>
<!-- l2h_end tex_complex_l2h 6 -->
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex
index 6f9769def7..987361a748 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex
@@ -7,10 +7,7 @@
\usepackage{html}
-\usepackage[dvips]{color}
-
-
-\pagecolor[gray]{.7}
+\usepackage{xcolor}
\usepackage[]{inputenc}
@@ -56,56 +53,40 @@
\parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
\def\phantompar{\csname par\endcsname}\normalsize}%
\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
-\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }%
-\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }%
-\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup %
- \let\ifinner=\iffalse \let\)\liih@math }%
-\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
- \expandafter\box\next\egroup}%
-\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
-\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
- \ifdim\dimen0>.95\vsize
- \lthtmltypeout{%
-*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
- \ht\sizebox.95\vsize \dp\sizebox\z@ \fi
- \lthtmltypeout{l2hSize %
-:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
-\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
- \lthtmlmathtype{#1}\lthtmlvboxmathA}%
-\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}%
-\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup
- \let\@savefreelist\@freelist \lthtmlhboxmathB}%
-\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}%
-\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox
- \global\let\@freelist\@savefreelist}%
-\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}%
-\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}%
-\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}%
- \lthtmldisplayA{#1}\let\@eqnnum\relax}%
-\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}%
-\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB}
-\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA
- \vrule height1.5ex width0pt }%
-\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}%
-\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}%
-\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline}
-\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath}
-\newcommand\lthtmlindisplaymathZ{\egroup %
- \centerinlinemath\lthtmllogmath\lthtmlsetmath}
-\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{%
- \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{%
- \kern.1em\kern0.75 pt\hbox{\hglue.17em\copy\sizebox\hglue0.75 pt}}\kern.3pt%
- \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.75 pt%
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\centerinlinemath{%
- \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi
- \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1
- \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax}
-
+\usepackage[tightpage,active]{preview}
+\newbox\lthtmlPageBox
+\newdimen\lthtmlCropMarkHeight
+\newdimen\lthtmlCropMarkDepth
+\long\def\lthtmlTightVBox#1#2{%
+ \setbox\lthtmlPageBox\vbox{\hbox{\catcode`\_=8 #2}}%
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}}%
+\long\def\lthtmlTightFBox#1#2{%
+ \adjustnormalsize\setbox\lthtmlPageBox=\vbox\bgroup %
+ \let\ifinner=\iffalse \let\)\liih@math %
+ {\catcode`\_=8 #2}%
+ \@next\next\@currlist{}{\def\next{\voidb@x}}%
+ \expandafter\box\next\egroup %
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}%
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayB#1#2\lthtmldisplayZ{\\edef\preveqno{(\theequation)}%
+ \lthtmlTightVBox{#1}{\let\@eqnnum\relax#2}}
+ \long\def\lthtmlfigureA#1#2\lthtmlfigureZ{\let\@savefreelist\@freelist
+ \lthtmlTightFBox{#1}{#2}\global\let\@freelist\@savefreelist}
+ \long\def\lthtmlpictureA#1#2\lthtmlpictureZ{\let\@savefreelist\@freelist
+ \lthtmlTightVBox{#1}{#2}\global\let\@freelist\@savefreelist}
\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
\ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
\else\expandafter\vss\fi}%
@@ -161,19 +142,19 @@
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline12}%
$(I-D) \varphi(t)$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline14}%
$\phi w V^t$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
{\newpage\clearpage
\lthtmlinlinemathA{tex2html_wrap_inline16}%
$h \dot \psi^\phi$%
-\lthtmlinlinemathZ
+\lthtmlindisplaymathZ
\lthtmlcheckvsize\clearpage}
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex.html
index 19340135ea..1097041650 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Tests</title>
<meta name="description" content="Tests">
@@ -9,35 +10,24 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
@import "tex_tex4ht_math.css";
@import "tex_tex4ht_tex.css";
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -45,18 +35,16 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-<a name="Top"></a>
-<a name="Tests"></a>
-<h1 class="top">Tests</h1>
+<body lang="en">
+<span id="Top"></span><span id="Tests"></span><h1 class="top">Tests</h1>
<p>Now tex on the same line
<!--l. 5--><p class="indent" >
<center class="math-display" >
<img
src="tex_tex4ht_tex0x.png" alt=" N ( )2
-&chi;2 = &sum; yi &minus;-(a+-bxi)
- i=1 &sigma;i
+&#x03C7;2 = &#x2211; yi --(a+-bxi)
+ i=1 &#x03C3;i
" class="math-display" ></center>
<!--l. 10--><p class="indent" >
Some text one the line following @end tex
@@ -69,21 +57,20 @@ class="E">E</span>X</span>
<p>Same that @html (but empty following line not ignored).
</p>
<p>Test of @math
-Here some xi
-_
+Here some xi __
tan y.
</p>
<p>Maths with protected \:
- a\b.
+ a\b.
</p>
<p>Maths with code @-command:
</p>
-<p> mathcodea &#x003C; b
+<p> mathcodea &#x003C; b
</p>
<p>Maths with code @-command and braces:
</p>
-<p> math code_&sum;
- i f
+<p> math code _&#x2211;
+ i f
</p>
<p>@\ outside of math
</p>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.aux b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.aux
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.aux
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.cp b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.cp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.cp
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.fn b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.fn
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.fn
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.html
index 81fd4f5873..1b5d4f6c3f 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.html
@@ -1,17 +1,16 @@
&#x003C;!-- tex4ht_begin tex_tex4ht_math math 1 --&#x003E;
- xi
-_
+ xi __
tan y
- &#x003C;!-- tex4ht_end tex_tex4ht_math math 1 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_tex4ht_math math 2 --&#x003E;
- a\b
- &#x003C;!-- tex4ht_end tex_tex4ht_math math 2 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_tex4ht_math math 3 --&#x003E;
- mathcodea &#x003C; b
- &#x003C;!-- tex4ht_end tex_tex4ht_math math 3 --&#x003E;
- &#x003C;!-- tex4ht_begin tex_tex4ht_math math 4 --&#x003E;
- math code_&sum;
- i f
- &#x003C;!-- tex4ht_end tex_tex4ht_math math 4 --&#x003E;
+&#x003C;!-- tex4ht_end tex_tex4ht_math math 1 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_tex4ht_math math 2 --&#x003E;
+ a\b
+&#x003C;!-- tex4ht_end tex_tex4ht_math math 2 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_tex4ht_math math 3 --&#x003E;
+ mathcodea &#x003C; b
+&#x003C;!-- tex4ht_end tex_tex4ht_math math 3 --&#x003E;
+&#x003C;!-- tex4ht_begin tex_tex4ht_math math 4 --&#x003E;
+ math code _&#x2211;
+ i f
+&#x003C;!-- tex4ht_end tex_tex4ht_math math 4 --&#x003E;
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.ky b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.ky
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.ky
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.pg b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.pg
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.pg
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.texi b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.texi
index fb3e0c31cf..909728544d 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.texi
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.texi
@@ -32,7 +32,7 @@
<!-- tex4ht_begin tex_tex4ht_math math 4 -->
@end verbatim
-@math{ \underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}}
+@math{\underline{@code{math \hbox{ code }}} \sum_{i}{\underline{f}}}
@verbatim
<!-- tex4ht_end tex_tex4ht_math math 4 -->
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tp b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tp
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tp
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.vr b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.vr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.vr
+++ /dev/null
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm
index 177ff0431b..1ad3bfc48d 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm
@@ -3,16 +3,15 @@ $l2h_cache_key = q/$$
2 a = \dot{\phi}
$$/;
$l2h_cache{$l2h_cache_key} = q|<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
2 a = \dot{\phi}
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_in_copying_2.png"
+<IMG STYLE=""
+ SRC="tex_in_copying_2.svg"
ALT="\begin{displaymath}
2 a = \dot{\phi}
\end{displaymath}">
@@ -26,16 +25,15 @@ a = \phi
$$/;
$l2h_cache{$l2h_cache_key} = q|From @ someone &lt;&gt; !
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
a = \phi
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_in_copying_1.png"
+<IMG STYLE=""
+ SRC="tex_in_copying_1.svg"
ALT="\begin{displaymath}
a = \phi
\end{displaymath}">
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
index c819cc1655..ca7e4a0b72 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html
@@ -9,6 +9,7 @@ $$
-->
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Top node</title>
<meta name="description" content="Top node">
@@ -16,32 +17,21 @@ $$
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -49,12 +39,11 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<body lang="en">
-<a name="Top"></a>
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[ &lt; ]</td>
<td valign="middle" align="left">[<a href="#chapter" title="Next section in reading order"> &gt; </a>]</td>
<td valign="middle" align="left"> &nbsp; </td>
@@ -62,23 +51,21 @@ ul.no-bullet {list-style: none}
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
-<a name="Top-node"></a>
-<h1 class="top">Top node</h1>
+<span id="Top-node"></span><h1 class="top">Top node</h1>
<p>Some equation is indeed needed to understand the copyright of
that file
From @ someone &lt;&gt; !
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
a = \phi
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_in_copying_1.png"
+<IMG STYLE=""
+ SRC="tex_in_copying_1.svg"
ALT="\begin{displaymath}
a = \phi
\end{displaymath}">
@@ -87,7 +74,6 @@ a = \phi
<P></P>
</p>
-
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#chapter">1 chapter</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
</td></tr>
@@ -97,16 +83,15 @@ a = \phi
that file
From @ someone &lt;&gt; !
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
a = \phi
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_in_copying_1.png"
+<IMG STYLE=""
+ SRC="tex_in_copying_1.svg"
ALT="\begin{displaymath}
a = \phi
\end{displaymath}">
@@ -115,10 +100,8 @@ a = \phi
<P></P>
</p>
-
<hr size="6">
-<a name="chapter"></a>
-<table class="header" cellpadding="1" cellspacing="1" border="0">
+<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Previous section in reading order"> &lt; </a>]</td>
<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td>
@@ -133,21 +116,19 @@ a = \phi
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
-<a name="chapter-1"></a>
-<h1 class="chapter">1 chapter</h1>
+<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1>
<p>The fundamental equation is
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
2 a = \dot{\phi}
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_in_copying_2.png"
+<IMG STYLE=""
+ SRC="tex_in_copying_2.svg"
ALT="\begin{displaymath}
2 a = \dot{\phi}
\end{displaymath}">
@@ -159,16 +140,15 @@ a = \phi
that file
From @ someone &lt;&gt; !
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
a = \phi
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_in_copying_1.png"
+<IMG STYLE=""
+ SRC="tex_in_copying_1.svg"
ALT="\begin{displaymath}
a = \phi
\end{displaymath}">
@@ -178,9 +158,8 @@ a = \phi
</p>
-
<hr size="6">
-<a name="SEC_About"></a>
+<span id="SEC_About"></span>
<table class="header" cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[Contents]</td>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html
index 7c73bf49fd..c1dcbd92ff 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>tex_in_copying_l2h</TITLE>
<META NAME="description" CONTENT="tex_in_copying_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="tex_in_copying_l2h.css">
@@ -25,16 +22,15 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<!-- l2h_begin tex_in_copying_l2h 1 -->
From @ someone &lt;&gt; !
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
a = \phi
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_in_copying_l2h_img1.png"
+<IMG STYLE=""
+ SRC="tex_in_copying_l2h_img1.svg"
ALT="\begin{displaymath}
a = \phi
\end{displaymath}">
@@ -46,16 +42,15 @@ a = \phi
<!-- l2h_begin tex_in_copying_l2h 2 -->
<BR><P></P>
-<DIV ALIGN="CENTER" CLASS="mathdisplay">
+<DIV CLASS="mathdisplay">
<!-- MATH
\begin{displaymath}
2 a = \dot{\phi}
\end{displaymath}
-->
-<IMG
- WIDTH="100" HEIGHT="20" BORDER="0"
- SRC="tex_in_copying_l2h_img2.png"
+<IMG STYLE=""
+ SRC="tex_in_copying_l2h_img2.svg"
ALT="\begin{displaymath}
2 a = \dot{\phi}
\end{displaymath}">
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex
index 9df60ec613..e7b5750208 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex
@@ -7,10 +7,7 @@
\usepackage{html}
-\usepackage[dvips]{color}
-
-
-\pagecolor[gray]{.7}
+\usepackage{xcolor}
\usepackage[]{inputenc}
@@ -56,56 +53,40 @@
\parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}%
\def\phantompar{\csname par\endcsname}\normalsize}%
\def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}%
-\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }%
-\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }%
-\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup %
- \let\ifinner=\iffalse \let\)\liih@math }%
-\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}%
- \expandafter\box\next\egroup}%
-\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}%
-\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox
- \ifdim\dimen0>.95\vsize
- \lthtmltypeout{%
-*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}%
- \ht\sizebox.95\vsize \dp\sizebox\z@ \fi
- \lthtmltypeout{l2hSize %
-:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}%
-\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist
- \lthtmlmathtype{#1}\lthtmlvboxmathA}%
-\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}%
-\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup
- \let\@savefreelist\@freelist \lthtmlhboxmathB}%
-\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}%
-\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox
- \global\let\@freelist\@savefreelist}%
-\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}%
-\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}%
-\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}%
- \lthtmldisplayA{#1}\let\@eqnnum\relax}%
-\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}%
-\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB}
-\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA
- \vrule height1.5ex width0pt }%
-\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}%
-\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}%
-\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline}
-\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt %
- \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath}
-\newcommand\lthtmlindisplaymathZ{\egroup %
- \centerinlinemath\lthtmllogmath\lthtmlsetmath}
-\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{%
- \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{%
- \kern.1em\kern0.75 pt\hbox{\hglue.17em\copy\sizebox\hglue0.75 pt}}\kern.3pt%
- \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.75 pt%
- \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}}
-\def\centerinlinemath{%
- \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi
- \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1
- \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax}
-
+\usepackage[tightpage,active]{preview}
+\newbox\lthtmlPageBox
+\newdimen\lthtmlCropMarkHeight
+\newdimen\lthtmlCropMarkDepth
+\long\def\lthtmlTightVBox#1#2{%
+ \setbox\lthtmlPageBox\vbox{\hbox{\catcode`\_=8 #2}}%
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}}%
+\long\def\lthtmlTightFBox#1#2{%
+ \adjustnormalsize\setbox\lthtmlPageBox=\vbox\bgroup %
+ \let\ifinner=\iffalse \let\)\liih@math %
+ {\catcode`\_=8 #2}%
+ \@next\next\@currlist{}{\def\next{\voidb@x}}%
+ \expandafter\box\next\egroup %
+ \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt
+ \lthtmlCropMarkDepth=\dp\lthtmlPageBox
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}%
+ \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}%
+ \begin{preview}\copy\lthtmlPageBox\end{preview}}%
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}}
+ \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}}
+ \long\def\lthtmldisplayB#1#2\lthtmldisplayZ{\\edef\preveqno{(\theequation)}%
+ \lthtmlTightVBox{#1}{\let\@eqnnum\relax#2}}
+ \long\def\lthtmlfigureA#1#2\lthtmlfigureZ{\let\@savefreelist\@freelist
+ \lthtmlTightFBox{#1}{#2}\global\let\@freelist\@savefreelist}
+ \long\def\lthtmlpictureA#1#2\lthtmlpictureZ{\let\@savefreelist\@freelist
+ \lthtmlTightVBox{#1}{#2}\global\let\@freelist\@savefreelist}
\def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize
\ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill
\else\expandafter\vss\fi}%
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
index d72fe2c736..13acb60cf8 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Untitled Document</title>
<meta name="description" content="Untitled Document">
@@ -9,32 +10,21 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -42,9 +32,8 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-<a name="Top"></a>
-
+<body lang="en">
+<span id="Top"></span>
<p>texte
</p>
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed_l2h.html
index 14fe0b3944..4d4b90e37a 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed_l2h.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_not_closed/tex_not_closed_l2h.html
@@ -1,11 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML>
<!--Converted with LaTeX2HTML
-original version by: Nikos Drakos, CBLU, University of Leeds
-* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
-* with significant contributions from:
- Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
-<HTML>
+<HTML lang="EN">
<HEAD>
<TITLE>tex_not_closed_l2h</TITLE>
<META NAME="description" CONTENT="tex_not_closed_l2h">
@@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0">
<META NAME="Generator" CONTENT="LaTeX2HTML">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="STYLESHEET" HREF="tex_not_closed_l2h.css">
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.2 b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.2
index 0850505d3e..a72744a641 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.2
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.2
@@ -1,3 +1,3 @@
-tex.texi:7: warning: @tex should only appear at a line beginning
+tex.texi:7: warning: @tex should only appear at the beginning of a line
tex.texi:14: superfluous argument to @end tex: bidule
tex.texi:42: warning: @\ should only appear in math context
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.html
index 5dbb1b9230..ace46ecf8d 100644
--- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.html
+++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_notex/tex.html
@@ -2,6 +2,7 @@
<html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Tests</title>
<meta name="description" content="Tests">
@@ -9,32 +10,21 @@
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
-blockquote.smallquotation {font-size: smaller}
+blockquote.indentedblock {margin-right: 0em}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
-div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
-div.smalldisplay {margin-left: 3.2em}
-div.smallexample {margin-left: 3.2em}
-div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
-div.smalllisp {margin-left: 3.2em}
-kbd {font-style:oblique}
+kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: inherit; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: inherit; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.nocodebreak {white-space:nowrap}
-span.nolinebreak {white-space:nowrap}
-span.roman {font-family:serif; font-weight:normal}
-span.sansserif {font-family:sans-serif; font-weight:normal}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>
@@ -42,10 +32,8 @@ ul.no-bullet {list-style: none}
</head>
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
-<a name="Top"></a>
-<a name="Tests"></a>
-<h1 class="top">Tests</h1>
+<body lang="en">
+<span id="Top"></span><span id="Tests"></span><h1 class="top">Tests</h1>
<p>Now tex on the same line Some text one the line following @end tex
</p>
diff --git a/macros/texinfo/texinfo/tp/texi2any.pl b/macros/texinfo/texinfo/tp/texi2any.pl
index 95aa067792..2b80dfc600 100644
--- a/macros/texinfo/texinfo/tp/texi2any.pl
+++ b/macros/texinfo/texinfo/tp/texi2any.pl
@@ -58,22 +58,21 @@ BEGIN
my $package = '@PACKAGE@';
my $packagedir = '@pkglibdir@';
- if ($datadir eq '@' .'datadir@' or $package eq '@' . 'PACKAGE@'
- or $packagedir eq '@' .'pkglibdir@'
+ if ($datadir eq '@' .'datadir@'
or defined($ENV{'TEXINFO_DEV_SOURCE'})
and $ENV{'TEXINFO_DEV_SOURCE'} ne '0')
{
# Use uninstalled modules
# To find Texinfo::ModulePath
- if (!defined($ENV{'top_builddir'})) {
- $ENV{'top_builddir'} = File::Spec->catdir($command_directory, $updir);
- $ENV{'top_srcdir'} = File::Spec->catdir($command_directory, $updir);
+ if (defined($ENV{'top_builddir'})) {
+ unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp');
+ } else {
+ unshift @INC, File::Spec->catdir($command_directory);
}
- unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp');
require Texinfo::ModulePath;
- Texinfo::ModulePath::init();
+ Texinfo::ModulePath::init(undef, undef, 'updirs' => 1);
} else {
# Look for modules in their installed locations.
@@ -81,7 +80,7 @@ BEGIN
unshift @INC, $lib_dir;
require Texinfo::ModulePath;
- Texinfo::ModulePath::init($lib_dir, $packagedir);
+ Texinfo::ModulePath::init($lib_dir, $packagedir, 'installed' => 1);
}
} # end BEGIN
@@ -168,43 +167,23 @@ $strings_textdomain = 'texinfo_document'
my $srcdir;
if (defined($ENV{'top_srcdir'})) {
$srcdir = File::Spec->catdir($ENV{'top_srcdir'}, 'tp');
-} else {
- $srcdir = $command_directory;
}
-my $libsrcdir = File::Spec->catdir($srcdir, 'maintain');
-
# we want a reliable way to switch locale, so we don't use the system
# gettext.
Locale::Messages->select_package('gettext_pp');
-#my @search_locale_dirs = ("$datadir/locale", (map $_ . '/LocaleData', @INC),
-# qw (/usr/share/locale /usr/local/share/locale));
-my @search_locale_dirs = ();
-
-if (($command_suffix eq '.pl' and !(defined($ENV{'TEXINFO_DEV_SOURCE'})
- and $ENV{'TEXINFO_DEV_SOURCE'} eq 0)) or $ENV{'TEXINFO_DEV_SOURCE'}) {
- # in case of build from the source directory, out of source build,
- # this helps to locate the locales.
- my $locales_dir_found = 0;
- @search_locale_dirs = (
- File::Spec->catdir($libsrcdir, $updir, 'LocaleData'),
- File::Spec->catdir($curdir, 'LocaleData'),
- File::Spec->catdir($updir, $updir, $updir, 'tp', 'LocaleData'),
- File::Spec->catdir($updir, $updir, 'tp', 'LocaleData'));
- foreach my $locales_dir (@search_locale_dirs) {
- if (-d $locales_dir) {
- Locale::Messages::bindtextdomain ($strings_textdomain, $locales_dir);
- # the messages in this domain are not regenerated automatically,
- # only when calling ./maintain/regenerate_perl_module_files.sh
- Locale::Messages::bindtextdomain ($messages_textdomain, $locales_dir);
- $locales_dir_found = 1;
- last;
- }
- }
- if (!$locales_dir_found) {
- warn "Locales dir for document strings not found (@search_locale_dirs)\n";
+if ($Texinfo::ModulePath::texinfo_uninstalled) {
+ my $locales_dir = File::Spec->catdir($Texinfo::ModulePath::builddir,
+ 'LocaleData');
+ if (-d $locales_dir) {
+ Locale::Messages::bindtextdomain ($strings_textdomain, $locales_dir);
+ # the messages in this domain are not regenerated automatically,
+ # only when calling ./maintain/regenerate_perl_module_files.sh
+ Locale::Messages::bindtextdomain ($messages_textdomain, $locales_dir);
+ } else {
+ warn "Locales dir for document strings not found\n";
}
} else {
Locale::Messages::bindtextdomain ($strings_textdomain,
@@ -213,9 +192,6 @@ if (($command_suffix eq '.pl' and !(defined($ENV{'TEXINFO_DEV_SOURCE'})
File::Spec->catdir($datadir, 'locale'));
}
-#Locale::Messages::bindtextdomain ($messages_textdomain,
-# File::Spec->catdir($datadir, 'locale'));
-
# Version setting is complicated, because we cope with
# * script with configure values substituted or not
@@ -864,7 +840,6 @@ There is NO WARRANTY, to the extent permitted by law.\n"), "2017";
$var = 'SUBDIR';
}
set_from_cmdline($var, $_[1]);
- set_from_cmdline('OUT', $_[1]);
push @texi2dvi_args, '-o', $_[1];
},
'no-validate|no-pointer-validate' => sub {
@@ -1011,7 +986,7 @@ if (defined($ENV{'TEXINFO_OUTPUT_FORMAT'})
}
if ($call_texi2dvi) {
- if (defined(get_conf('OUT')) and @ARGV > 1) {
+ if (defined(get_conf('OUTFILE')) and @ARGV > 1) {
die sprintf(__('%s: when generating %s, only one input FILE may be specified with -o'."\n"),
$real_command_name, format_name($format));
}
@@ -1182,8 +1157,7 @@ while(@input_files) {
my $texinfo_text = Texinfo::Convert::Texinfo::convert($tree, 1);
#print STDERR "$texinfo_text\n";
my $macro_expand_file = get_conf('MACRO_EXPAND');
- my $macro_expand_fh = Texinfo::Common::open_out($parser,
- $macro_expand_file, $parser->{'INPUT_PERL_ENCODING'});
+ my $macro_expand_fh = Texinfo::Common::open_out($parser, $macro_expand_file);
my $error_macro_expand_file;
if (defined($macro_expand_fh)) {
@@ -1263,7 +1237,6 @@ while(@input_files) {
if ($file_number != 0) {
delete $cmdline_options->{'OUTFILE'} if exists($cmdline_options->{'OUTFILE'});
- delete $cmdline_options->{'OUT'} if exists($cmdline_options->{'OUT'});
delete $cmdline_options->{'PREFIX'} if exists($cmdline_options->{'PREFIX'});
delete $cmdline_options->{'SUBDIR'}
if (exists($cmdline_options->{'SUBDIR'}) and get_conf('SPLIT'));
diff --git a/macros/texinfo/texinfo/util/Makefile.am b/macros/texinfo/texinfo/util/Makefile.am
index e202a6b488..55bd789acc 100644
--- a/macros/texinfo/texinfo/util/Makefile.am
+++ b/macros/texinfo/texinfo/util/Makefile.am
@@ -58,7 +58,7 @@ EXTRA_DIST = README detexinfo dir-example \
pdftexi2dvi \
texi2dvi texi2pdf \
$(dist_pkgdata_DATA) texinfo-cat.in texi-elements-by-size \
- texi2html txixml2texi.pl $(w32_bat) $(TESTS)
+ txixml2texi.pl $(w32_bat) $(TESTS)
DISTCLEANFILES = txixml2texi
diff --git a/macros/texinfo/texinfo/util/Makefile.in b/macros/texinfo/texinfo/util/Makefile.in
index fed8558020..d0d59a3410 100644
--- a/macros/texinfo/texinfo/util/Makefile.in
+++ b/macros/texinfo/texinfo/util/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
@@ -501,6 +501,7 @@ GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHDIR = @GNULIB_CHDIR@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP = @GNULIB_DUP@
GNULIB_DUP2 = @GNULIB_DUP2@
@@ -656,6 +657,7 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
+GNULIB_STRTOLD = @GNULIB_STRTOLD@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
@@ -723,11 +725,13 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GREP = @GREP@
+HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COPY_FILE_RANGE = @HAVE_COPY_FILE_RANGE@
HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
@@ -793,6 +797,7 @@ HAVE_GETPASS = @HAVE_GETPASS@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_INITSTATE = @HAVE_INITSTATE@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
@@ -813,6 +818,7 @@ HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MBTOWC = @HAVE_MBTOWC@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
@@ -847,6 +853,7 @@ HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SETHOSTNAME = @HAVE_SETHOSTNAME@
+HAVE_SETSTATE = @HAVE_SETSTATE@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
@@ -861,6 +868,7 @@ HAVE_STRINGS_H = @HAVE_STRINGS_H@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
+HAVE_STRTOLD = @HAVE_STRTOLD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
@@ -939,8 +947,6 @@ LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMULTITHREAD = @LIBMULTITHREAD@
LIBOBJS = @LIBOBJS@
-LIBPTH = @LIBPTH@
-LIBPTH_PREFIX = @LIBPTH_PREFIX@
LIBS = @LIBS@
LIBTHREAD = @LIBTHREAD@
LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
@@ -956,14 +962,13 @@ LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
-LTLIBPTH = @LTLIBPTH@
LTLIBTHREAD = @LTLIBTHREAD@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
@@ -1053,6 +1058,7 @@ REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETPASS = @REPLACE_GETPASS@
+REPLACE_INITSTATE = @REPLACE_INITSTATE@
REPLACE_ISATTY = @REPLACE_ISATTY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
@@ -1086,6 +1092,7 @@ REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RANDOM = @REPLACE_RANDOM@
REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
REPLACE_READ = @REPLACE_READ@
REPLACE_READLINK = @REPLACE_READLINK@
@@ -1098,6 +1105,7 @@ REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SETSTATE = @REPLACE_SETSTATE@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
@@ -1116,6 +1124,7 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_STRTOLD = @REPLACE_STRTOLD@
REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
@@ -1219,6 +1228,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1254,7 +1264,7 @@ EXTRA_DIST = README detexinfo dir-example \
pdftexi2dvi \
texi2dvi texi2pdf \
$(dist_pkgdata_DATA) texinfo-cat.in texi-elements-by-size \
- texi2html txixml2texi.pl $(w32_bat) $(TESTS)
+ txixml2texi.pl $(w32_bat) $(TESTS)
DISTCLEANFILES = txixml2texi
diff --git a/macros/texinfo/texinfo/util/README b/macros/texinfo/texinfo/util/README
index 8c4f2d13ad..2a07b0038f 100644
--- a/macros/texinfo/texinfo/util/README
+++ b/macros/texinfo/texinfo/util/README
@@ -16,8 +16,7 @@ These scripts actually get installed:
These are examples of wrapping makeinfo invocation to achieve their
various jobs:
- detexinfo texi2html texi-elements-by-size
- txicmdlist txicustomvars txixml2texi
+ detexinfo texi-elements-by-size txicmdlist txicustomvars txixml2texi
The srclist.txt file specifies common source files to keep in sync; see
the srclist-update script in gnulib.
diff --git a/macros/texinfo/texinfo/util/htmlxref.cnf b/macros/texinfo/texinfo/util/htmlxref.cnf
index 73a5957a69..26ccd9d3ac 100644
--- a/macros/texinfo/texinfo/util/htmlxref.cnf
+++ b/macros/texinfo/texinfo/util/htmlxref.cnf
@@ -1,9 +1,8 @@
# htmlxref.cnf - reference file for free Texinfo manuals on the web.
-htmlxrefversion=2018-08-23.18; # UTC
+htmlxrefversion=2019-06-10.23; # UTC
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Free
-# Software Foundation, Inc.
+# Copyright 2010-2019 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
@@ -172,6 +171,9 @@ emacs node ${EMACS}/html_node/emacs/
eshell mono ${EMACS}/html_mono/eshell.html
eshell node ${EMACS}/html_node/eshell/
#
+ eww mono ${EMACS}/html_mono/eww.html
+ eww node ${EMACS}/html_node/eww/
+ #
flymake mono ${EMACS}/html_mono/flymake.html
flymake node ${EMACS}/html_node/flymake/
#
@@ -477,7 +479,7 @@ MIT_SCHEME = ${GS}/mit-scheme/documentation
mit-scheme-ref node ${MIT_SCHEME}/mit-scheme-ref/
mit-scheme-user node ${MIT_SCHEME}/mit-scheme-user/
sos node ${MIT_SCHEME}/mit-scheme-sos/
- mit-scheme-imail node ${MIT_SCHEME}/mit-scheme-imail/
+ mit-scheme-imail mono ${MIT_SCHEME}/mit-scheme-imail.html
moe mono ${GS}/moe/manual/moe_manual.html
diff --git a/macros/texinfo/texinfo/util/pdftexi2dvi b/macros/texinfo/texinfo/util/pdftexi2dvi
index 3123e696f6..ff82322d99 100644
--- a/macros/texinfo/texinfo/util/pdftexi2dvi
+++ b/macros/texinfo/texinfo/util/pdftexi2dvi
@@ -24,7 +24,7 @@ rcs_version=`set - $rcs_revision; echo $2`
# obliged to.
if test "x$1" = x--version; then
cat <<EOF
-texi2pdf (GNU Texinfo 6.6) $rcs_version
+texi2pdf (GNU Texinfo 6.7) $rcs_version
Copyright (C) 2019 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
diff --git a/macros/texinfo/texinfo/util/texi2dvi b/macros/texinfo/texinfo/util/texi2dvi
index f906ed696a..17f43557ba 100644
--- a/macros/texinfo/texinfo/util/texi2dvi
+++ b/macros/texinfo/texinfo/util/texi2dvi
@@ -44,7 +44,6 @@ orig_pwd=`pwd`
# Don't use `unset' since old bourne shells don't have this command.
# Instead, assign them an empty value.
action=compile
-batch=false # interact normally
debug=false
escape="\\"
expand=false # true for expansion via makeinfo
@@ -106,15 +105,6 @@ CDPATH=${ZSH_VERSION+.}$path_sep
# usage - display usage and exit successfully.
usage ()
{
- # We used to simply have `echo "$usage"', but coping with the
- # changing behavior of `echo' is much harder than simply using a
- # here-doc.
- #
- # echo '\noto' echo '\\noto' echo -e '\\noto'
- # bash 3.1 \noto \\noto \noto
- # bash 3.2 %oto \noto -e \noto
- #
- # where % denotes the eol character.
cat <<EOF
Usage: $program [OPTION]... FILE...
or: texi2pdf [OPTION]... FILE...
@@ -130,11 +120,10 @@ When invoked as \`texi2pdf' or given the option --pdf generate PDF output.
Otherwise, generate DVI.
General options:
- -b, --batch no interaction
-D, --debug turn on shell debugging (set -x)
-h, --help display this help and exit successfully
-o, --output=OFILE leave output in OFILE; only one input FILE is allowed
- -q, --quiet no output unless errors (implies --batch)
+ -q, --quiet no output unless errors
-v, --version display version information and exit successfully
-V, --verbose report on what is done
--max-iterations=N don't process files more than N times [$max_iters]
@@ -209,7 +198,7 @@ EOF
version ()
{
cat <<EOF
-texi2dvi (GNU Texinfo 6.6)
+texi2dvi (GNU Texinfo 6.7)
Copyright (C) 2019 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
@@ -222,46 +211,36 @@ EOF
# Generic auxiliary functions.
-# List of variables containing paths to directories or files that
-# we need to update.
-path_vars='work_build workdir t2ddir work_bak in_input'
+# Used to access files and directories after we have changed directory
+# (for --tidy).
+rel=
# Change directory, updating some relative paths.
cd_dir ()
{
cd "$1"
- # Check if argument is absolute, and if so, make all the path variables
- # absolute.
- case "$1" in
+ # Check if argument or input file is absolute, and if so, make all the path
+ # variables absolute.
+ use_absolute=false
+ case $1 in
[\\/]* | ?:[\\/]*) # absolute path
- for cdd_dir in $path_vars; do
+ use_absolute=true ;;
+ esac
+ case $in_input in
+ [\\/]* | ?:[\\/]*)
+ use_absolute=true ;;
+ esac
+
+ if $use_absolute ; then
+ for cdd_dir in work_build workdir t2ddir work_bak in_input in_dir; do
eval "$cdd_dir=\`absolute \$$cdd_dir\`"
done
- return ;;
- esac
+ return
+ fi
- # Replace each path component with ".." and remove any trailing slash.
- cdd_prefix=`echo "$1" | \$SED -e 's/[^/\\][^/\\]*/../g' -e 's/[/\\]$//'`
-
- # Add this prefix for some variables.
- for cdd_dir in $path_vars; do
- eval "case \"\$$cdd_dir\" in
- [\\/]* | ?:[\\/]*) ;; # absolute path - do nothing
- ?*)
- eval \"\$cdd_dir=\$cdd_prefix/\\\$\$cdd_dir\" ;;
- esac"
- # Without first level of quotes, where CDD_DIR is $cdd_dir:
- # case "$CDD_DIR" in
- # [\\/]* | ?:[\\/]*) ;;
- # *)
- # eval "$cdd_dir=$cdd_prefix/\$$cdd_dir" ;;
- # esac
- #
- # Inner 'eval' becomes
- # CDD_DIR=CDD_PREFIX/$CDD_DIR
- # where CDD_DIR is $cdd_dir and CDD_PREFIX is $cdd_prefix
- done
+ # Replace each path component with ".." and add a single trailing slash.
+ rel=`echo "$1" | \$SED -e 's/[^/\\][^/\\]*/../g' -e 's/[/\\]*$/\//'`
}
# cd_orig - Return to the original directory.
@@ -275,23 +254,7 @@ cd_orig ()
# - the temporary file can be removed
cd "$orig_pwd" || exit 1
- test -z "$cdd_prefix" && return
-
- # strip off ../../ from some variables
- # quote string by placing \ before each character (each either . or /)
- cdd_prefix_q=`echo "$cdd_prefix" | \$SED -e 's/\\(.\\)/\\\\\\1/g'`
- # after backslashes quote within backquoted string:
- # echo "$cdd_prefix" | $SED -e 's/\(.\)/\\\1/g'
-
- for cdo_dir in $path_vars ; do
- eval "$cdo_dir=\`echo \"\$$cdo_dir\" | \$SED -e 's/^$cdd_prefix_q\///'\`"
-
- # Becomes
- # CDO_DIR=`echo "$CDO_DIR" | $SED -e 's/^CDD_PREFIX//'`
-
- # eval $cdo_dir=\${$cdo_dir#\$cdd_prefix/}
- # would be simpler, but doesn't work in older shells.
- done
+ rel=
}
@@ -705,6 +668,8 @@ index_file_p ()
latex:*:*:"\\indexentry{"*|latex:*:*:"\\indexentry {"*) echo $1;;
texinfo:*:*:"\\entry{"*) echo $1;;
+ texinfo:*:*:"@entry{"*) echo $1;;
+ # @entry is output from newer versions of texinfo.tex
esac
return 0
}
@@ -767,7 +732,7 @@ report 'Once you'\''ve done that, delete the file with an '\''fl'\'' extension.'
}
-# xref_files_save - set xref_files_orig from xref_files_orig, and save xref
+# xref_files_save - set xref_files_orig from xref_files_new, and save xref
# files in $work_bak.
xref_files_save ()
{
@@ -782,7 +747,18 @@ xref_files_save ()
# Users may have, e.g., --keep-old-files. Don't let this interfere.
# (Don't use unset for the sake of ancient shells.)
TAR_OPTIONS=; export TAR_OPTIONS
- tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
+ tar cf - $xref_files_orig | (cd "$rel$work_bak" && tar xf -)
+ fi
+
+ # Remove auxiliary files in same directory as main input file. Otherwise,
+ # these will likely be read instead of those in the build dir.
+ if $tidy ; then
+ secondary_xref_files=`sorted_index_files`
+ for f in $xref_files_new $secondary_xref_files ; do
+ if test -f "$rel$in_dir/$f" ; then
+ remove $rel$in_dir/$f
+ fi
+ done
fi
}
@@ -817,10 +793,10 @@ xref_files_changed ()
for this_file in $xref_files_new; do
verbose "Comparing xref file `echo $this_file | $SED 's|\./||g'` ..."
# cmp -s returns nonzero exit status if files differ.
- if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
+ if cmp -s "$this_file" "$rel$work_bak/$this_file"; then :; else
verbose "xref file `echo $this_file | $SED 's|\./||g'` differed ..."
if $debug; then
- diff -u "$work_bak/$this_file" "$this_file"
+ diff -u "$rel$work_bak/$this_file" "$this_file"
fi
return 0
fi
@@ -908,21 +884,17 @@ make_tex_cmd ()
# Tell TeX to allow running external executables
test -n "$shell_escape" && tex_cmd="$tex_cmd $shell_escape"
- # Tell TeX to be batch if requested.
- if $batch; then
- # \batchmode does not show terminal output at all, so we don't
- # want that. And even in batch mode, TeX insists on having input
- # from the user. Close its stdin to make it impossible.
- tex_cmd="$tex_cmd </dev/null '${escape}nonstopmode'"
- fi
+ # Run without interaction.
+ # \batchmode does not show terminal output at all, so we don't
+ # want that. And even in batch mode, TeX insists on having input
+ # from the user. Close its stdin to make it impossible.
+ tex_cmd="$tex_cmd </dev/null '${escape}nonstopmode'"
}
-# run_tex - Run TeX as "$tex $in_input", taking care of errors and logs.
+# run_tex - Run TeX, taking care of errors and logs.
run_tex ()
{
- make_tex_cmd
-
# Check for any unusual characters in the filename.
# However, >, \ and any whitespace characters are not supported
# filenames.
@@ -943,7 +915,7 @@ run_tex ()
done
# Set \toks0 to "\input FILENAME\relax"
- tex_cmd="$tex_cmd '${escape}toks0${escape}bgroup${escape}input' '$in_input' '${escape}relax>"
+ tex_cmd="$tex_cmd '${escape}toks0${escape}bgroup${escape}input' '$rel$in_input' '${escape}relax>"
# Expand \toks0 after the end of the group
tex_cmd="$tex_cmd${escape}expandafter${escape}egroup"
@@ -951,7 +923,7 @@ run_tex ()
else
# In the case of a simple filename, just pass the filename
# with no funny tricks.
- tex_cmd="$tex_cmd '${escape}input' '$in_input'"
+ tex_cmd="$tex_cmd '${escape}input' '$rel$in_input'"
fi
verbose "$0: Running $tex_cmd ..."
@@ -960,7 +932,7 @@ run_tex ()
dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
esac
else
- error 1 "$tex exited with bad status, quitting."
+ tex_failed=true
fi
}
@@ -1137,6 +1109,8 @@ run_dvipdf ()
# run_tex_suite - Run the TeX tools until a stable point is reached.
run_tex_suite ()
{
+ make_tex_cmd
+
# Move to the working directory.
if $tidy; then
verbose "cd $work_build"
@@ -1162,6 +1136,7 @@ run_tex_suite ()
suite_cycle=`expr $suite_cycle + 1`
verbose "Cycle $suite_cycle for $command_line_filename"
+ tex_failed=false
run_core_conversion
xref_files_changed || break
xref_files_save
@@ -1173,6 +1148,11 @@ run_tex_suite ()
run_index
done
+ if $tex_failed ; then
+ # TeX failed, and the xref files did not change.
+ error 1 "$tex exited with bad status, quitting."
+ fi
+
# If we were using thumbpdf and producing PDF, then run thumbpdf
# and TeX one last time.
run_thumbpdf
@@ -1417,7 +1397,7 @@ run_hevea ()
# successful compilation.
run_hevea_cmd="$run_hevea_cmd -fix -O -o '$out_base'"
run_hevea_cmd="$run_hevea_cmd `list_prefix includes -I` -I '$orig_pwd' "
- run_hevea_cmd="$run_hevea_cmd '$in_input'"
+ run_hevea_cmd="$run_hevea_cmd '$rel$in_input'"
if $debug; then
run_hevea_cmd="$run_hevea_cmd -v -v"
@@ -1499,8 +1479,12 @@ compile ()
#
make_openout_test ()
{
+ recorder_option_maybe="$1"
+ make_tex_cmd
+
ensure_dir "$workdir"/check_recorder
cd_dir "$workdir"/check_recorder
+
cat > openout.tex <<EOF
\newwrite\ourwrite
\immediate\openout\ourwrite dum.dum
@@ -1508,11 +1492,6 @@ make_openout_test ()
EOF
# \bye doesn't work for LaTeX, but it will cause latex
# to exit with an input error.
- recorder_option_maybe="$1"
- save_batch=$batch
- batch=true
- make_tex_cmd
- batch=$save_batch
tex_cmd="$tex_cmd '${escape}input' ./openout.tex"
# ./ in case . isn't in path
verbose "$0: running $tex_cmd ..."
@@ -1717,12 +1696,6 @@ cleanup ()
# input is preprocessed.
input_file_name_decode ()
{
- # See if we are run from within AUC-Tex, in which case we are
- # passed `\input{FOO.tex}' or even `\nonstopmode\input{FOO.tex}'.
- case $command_line_filename in
- *\\nonstopmode*)
- batch=true;;
- esac
case $command_line_filename in
*\\input{*}*)
# Let AUC-TeX error parser deal with line numbers.
@@ -1808,8 +1781,7 @@ while test x"$1" != x"$arg_sep"; do
case "$1" in
-@ ) escape=@;;
-~ ) verbose "Option -~ is obsolete: texi2dvi ignores it.";;
- # Silently and without documentation accept -b and --b[atch] as synonyms.
- -b | --batch) batch=true;;
+ -b | --batch) ;; # Obsolete
--build) shift; build_mode=$1;;
--build-dir) shift; build_dir=$1; build_mode=tidy;;
-c | --clean) build_mode=clean;;
@@ -1832,7 +1804,7 @@ while test x"$1" != x"$arg_sep"; do
out_lang_set `echo "x$1" | $SED 's/^x--//'`;;
-p) out_lang_set pdf;;
- -q | -s | --quiet | --silent) quiet=true; batch=true;;
+ -q | -s | --quiet | --silent) quiet=true;;
--src-specials) src_specials=--src-specials;;
--shell-escape) shell_escape=--shell-escape;;
--tex4ht) latex2html=tex4ht;;
diff --git a/macros/texinfo/texinfo/util/texi2html b/macros/texinfo/texinfo/util/texi2html
deleted file mode 100644
index e49a8157a0..0000000000
--- a/macros/texinfo/texinfo/util/texi2html
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# Copyright 2012-2019 Free Software Foundation, Inc.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Original author: Patrice Dumas.
-
-# Convert Texinfo to HTML, setting the default style to be the texi2html
-# style.
-#
-# It is not fully compatible with texi2html. There is no possibility of
-# splitting indices, and translated strings cannot (yet?) be customized.
-# Command line processing and options have also changed, and the
-# customization API is new.
-#
-# Thus, since this is not a drop-in replacement for the old texi2html,
-# we do not install it. It's here as an example.
-#
-# See the texi2html node in the Texinfo manual for more.
-#
-exec texi2any --set-init-variable TEXI2HTML=1 "$@"
-
diff --git a/macros/texinfo/texinfo/util/texi2pdf b/macros/texinfo/texinfo/util/texi2pdf
index 3123e696f6..ff82322d99 100644
--- a/macros/texinfo/texinfo/util/texi2pdf
+++ b/macros/texinfo/texinfo/util/texi2pdf
@@ -24,7 +24,7 @@ rcs_version=`set - $rcs_revision; echo $2`
# obliged to.
if test "x$1" = x--version; then
cat <<EOF
-texi2pdf (GNU Texinfo 6.6) $rcs_version
+texi2pdf (GNU Texinfo 6.7) $rcs_version
Copyright (C) 2019 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>